From 109743dc29fe6980795191d880aaade02739fb4a Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Apr 2009 11:37:42 +0000 Subject: Add more complete test for the various lifecycle exceptions git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@765582 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/itest/ConstructorException.java | 2 + .../java/itest/InitCompositeScopeException.java | 57 +++++++++++++ .../src/main/java/itest/InitException.java | 43 ---------- .../main/java/itest/InitRequestScopeException.java | 57 +++++++++++++ .../java/itest/InitStatelessScopeException.java | 57 +++++++++++++ .../src/main/java/itest/OkImpl.java | 6 ++ .../src/main/resources/test.composite | 10 ++- .../src/test/java/itest/InitTestCase.java | 96 ++++++++++++++++++++-- 8 files changed, 277 insertions(+), 51 deletions(-) create mode 100644 branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java delete mode 100644 branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitException.java create mode 100644 branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java create mode 100644 branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java (limited to 'branches/sca-java-1.x/itest/java-init-exceptions') diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java index 375e8c2986..a91904e9a8 100644 --- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java +++ b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java @@ -26,12 +26,14 @@ public class ConstructorException implements Service { public static boolean initRun; public static boolean destroyRun; + public static boolean doitRun; public ConstructorException() { throw new RuntimeException(); } public void doit() { + doitRun = true; } @Init diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java new file mode 100644 index 0000000000..73017ec72b --- /dev/null +++ b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package itest; + +import org.osoa.sca.annotations.Destroy; +import org.osoa.sca.annotations.Init; +import org.osoa.sca.annotations.Scope; + +@Scope("COMPOSITE") +public class InitCompositeScopeException implements Service { + + public static boolean initRun; + public static boolean destroyRun; + public static boolean doitRun; + public static int count = 0; + + public void doit() { + doitRun = true; + if (!initRun) { + throw new RuntimeException("initRun false"); + } + if (destroyRun) { + throw new RuntimeException("destroyRun true"); + } + } + + @Init + public void init() { + initRun = true; + if (count++ < 1) { + throw new RuntimeException("bang"); + } + } + + @Destroy + public void destroy() { + destroyRun = true; + } + +} diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitException.java b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitException.java deleted file mode 100644 index b9e3f7955f..0000000000 --- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package itest; - -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; - -public class InitException implements Service { - - public static boolean initRun; - public static boolean destroyRun; - - public void doit() { - } - - @Init - public void init() { - throw new RuntimeException(); - } - - @Destroy - public void destroy() { - destroyRun = true; - } - -} diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java new file mode 100644 index 0000000000..b29f52645e --- /dev/null +++ b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package itest; + +import org.osoa.sca.annotations.Destroy; +import org.osoa.sca.annotations.Init; +import org.osoa.sca.annotations.Scope; + +@Scope("REQUEST") +public class InitRequestScopeException implements Service { + + public static boolean initRun; + public static boolean destroyRun; + public static boolean doitRun; + public static int count = 0; + + public void doit() { + doitRun = true; + if (!initRun) { + throw new RuntimeException("initRun false"); + } + if (destroyRun) { + throw new RuntimeException("destroyRun true"); + } + } + + @Init + public void init() { + initRun = true; + if (count++ < 1) { + throw new RuntimeException("bang"); + } + } + + @Destroy + public void destroy() { + destroyRun = true; + } + +} diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java new file mode 100644 index 0000000000..5a898a501d --- /dev/null +++ b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package itest; + +import org.osoa.sca.annotations.Destroy; +import org.osoa.sca.annotations.Init; +import org.osoa.sca.annotations.Scope; + +@Scope("STATELESS") +public class InitStatelessScopeException implements Service { + + public static boolean initRun; + public static boolean destroyRun; + public static boolean doitRun; + public static int count = 0; + + public void doit() { + doitRun = true; + if (!initRun) { + throw new RuntimeException("initRun false"); + } + if (destroyRun) { + throw new RuntimeException("destroyRun true"); + } + } + + @Init + public void init() { + initRun = true; + if (count++ < 1) { + throw new RuntimeException("bang"); + } + } + + @Destroy + public void destroy() { + destroyRun = true; + } + +} diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/OkImpl.java b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/OkImpl.java index 4ff6bc6f0a..134bbba0d3 100644 --- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/OkImpl.java +++ b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/OkImpl.java @@ -31,6 +31,12 @@ public class OkImpl implements Service { } public void doit() { + if (!initRun) { + throw new RuntimeException("initRun false"); + } + if (destroyRun) { + throw new RuntimeException("destroyRun true"); + } } @Init diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/resources/test.composite b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/resources/test.composite index 00bf842625..3a1a897def 100644 --- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/resources/test.composite +++ b/branches/sca-java-1.x/itest/java-init-exceptions/src/main/resources/test.composite @@ -30,8 +30,14 @@ - - + + + + + + + + diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java b/branches/sca-java-1.x/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java index 846c2779e3..f6a1da5b79 100644 --- a/branches/sca-java-1.x/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java +++ b/branches/sca-java-1.x/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java @@ -18,7 +18,9 @@ */ package itest; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; @@ -41,20 +43,102 @@ public class InitTestCase { Service client1 = scaDomain.getService(Service.class, "OkService"); client1.doit(); assertTrue(OkImpl.initRun); + assertTrue(OkImpl.destroyRun); // its stateless so destory is called after every service invocations } - //@Test + @Test public void testConstructorException() throws Exception { Service client1 = scaDomain.getService(Service.class, "ConstructorException"); + try { + client1.doit(); + fail(); + } catch (RuntimeException e) { + // expected + } + assertFalse(ConstructorException.initRun); + assertFalse(ConstructorException.doitRun); + assertFalse(ConstructorException.destroyRun); + } + + @Test + public void testInitCompositeScopeException() throws Exception { + Service client1 = scaDomain.getService(Service.class, "InitCompositeScopeException"); + try { + client1.doit(); + fail(); + } catch (RuntimeException e) { + // expected + } + assertTrue(InitCompositeScopeException.initRun); + assertFalse(InitCompositeScopeException.doitRun); + assertTrue(InitCompositeScopeException.destroyRun); + + // reset and try again to verify init init still gets run again + InitCompositeScopeException.initRun = false; + InitCompositeScopeException.doitRun = false; + InitCompositeScopeException.destroyRun = false; + client1.doit(); - assertTrue(OkImpl.initRun); + + assertTrue(InitCompositeScopeException.initRun); + assertTrue(InitCompositeScopeException.doitRun); + scaDomain.close(); + scaDomain = null; + assertTrue(InitCompositeScopeException.destroyRun); + } + + @Test + public void testInitStatelessScopeException() throws Exception { + Service client1 = scaDomain.getService(Service.class, "InitStatelessScopeException"); + try { + client1.doit(); + fail(); + } catch (RuntimeException e) { + // expected + } + assertTrue(InitStatelessScopeException.initRun); + assertFalse(InitStatelessScopeException.doitRun); + assertTrue(InitStatelessScopeException.destroyRun); + + // reset and try again to verify init init still gets run again + InitStatelessScopeException.initRun = false; + InitStatelessScopeException.doitRun = false; + InitStatelessScopeException.destroyRun = false; + + client1.doit(); + + assertTrue(InitStatelessScopeException.initRun); + assertTrue(InitStatelessScopeException.doitRun); + scaDomain.close(); + scaDomain = null; + assertTrue(InitStatelessScopeException.destroyRun); } - //@Test - public void testInitException() throws Exception { - Service client1 = scaDomain.getService(Service.class, "InitException"); + @Test + public void testInitRequestScopeException() throws Exception { + Service client1 = scaDomain.getService(Service.class, "InitRequestScopeException"); + try { + client1.doit(); + fail(); + } catch (RuntimeException e) { + // expected + } + assertTrue(InitRequestScopeException.initRun); + assertFalse(InitRequestScopeException.doitRun); + assertTrue(InitRequestScopeException.destroyRun); + + // reset and try again to verify init init still gets run again + InitRequestScopeException.initRun = false; + InitRequestScopeException.doitRun = false; + InitRequestScopeException.destroyRun = false; + client1.doit(); - assertTrue(OkImpl.initRun); + + assertTrue(InitRequestScopeException.initRun); + assertTrue(InitRequestScopeException.doitRun); + scaDomain.close(); + scaDomain = null; + assertTrue(InitRequestScopeException.destroyRun); } @After -- cgit v1.2.3