From f44c07576a61f6f4915ea8fd2aa5af9fee71745f Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 5 Dec 2008 00:48:31 +0000 Subject: Convert, clean and bring up a set of itests git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723537 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/itest/callback-api/pom.xml | 12 +- .../tuscany/sca/test/CallBackApiClientImpl.java | 3 +- .../tuscany/sca/test/CallBackApiTestCase.java | 40 +- java/sca/itest/callback-basic/pom.xml | 12 +- .../tuscany/sca/test/CallBackBasicClientImpl.java | 3 +- .../tuscany/sca/test/CallBackBasicTestCase.java | 34 +- java/sca/itest/callback-complex-type/pom.xml | 12 +- .../tuscany/sca/test/CallBackCTypeClientImpl.java | 3 +- .../sca/test/CallBackCTypeTestCaseFIXME.java | 24 +- java/sca/itest/callback-id/pom.xml | 12 +- .../tuscany/sca/test/CallBackIdClientImpl.java | 3 +- .../tuscany/sca/test/CallBackIdTestCase.java | 32 +- java/sca/itest/callback-multiple-wires/pom.xml | 12 +- .../tuscany/sca/test/callback/MyServiceImpl.java | 4 +- .../test/callback/CallbackMultiWireTestCase.java | 35 +- java/sca/itest/callback-separatethread/pom.xml | 12 +- .../itest/CallBackSeparateThreadClientImpl.java | 44 +- .../tuscany/sca/itest/EventProcessorCallBack.java | 1 - .../tuscany/sca/itest/EventProcessorService.java | 1 - .../sca/itest/EventProcessorServiceImpl.java | 79 ++- .../sca/itest/CallBackSeparateThreadTestCase.java | 37 +- java/sca/itest/callback-set-callback/pom.xml | 12 +- .../sca/test/CallBackSetCallbackBadCallback.java | 2 +- .../sca/test/CallBackSetCallbackClientImpl.java | 11 +- .../sca/test/CallBackSetCallbackServiceImpl.java | 2 +- .../sca/test/CallBackSetCallbackTestCase.java | 31 +- java/sca/itest/callback-set-conversation/pom.xml | 12 +- .../test/CallBackSetCallbackConvBadCallback.java | 2 +- .../test/CallBackSetCallbackConvClientImpl.java | 20 +- .../CallBackSetCallbackConvNonSerCallback.java | 2 +- .../CallBackSetCallbackConvObjectCallback.java | 3 +- .../test/CallBackSetCallbackConvServiceImpl.java | 2 +- .../sca/test/CallBackSetCallbackConvTestCase.java | 36 +- java/sca/itest/component-type/pom.xml | 4 +- .../src/main/java/calculator/CalculatorClient.java | 5 +- .../main/java/calculator/CalculatorService.java | 1 - java/sca/itest/conversations/pom.xml | 12 +- .../org/apache/tuscany/sca/itest/TestResult.java | 3 +- .../tuscany/sca/itest/conversational/BService.java | 2 +- .../tuscany/sca/itest/conversational/CService.java | 10 +- .../conversational/ConversationIdService.java | 1 + .../conversational/ConversationalCallback.java | 17 +- .../itest/conversational/ConversationalClient.java | 54 ++- .../ConversationalReferenceClient.java | 4 +- .../conversational/ConversationalService.java | 29 +- ...ersationalServiceNonConversationalCallback.java | 29 +- .../tuscany/sca/itest/conversational/DService.java | 4 +- .../conversational/NonConversationalCallback.java | 17 +- .../itest/conversational/impl/AServiceImpl.java | 13 +- .../sca/itest/conversational/impl/AlphaImpl.java | 7 +- .../itest/conversational/impl/BServiceImpl.java | 3 +- .../sca/itest/conversational/impl/BetaImpl.java | 3 +- .../itest/conversational/impl/CServiceImpl.java | 7 +- .../impl/ConversationAgeComponentImpl.java | 12 +- .../impl/ConversationIdComponentImpl.java | 4 +- .../impl/ConversationMaxIdleComponentImpl.java | 12 +- .../impl/ConversationalClientStatefulImpl.java | 262 +++++----- ...lientStatefulNonConversationalCallbackImpl.java | 253 +++++----- .../impl/ConversationalClientStatelessImpl.java | 243 +++++----- .../impl/ConversationalReferenceClientImpl.java | 13 +- .../impl/ConversationalServiceRequestImpl.java | 67 ++- .../impl/ConversationalServiceStatefulImpl.java | 79 ++- ...rviceStatefulNonConversationalCallbackImpl.java | 82 ++-- .../impl/ConversationalServiceStatelessImpl.java | 67 ++- .../ConversationalServiceStatelessScopeImpl.java | 22 +- .../itest/conversational/impl/DServiceImpl.java | 9 +- .../sca/itest/conversational/impl/GammaImpl.java | 4 +- .../conversational/ConversationIdTestCase.java | 20 +- .../ConversationLifetimeTestCase.java | 61 +-- .../ConversationUniqueIdTestCase.java | 29 +- .../conversational/ConversationalAgeTestCase.java | 38 +- .../conversational/ConversationalJ2SETestCase.java | 20 +- .../conversational/ConversationalTestCase.java | 535 +++++++++++---------- java/sca/itest/exceptions/pom.xml | 12 +- .../tuscany/sca/test/exceptions/Checked.java | 1 - .../sca/test/exceptions/ExceptionThrower.java | 1 - .../test/exceptions/impl/ExceptionHandlerImpl.java | 2 +- .../impl/RemoteExceptionHandlerImpl.java | 2 +- .../sca/test/exceptions/ExceptionsTestCase.java | 58 ++- .../itest/interfaces/LocalCallbackInterface.java | 1 - .../sca/itest/interfaces/ParameterObject.java | 1 - .../itest/interfaces/RemoteClientComponent.java | 1 + .../interfaces/RemoteClientComponentImpl.java | 2 +- .../itest/interfaces/RemoteServiceComponent.java | 2 +- .../tuscany/sca/itest/oneway/OneWayClient.java | 2 +- .../tuscany/sca/itest/oneway/OneWayService.java | 2 - .../sca/itest/oneway/impl/OneWayClientImpl.java | 3 +- .../sca/itest/oneway/impl/OneWayServiceImpl.java | 9 +- .../tuscany/sca/itest/oneway/OneWayTestCase.java | 52 +- java/sca/itest/operation-overloading/pom.xml | 12 +- .../test/opoverload/impl/OverloadATestCase.java | 44 +- java/sca/itest/pom.xml | 13 +- java/sca/itest/properties/pom.xml | 19 +- .../tuscany/sca/itest/ComplexPropertyBean.java | 2 +- .../tuscany/sca/itest/PropertyComponent.java | 5 +- .../tuscany/sca/itest/PropertyComponentImpl.java | 8 +- .../main/java/test/jaxb/props/ObjectFactory.java | 3 - .../java/test/jaxb/props/ReturnCodeProperties.java | 8 +- .../main/java/test/jaxb/props/package-info.java | 2 +- .../tuscany/sca/itest/MyTotalServiceTestCase.java | 25 +- .../tuscany/sca/itest/OuterPropertyTestCase.java | 21 +- .../apache/tuscany/sca/itest/PropertyTestCase.java | 39 +- .../cdi/ConstructorPropertyInjectionTestCase.java | 46 +- java/sca/itest/recursive-multi-level/pom.xml | 22 +- .../main/java/mysca/test/myservice/MyService.java | 2 +- .../java/mysca/test/myservice/MyServiceImpl.java | 20 +- .../mysca/test/myservice/MySimpleTotalService.java | 1 + .../test/myservice/MySimpleTotalServiceImpl.java | 13 +- .../java/test/sca/tests/MultiLevelTestCase.java | 87 ++-- .../sca/itest/references/AComponentImpl.java | 9 +- .../tuscany/sca/itest/references/DComponent.java | 3 +- .../references/AutoWiredReferenceTestCase.java | 37 +- .../itest/references/InnerReferenceTestCase.java | 29 +- .../references/ManualWiredReferenceTestCase.java | 27 +- .../scopes/CompositeScopeStateVerifierImpl.java | 6 +- .../scopes/RequestScopeStateVerifierImpl.java | 13 +- .../tuscany/sca/itest/scopes/StateVerifier.java | 2 +- .../org/apache/tuscany/sca/test/ScopeTestCase.java | 97 ++-- .../tuscany/sca/itest/services/AComponent.java | 2 +- .../tuscany/sca/itest/services/AComponentImpl.java | 6 +- .../tuscany/sca/itest/services/BComponent.java | 2 +- .../tuscany/sca/itest/services/BComponentImpl.java | 6 +- .../tuscany/sca/itest/services/D1Component.java | 3 +- .../tuscany/sca/itest/services/DComponent.java | 3 +- .../sca/itest/services/ServicesTestCase.java | 6 +- java/sca/itest/wires/pom.xml | 12 +- .../apache/tuscany/sca/itest/WireClientImpl.java | 7 +- .../org/apache/tuscany/sca/itest/WireTestCase.java | 43 +- 128 files changed, 1892 insertions(+), 1571 deletions(-) diff --git a/java/sca/itest/callback-api/pom.xml b/java/sca/itest/callback-api/pom.xml index 65d641daae..c2676b0df2 100644 --- a/java/sca/itest/callback-api/pom.xml +++ b/java/sca/itest/callback-api/pom.xml @@ -31,16 +31,24 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java index 274984abb3..0535ceb826 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java @@ -18,8 +18,7 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.Assert; - +import org.junit.Assert; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; diff --git a/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java index 9471049c74..75fab95efb 100644 --- a/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java +++ b/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java @@ -18,13 +18,17 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.TestCase; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; -import org.apache.tuscany.sca.host.embedded.SCADomain; +public class CallBackApiTestCase { -public class CallBackApiTestCase extends TestCase { - - private static SCADomain domain; + private static Node node; private CallBackApiClient aCallBackClient; /** @@ -35,28 +39,32 @@ public class CallBackApiTestCase extends TestCase { * 2. Test in which the target does not call back to the client
* 3. Test in which the target calls back multiple times to the client. */ + @Test public void testCallBackBasic() { + aCallBackClient = node.getService(CallBackApiClient.class, "CallBackApiClient"); aCallBackClient.run(); } /** - * This function creates the SCADomain instance and gets an Instance of CallBackApiClient.class + * This function creates the Node instance and gets an Instance of CallBackApiClient.class */ - @Override - protected void setUp() throws Exception { - if (domain == null) { - domain = SCADomain.newInstance("CallBackApiTest.composite"); - } - aCallBackClient = domain.getService(CallBackApiClient.class, "CallBackApiClient"); + @BeforeClass + public static void setUp() throws Exception { + if (node == null) { + String location = ContributionLocationHelper.getContributionLocation("CallBackApiTest.composite"); + node = NodeFactory.newInstance().createNode("CallBackApiTest.composite", new Contribution("c1", location)); + node.start(); + } } /** - * This function destroys the SCADomain instance that was created in setUp() + * This function destroys the Node instance that was created in setUp() */ - @Override - protected void tearDown() throws Exception { - domain.close(); + + @AfterClass + public static void tearDown() throws Exception { + node.stop(); } } diff --git a/java/sca/itest/callback-basic/pom.xml b/java/sca/itest/callback-basic/pom.xml index eb9e619596..d5aa6f1fe8 100644 --- a/java/sca/itest/callback-basic/pom.xml +++ b/java/sca/itest/callback-basic/pom.xml @@ -31,16 +31,24 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java index e0e6d7eb8c..08d8afcf63 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java @@ -18,8 +18,7 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.Assert; - +import org.junit.Assert; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; diff --git a/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java index 32c26a348a..890791cc0a 100644 --- a/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java +++ b/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java @@ -21,30 +21,36 @@ package org.apache.tuscany.sca.test; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Before; public class CallBackBasicTestCase extends TestCase { - private static SCADomain domain; + private static Node node; private CallBackBasicClient aCallBackClient; public void testCallBackBasic() { - aCallBackClient.run(); + aCallBackClient.run(); } - @Override - protected void setUp() throws Exception { - if( domain==null ) { - domain = SCADomain.newInstance("CallBackBasicTest.composite"); - } - - aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient"); - } + @Before + public void setUp() throws Exception { + if (node == null) { + String location = ContributionLocationHelper.getContributionLocation("CallBackBasicTest.composite"); + node = NodeFactory.newInstance().createNode("CallBackBasicTest.composite", new Contribution("c1", location)); + node.start(); + } - @Override - protected void tearDown() throws Exception { - domain.close(); + aCallBackClient = node.getService(CallBackBasicClient.class, "CallBackBasicClient"); } + @After + public void tearDown() throws Exception { + node.stop(); + } } diff --git a/java/sca/itest/callback-complex-type/pom.xml b/java/sca/itest/callback-complex-type/pom.xml index 084e55d694..dfd0b95977 100644 --- a/java/sca/itest/callback-complex-type/pom.xml +++ b/java/sca/itest/callback-complex-type/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java index d2b03fcde7..93bb65b2d1 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java @@ -18,8 +18,7 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.Assert; - +import org.junit.Assert; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; diff --git a/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java index 33d1afaecd..5c2b4d4388 100644 --- a/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java +++ b/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java @@ -20,29 +20,33 @@ package org.apache.tuscany.sca.test; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Before; //FIXME Fix this test case public class CallBackCTypeTestCaseFIXME extends TestCase { - private SCADomain domain; + private Node node; private CallBackCTypeClient aCallBackClient; public void testCallBackBasic() { aCallBackClient.run(); } - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackCTypeClient.composite"); + @Before + public void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation(".composite"); + node = NodeFactory.newInstance().createNode("CallBackCTypeClient.composite"); - aCallBackClient = - domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient"); + aCallBackClient = node.getService(CallBackCTypeClient.class, "CallBackCTypeClient"); } - @Override - protected void tearDown() throws Exception { - domain.close(); + @After + public void tearDown() throws Exception { + node.stop(); } } diff --git a/java/sca/itest/callback-id/pom.xml b/java/sca/itest/callback-id/pom.xml index 3eedfe0fc9..fe02bbcb15 100644 --- a/java/sca/itest/callback-id/pom.xml +++ b/java/sca/itest/callback-id/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java index 59c9c3d069..afcccdbc02 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java @@ -18,8 +18,7 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.Assert; - +import org.junit.Assert; import org.osoa.sca.ComponentContext; import org.osoa.sca.RequestContext; import org.osoa.sca.ServiceReference; diff --git a/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java index 771fbb8ff7..56fd46d1b0 100644 --- a/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java +++ b/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java @@ -18,28 +18,34 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.TestCase; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import org.apache.tuscany.sca.host.embedded.SCADomain; +public class CallBackIdTestCase { -public class CallBackIdTestCase extends TestCase { - - private SCADomain domain; + private Node node; private CallBackIdClient aCallBackClient; + @Test public void testCallBackBasic() { aCallBackClient.run(); } - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackIdClient.composite"); - - aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient"); + @Before + public void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("CallBackIdClient.composite"); + node = NodeFactory.newInstance().createNode("CallBackIdClient.composite", new Contribution("c1", location)); + node.start(); + aCallBackClient = node.getService(CallBackIdClient.class, "CallBackIdClient"); } - @Override - protected void tearDown() throws Exception { - domain.close(); + @After + public void tearDown() throws Exception { + node.stop(); } } diff --git a/java/sca/itest/callback-multiple-wires/pom.xml b/java/sca/itest/callback-multiple-wires/pom.xml index c9602bfaa0..dc22101ef0 100644 --- a/java/sca/itest/callback-multiple-wires/pom.xml +++ b/java/sca/itest/callback-multiple-wires/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java index d19b3fe355..856fbc4bde 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java @@ -32,13 +32,13 @@ public class MyServiceImpl implements MyService { @Context protected RequestContext requestContext; - + public void someMethod(String arg) { // invoke the callback try { MyServiceCallback myServiceCallback = requestContext.getCallback(); myServiceCallback.receiveResult(arg + " -> receiveResult"); - } catch(RuntimeException e) { + } catch (RuntimeException e) { System.out.println("RuntimeException invoking receiveResult: " + e.toString()); } } diff --git a/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java index 3c83e4bedd..bd3cce74b4 100644 --- a/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java +++ b/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java @@ -18,31 +18,40 @@ */ package org.apache.tuscany.sca.test.callback; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; /** * A TestCase that demonstrates resolving the client service and initiating the callback sequence */ -public class CallbackMultiWireTestCase extends TestCase { +public class CallbackMultiWireTestCase { - private SCADomain scaDomain; + private Node node; private MyClient myClient1; private MyClient myClient2; - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("CallbackMultiWireTest.composite"); - myClient1 = scaDomain.getService(MyClient.class, "MyClientComponent1"); - myClient2 = scaDomain.getService(MyClient.class, "MyClientComponent2"); + @Before + public void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("CallbackMultiWireTest.composite"); + node = NodeFactory.newInstance().createNode("CallbackMultiWireTest.composite", new Contribution("c1", location)); + node.start(); + myClient1 = node.getService(MyClient.class, "MyClientComponent1"); + myClient2 = node.getService(MyClient.class, "MyClientComponent2"); } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); + + @After + public void tearDown() throws Exception { + node.stop(); } + @Test public void test() throws Exception { System.out.println("Main thread " + Thread.currentThread()); myClient1.aClientMethod(); diff --git a/java/sca/itest/callback-separatethread/pom.xml b/java/sca/itest/callback-separatethread/pom.xml index 4ba2834ba8..838d3f1b47 100644 --- a/java/sca/itest/callback-separatethread/pom.xml +++ b/java/sca/itest/callback-separatethread/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java index e861f8a3d1..745240bd14 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java @@ -21,8 +21,7 @@ package org.apache.tuscany.sca.itest; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; - +import org.junit.Assert; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; @@ -58,22 +57,22 @@ public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadC public void runTests() { // Register for 1 second call back registerFor1SecondCallback(); - + // Wait for a few 1 second call backs System.out.println("Waiting for some 1 second calls"); waitForSome1SecondCallbacks(); // Register for 5 second call back registerFor5SecondCallback(); - + // Wait for a few 1 second call backs System.out.println("Waiting for some 1 second calls"); waitForSome1SecondCallbacks(); - + // Wait for a few 5 second call backs System.out.println("Waiting for some 5 second calls"); waitForSome5SecondCallbacks(); - + System.out.println("Done"); } @@ -83,7 +82,7 @@ public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadC private void waitForSome1SecondCallbacks() { // Reset the one second call back count oneSecondCallbackCount.set(0); - + // Wait until we have 10 1 second call backs or 60 seconds has passed final long start = System.currentTimeMillis(); do { @@ -91,15 +90,14 @@ public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadC System.out.println("Received enough 1 second notifications"); return; } - + try { Thread.sleep(500); } catch (InterruptedException e) { Assert.fail("Unexpeceted exception " + e); } - } - while (System.currentTimeMillis() - start < SIXTY_SECONDS); - + } while (System.currentTimeMillis() - start < SIXTY_SECONDS); + // If we get to here then we did not receive enough events Assert.fail("Did not receive enough 1 second events"); } @@ -110,31 +108,26 @@ public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadC private void waitForSome5SecondCallbacks() { // Reset the five second call back count fiveSecondCallbackCount.set(0); - + // Wait until we have 4 5 second call backs or 60 seconds has passed final long start = System.currentTimeMillis(); - do - { + do { if (fiveSecondCallbackCount.get() >= 4) { System.out.println("Received enough 5 second notifications"); return; } - - try - { + + try { Thread.sleep(500); - } - catch (InterruptedException e) - { + } catch (InterruptedException e) { Assert.fail("Unexpeceted exception " + e); } - } - while (System.currentTimeMillis() - start < SIXTY_SECONDS); - + } while (System.currentTimeMillis() - start < SIXTY_SECONDS); + // If we get to here then we did not receive enough events Assert.fail("Did not receive enough 5 second events"); } - + /** * Register to receive one second call backs */ @@ -165,8 +158,7 @@ public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadC } else if (aEventName.equals("FIVE")) { final int newValue = fiveSecondCallbackCount.incrementAndGet(); //System.out.println("Received total of " + newValue + " 5 second call backs"); - } - else + } else System.out.println("Unknown event type of " + aEventName); } } diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java index ae41f596fc..3f86d14059 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java @@ -19,7 +19,6 @@ package org.apache.tuscany.sca.itest; - import org.osoa.sca.annotations.Remotable; /** diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java index c22b8cceec..127c63eb9e 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java @@ -23,7 +23,6 @@ import org.osoa.sca.annotations.Callback; import org.osoa.sca.annotations.Conversational; import org.osoa.sca.annotations.Remotable; - /** * Sample Event Processor Service */ diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java index 4d672b3a8b..9b8692549a 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java @@ -43,39 +43,38 @@ public class EventProcessorServiceImpl implements EventProcessorService { */ @Callback protected CallableReference clientCallback; - + /** * This map contains the call backs for each of the registered Event names */ - private final Map> eventListeners; - + private final Map> eventListeners; + /** * The list of all Event Generators we create */ private final EventGenerator[] allEventGenerators; - + /** * Constructor. Starts the Event Generators */ public EventProcessorServiceImpl() { eventListeners = new ConcurrentHashMap>(); - + // We will simulate an Event generator allEventGenerators = new EventGenerator[2]; - allEventGenerators[0] = new EventGenerator("ONE", 1); // Generate the SECOND event every second - allEventGenerators[1] = new EventGenerator("FIVE", 5); // Generate the FIVE event every 5 seconds + allEventGenerators[0] = new EventGenerator("ONE", 1); // Generate the SECOND event every second + allEventGenerators[1] = new EventGenerator("FIVE", 5); // Generate the FIVE event every 5 seconds } - + /** * Registers the client to receive notifications for the specified event * * @param aEventName The name of the Event to register */ - public void registerForEvent(String aEventName) - { + public void registerForEvent(String aEventName) { // Register for the Event eventListeners.put(aEventName, clientCallback); - + // Send the "register" started event to the client receiveEvent(aEventName, "SameThread: Registered to receive notifications for " + aEventName); } @@ -85,89 +84,81 @@ public class EventProcessorServiceImpl implements EventProcessorService { * * @param aEventName The name of the Event to unregister */ - public void unregisterForEvent(String aEventName) - { + public void unregisterForEvent(String aEventName) { // Send the "register" started event to the client receiveEvent(aEventName, "SameThread: Unregister from receiving notifications for " + aEventName); - + eventListeners.remove(aEventName); } - + /** * This method is called whenever the EventProcessorService receives an Event * * @param aEventName The name of the Event received * @param aEventData The Event data */ - private void receiveEvent(String aEventName, Object aEventData) - { + private void receiveEvent(String aEventName, Object aEventData) { // Get the listener for the Event final CallableReference callback = eventListeners.get(aEventName); - if (callback == null) - { + if (callback == null) { //System.out.println("No registered listeners for " + aEventName); return; } - + // Trigger the call back // System.out.println("Notifying " + callback + " of event " + aEventName); callback.getService().eventNotification(aEventName, aEventData); // System.out.println("Done notify " + callback + " of event " + aEventName); } - + /** * Shuts down the Event Processor */ @Destroy - public void shutdown() - { + public void shutdown() { System.out.println("Shutting down the EventProcessor"); - + // Clear list of call back locations as we don't want to send any more notifications eventListeners.clear(); // Stop the Event Generators - for (EventGenerator generator : allEventGenerators) - { + for (EventGenerator generator : allEventGenerators) { generator.stop(); } } - + /** * Utility class for generating Events */ - private class EventGenerator - { + private class EventGenerator { /** * The Timer we are using to generate the events */ private final Timer timer = new Timer(); - + /** * Constructor * * @param aEventName The name of the Event to generate * @param frequencyInSeconds How frequently we should generate the Events */ - private EventGenerator(String aEventName, int frequencyInSeconds) - { - timer.schedule(new EventGeneratorTimerTask(aEventName), - frequencyInSeconds * 1000, frequencyInSeconds * 1000); + private EventGenerator(String aEventName, int frequencyInSeconds) { + timer.schedule(new EventGeneratorTimerTask(aEventName), + frequencyInSeconds * 1000, + frequencyInSeconds * 1000); } - + /** * Stop this Event Generator */ - private void stop() - { + private void stop() { timer.cancel(); } - + /** * The TimerTask that is invoked by the Timer for the EventGenerator */ - private class EventGeneratorTimerTask extends TimerTask - { + private class EventGeneratorTimerTask extends TimerTask { /** * The name of the Event we should generate */ @@ -178,17 +169,15 @@ public class EventProcessorServiceImpl implements EventProcessorService { * * @param aEventName The name of the Event we should generate */ - private EventGeneratorTimerTask(String aEventName) - { + private EventGeneratorTimerTask(String aEventName) { eventName = aEventName; } /** * Timer calls this method and it will generate an Event */ - @Override - public void run() - { + + public void run() { // System.out.println("Generating new event " + eventName); receiveEvent(eventName, "Separate Thread Notification: " + UUID.randomUUID().toString()); } diff --git a/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java index f7e7be2133..1dae2e1862 100644 --- a/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java +++ b/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java @@ -21,7 +21,13 @@ package org.apache.tuscany.sca.itest; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; /** * This test case will attempt to trigger a call back using a separate thread @@ -29,10 +35,10 @@ import org.apache.tuscany.sca.host.embedded.SCADomain; public class CallBackSeparateThreadTestCase extends TestCase { /** - * The SCADomain we are using + * The Node we are using */ - private SCADomain domain; - + private Node node; + /** * The client the tests should use */ @@ -41,24 +47,29 @@ public class CallBackSeparateThreadTestCase extends TestCase { /** * Run the call back in separate thread tests */ + @Test public void testCallBackSeparateThread() { - aCallBackClient.runTests(); + aCallBackClient.runTests(); } /** * Load the Call back in separate thread composite and look up the client. */ - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackSeparateThreadTest.composite"); - aCallBackClient = domain.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient"); + + @Before + public void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("CallBackSeparateThreadTest.composite"); + node = NodeFactory.newInstance().createNode("CallBackSeparateThreadTest.composite", new Contribution("c1", location)); + node.start(); + aCallBackClient = node.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient"); } /** - * Shutdown the SCA domain + * Shutdown the SCA node */ - @Override - protected void tearDown() throws Exception { - domain.close(); + + @After + public void tearDown() throws Exception { + node.stop(); } } diff --git a/java/sca/itest/callback-set-callback/pom.xml b/java/sca/itest/callback-set-callback/pom.xml index 887213e392..b8fc5e7fda 100644 --- a/java/sca/itest/callback-set-callback/pom.xml +++ b/java/sca/itest/callback-set-callback/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java index 48752f2ea1..1a9e3ab35a 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.Assert; +import org.junit.Assert; public class CallBackSetCallbackBadCallback { diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java index 66e4d3fc05..96b94ce70b 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java @@ -20,8 +20,7 @@ package org.apache.tuscany.sca.test; import java.io.File; -import junit.framework.Assert; - +import org.junit.Assert; import org.osoa.sca.NoRegisteredCallbackException; import org.osoa.sca.ServiceReference; import org.osoa.sca.annotations.Reference; @@ -111,7 +110,7 @@ public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient Assert.assertEquals("CallBackSetCallback - Test4", true, aFile.exists()); - aCallBackService.setCallback(null); // leave this in the default state for next test + aCallBackService.setCallback(null); // leave this in the default state for next test } @@ -178,10 +177,10 @@ public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient // If not, this method will return false. // - aCallBackService.setCallback(callBack); // ensure no client-side exception + aCallBackService.setCallback(callBack); // ensure no client-side exception - boolean result = aCallBackService.getService().setCallbackIllegally - ("Try to set callback on your own service reference"); + boolean result = + aCallBackService.getService().setCallbackIllegally("Try to set callback on your own service reference"); Assert.assertEquals("CallBackSetCallback - Test10", true, result); diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java index 4a6c9dbaa6..4ec37f0d8b 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java @@ -56,7 +56,7 @@ public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService try { requestContext = context.getRequestContext(); - serviceRef = (ServiceReference) requestContext.getServiceReference(); + serviceRef = (ServiceReference)requestContext.getServiceReference(); serviceRef.setCallback(serviceRef); } catch (ClassCastException goodEx) { exceptionProduced = true; diff --git a/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java index 496ae0b1a5..5aaf596d85 100644 --- a/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java +++ b/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java @@ -20,30 +20,35 @@ package org.apache.tuscany.sca.test; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Before; //FIXME Fix this test case public class CallBackSetCallbackTestCase extends TestCase { - private SCADomain domain; + private Node node; private CallBackSetCallbackClient aCallBackClient; public void testCallBackSetCallback() { aCallBackClient.run(); } - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackSetCallbackTest.composite"); - - aCallBackClient = - domain.getService(CallBackSetCallbackClient.class, - "CallBackSetCallbackClient"); + @Before + public void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("CallBackSetCallbackTest.composite"); + node = + NodeFactory.newInstance().createNode("CallBackSetCallbackTest.composite", new Contribution("c1", location)); + node.start(); + aCallBackClient = node.getService(CallBackSetCallbackClient.class, "CallBackSetCallbackClient"); } - - @Override - protected void tearDown() throws Exception { - domain.close(); + + @After + public void tearDown() throws Exception { + node.stop(); } } diff --git a/java/sca/itest/callback-set-conversation/pom.xml b/java/sca/itest/callback-set-conversation/pom.xml index bbb64a0b5d..4356e70491 100644 --- a/java/sca/itest/callback-set-conversation/pom.xml +++ b/java/sca/itest/callback-set-conversation/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java index d97c69eaed..77837fdb77 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test; import java.io.Serializable; -import junit.framework.Assert; +import org.junit.Assert; public class CallBackSetCallbackConvBadCallback implements Serializable { diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java index 5d692e7728..cc9894fe3d 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java @@ -18,8 +18,7 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.Assert; - +import org.junit.Assert; import org.osoa.sca.ComponentContext; import org.osoa.sca.ServiceReference; import org.osoa.sca.annotations.Context; @@ -81,8 +80,7 @@ public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackCon aCallbackObject = new CallBackSetCallbackConvObjectCallback(); aCallbackObject.incrementCallBackCount(); - ServiceReference aCallBackServiceRef - = componentContext.cast(aCallBackService); + ServiceReference aCallBackServiceRef = componentContext.cast(aCallBackService); aCallBackServiceRef.setCallback(aCallbackObject); aCallBackService.knockKnock("Knock Knock 7"); @@ -102,8 +100,8 @@ public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackCon // try { - ServiceReference aCallBackServiceRef - = componentContext.cast(aCallBackService); + ServiceReference aCallBackServiceRef = + componentContext.cast(aCallBackService); aCallBackServiceRef.setCallback(new CallBackSetCallbackConvBadCallback()); aCallBackService.knockKnock("Knock Knock 8"); } @@ -112,8 +110,7 @@ public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackCon // This should catch an appropriate exception. // - catch (IllegalArgumentException goodEx) - { + catch (IllegalArgumentException goodEx) { System.out.println("correct exception " + goodEx); correctException = true; } @@ -140,16 +137,15 @@ public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackCon // try { - ServiceReference aCallBackServiceRef - = componentContext.cast(aCallBackService); + ServiceReference aCallBackServiceRef = + componentContext.cast(aCallBackService); aCallBackServiceRef.setCallback(new CallBackSetCallbackConvNonSerCallback()); aCallBackService.knockKnock("Knock Knock 9"); } // // This should catch an appropriate exception. // - catch (IllegalArgumentException goodEx) - { + catch (IllegalArgumentException goodEx) { System.out.println("correct exception " + goodEx); correctException = true; } catch (Exception ex) { diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java index 75a4a3a6a0..bd17731fa1 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.Assert; +import org.junit.Assert; public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback { diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java index e7a3b144f6..f7c718adab 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java @@ -20,8 +20,7 @@ package org.apache.tuscany.sca.test; import java.io.Serializable; -public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable -{ +public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable { private int callBackCount = 0; public CallBackSetCallbackConvObjectCallback() { diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java index bca94ce407..5532943943 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java @@ -58,7 +58,7 @@ public class CallBackSetCallbackConvServiceImpl implements CallBackSetCallbackCo // working..... try { requestContext = context.getRequestContext(); - serviceRef = (ServiceReference) requestContext.getServiceReference(); + serviceRef = (ServiceReference)requestContext.getServiceReference(); } catch (Exception ex) { System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + ex.toString()); ex.printStackTrace(); diff --git a/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java index 45bdaea9ab..a61682da06 100644 --- a/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java +++ b/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java @@ -18,31 +18,35 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.TestCase; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import org.apache.tuscany.sca.host.embedded.SCADomain; +public class CallBackSetCallbackConvTestCase { -public class CallBackSetCallbackConvTestCase extends TestCase { - - private SCADomain domain; + private Node node; private CallBackSetCallbackConvClient aCallBackClient; + @Test public void testCallBackSetCallback() { aCallBackClient.run(); } - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite"); - - aCallBackClient = - domain.getService(CallBackSetCallbackConvClient.class, - "CallBackSetCallbackConvClient"); + @Before + public void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("CallBackSetCallbackConvTest.composite"); + node = NodeFactory.newInstance().createNode("CallBackSetCallbackConvTest.composite", new Contribution("c1", location)); + node.start(); + aCallBackClient = node.getService(CallBackSetCallbackConvClient.class, "CallBackSetCallbackConvClient"); } - - @Override - protected void tearDown() throws Exception { - domain.close(); + + @After + public void tearDown() throws Exception { + node.stop(); } } diff --git a/java/sca/itest/component-type/pom.xml b/java/sca/itest/component-type/pom.xml index d97ebf3866..650563af94 100644 --- a/java/sca/itest/component-type/pom.xml +++ b/java/sca/itest/component-type/pom.xml @@ -39,14 +39,14 @@ org.apache.tuscany.sca tuscany-node-impl 2.0-SNAPSHOT - test + runtime org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - test + runtime diff --git a/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java b/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java index 1a222990c1..6f978bd9be 100644 --- a/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java +++ b/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java @@ -34,8 +34,8 @@ public class CalculatorClient { String location = ContributionLocationHelper.getContributionLocation("Calculator.composite"); Node node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("c1", location)); node.start(); - - CalculatorService calculatorService = + + CalculatorService calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService"); // Calculate @@ -46,5 +46,4 @@ public class CalculatorClient { node.stop(); } - } diff --git a/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java b/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java index 031fa8b912..c89043276e 100644 --- a/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java +++ b/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java @@ -18,7 +18,6 @@ */ package calculator; - /** * The Calculator service interface. */ diff --git a/java/sca/itest/conversations/pom.xml b/java/sca/itest/conversations/pom.xml index e4123f0158..6637f7ac02 100644 --- a/java/sca/itest/conversations/pom.xml +++ b/java/sca/itest/conversations/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java index 8e98b9cbd4..946ad93d7d 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java @@ -26,10 +26,11 @@ import java.util.Hashtable; public class TestResult { public static Hashtable results = new Hashtable(); private static int completed = 0; + public static synchronized void updateCompleted() { ++completed; } - + public static synchronized int getCompleted() { return completed; } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java index 77d7f4c007..eeb7aa98e2 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java @@ -25,7 +25,7 @@ import org.osoa.sca.annotations.Conversational; */ @Conversational public interface BService { - + /** * Returns the state for this service. * diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java index a6dbf56797..e8887071c3 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java @@ -29,14 +29,14 @@ public interface CService { String getState(); void setState(String aState); - + Object getConversationID(); - + Object getConversationObjectConversationId(); - + void setConversationID(String theID); - + void endConversation(); - + void endConversationViaAnnotatedMethod(); } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java index 53dadc3dc7..f0f5ac041d 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java @@ -25,5 +25,6 @@ import org.osoa.sca.annotations.Conversational; public interface ConversationIdService { String getCIDField(); + String getCIDSetter(); } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java index 8cad88d2f4..089c2eb58c 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java @@ -22,7 +22,6 @@ import org.osoa.sca.annotations.Conversational; import org.osoa.sca.annotations.EndsConversation; import org.osoa.sca.annotations.Remotable; - /** * The callback interface used when testing conversational callbacks * @@ -31,19 +30,19 @@ import org.osoa.sca.annotations.Remotable; @Remotable @Conversational public interface ConversationalCallback { - + public void init(); - + public void destroy(); - + public void initializeCount(int count); - + public void incrementCount(); - + public int retrieveCount(); - - public void businessException() throws Exception; - + + public void businessException() throws Exception; + @EndsConversation public String endConversation(); diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java index 2532346349..d4086d63d9 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java @@ -28,23 +28,39 @@ import org.osoa.sca.annotations.Remotable; */ @Remotable -public interface ConversationalClient { - - public int runConversationFromInjectedReference(); - public int runConversationFromInjectedReference2(); - public int runConversationFromServiceReference(); - public int runConversationWithUserDefinedConversationId(); - public String runConversationCheckUserDefinedConversationId(); - public int runConversationCheckingScope(); - public int runConversationWithCallback(); - public int runConversationHavingPassedReference(); - public String runConversationBusinessException(); - public String runConversationBusinessExceptionCallback(); - public int runConversationCallingEndedConversation(); - public int runConversationCallingEndedConversationCallback(); - public String runConversationCallingEndedConversationCheckConversationId(); - public String runConversationCallingEndedConversationCallbackCheckConversationId(); - public int runConversationAgeTimeout(); - public int runConversationIdleTimeout(); - public int runConversationPrincipleError(); +public interface ConversationalClient { + + public int runConversationFromInjectedReference(); + + public int runConversationFromInjectedReference2(); + + public int runConversationFromServiceReference(); + + public int runConversationWithUserDefinedConversationId(); + + public String runConversationCheckUserDefinedConversationId(); + + public int runConversationCheckingScope(); + + public int runConversationWithCallback(); + + public int runConversationHavingPassedReference(); + + public String runConversationBusinessException(); + + public String runConversationBusinessExceptionCallback(); + + public int runConversationCallingEndedConversation(); + + public int runConversationCallingEndedConversationCallback(); + + public String runConversationCallingEndedConversationCheckConversationId(); + + public String runConversationCallingEndedConversationCallbackCheckConversationId(); + + public int runConversationAgeTimeout(); + + public int runConversationIdleTimeout(); + + public int runConversationPrincipleError(); } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java index 8f008fa711..44a7be9a7a 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java @@ -29,8 +29,8 @@ import org.osoa.sca.annotations.Remotable; */ @Remotable -public interface ConversationalReferenceClient { - +public interface ConversationalReferenceClient { + public void incrementCount(CallableReference conversationalService); } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java index 546382cfd1..b24dc70a70 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java @@ -23,7 +23,6 @@ import org.osoa.sca.annotations.Conversational; import org.osoa.sca.annotations.EndsConversation; import org.osoa.sca.annotations.Remotable; - /** * The service interface used when testing conversations * @@ -33,30 +32,30 @@ import org.osoa.sca.annotations.Remotable; @Conversational @Callback(ConversationalCallback.class) public interface ConversationalService { - + public void init(); - + public void destroy(); - + public void initializeCount(int count); - + public void incrementCount(); - + public int retrieveCount(); - - public void businessException() throws Exception; - + + public void businessException() throws Exception; + public void initializeCountCallback(int count); - + public void incrementCountCallback(); - + public int retrieveCountCallback(); - - public void businessExceptionCallback() throws Exception; - + + public void businessExceptionCallback() throws Exception; + @EndsConversation public String endConversation(); - + public String endConversationCallback(); } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java index f1a21cc18f..2dc3c3e604 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java @@ -23,7 +23,6 @@ import org.osoa.sca.annotations.Conversational; import org.osoa.sca.annotations.EndsConversation; import org.osoa.sca.annotations.Remotable; - /** * The service interface used when testing conversations * @@ -33,30 +32,30 @@ import org.osoa.sca.annotations.Remotable; @Conversational @Callback(NonConversationalCallback.class) public interface ConversationalServiceNonConversationalCallback { - + public void init(); - + public void destroy(); - + public void initializeCount(int count); - + public void incrementCount(); - + public int retrieveCount(); - - public void businessException() throws Exception; - + + public void businessException() throws Exception; + public void initializeCountCallback(int count); - + public void incrementCountCallback(); - + public int retrieveCountCallback(); - - public void businessExceptionCallback() throws Exception; - + + public void businessExceptionCallback() throws Exception; + @EndsConversation public String endConversation(); - + public String endConversationCallback(); } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java index 74afbfb763..e7295a6aee 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java @@ -26,7 +26,7 @@ import org.osoa.sca.annotations.EndsConversation; */ @Conversational public interface DService { - + /** * Returns the state for this service. * @@ -40,7 +40,7 @@ public interface DService { * @param aState The state for this service */ void setState(String aState); - + @EndsConversation void endConversationViaAnnotatedMethod(); } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java index 3ce3e3ada7..d7b2248165 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.itest.conversational; import org.osoa.sca.annotations.Remotable; - /** * The callback interface used when testing conversational callbacks * @@ -28,19 +27,19 @@ import org.osoa.sca.annotations.Remotable; */ @Remotable public interface NonConversationalCallback { - + public void init(); - + public void destroy(); - + public void initializeCount(int count); - + public void incrementCount(); - + public int retrieveCount(); - - public void businessException() throws Exception; - + + public void businessException() throws Exception; + public String endConversation(); } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java index 95c9c7ae6e..3b71679675 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java @@ -18,9 +18,6 @@ */ package org.apache.tuscany.sca.itest.conversational.impl; -import java.lang.reflect.Proxy; -import org.apache.tuscany.sca.core.invocation.JDKInvocationHandler; - import org.apache.tuscany.sca.itest.conversational.AService; import org.apache.tuscany.sca.itest.conversational.BService; import org.apache.tuscany.sca.itest.conversational.Constants; @@ -40,12 +37,12 @@ public class AServiceImpl implements AService { * The state */ private String state = Constants.A_INITIAL_VALUE; - + /** * The reference to the other service */ private BService b; - + /** * Constructor * @@ -58,12 +55,12 @@ public class AServiceImpl implements AService { * Inject the reference to the other service * @param aB The other service. */ - @Reference(name="b") + @Reference(name = "b") public void setB(BService aB) { System.out.println("---> Setting reference to B on " + this + " to " + aB); this.b = aB; } - + /** * Returns the state for this service. * @@ -99,7 +96,7 @@ public class AServiceImpl implements AService { public void setStateOnB(String aState) { b.setState(aState); } - + /** * Sets the conversation ID for this service * @param id The Conversation ID diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java index a5f37f7a52..1a3cc562d6 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java @@ -39,10 +39,10 @@ import org.osoa.sca.annotations.Service; public class AlphaImpl implements Alpha { @Reference public Beta beta; - + @Context protected ComponentContext componentContext; - + public void run(int param) { CallableReference gammaRef = null; boolean testPassed = true; @@ -61,8 +61,7 @@ public class AlphaImpl implements Alpha { } finally { TestResult.updateCompleted(); if (gammaRef != null) { - TestResult.results.put(gammaRef.getConversation() - .getConversationID(), testPassed); + TestResult.results.put(gammaRef.getConversation().getConversationID(), testPassed); gammaRef.getService().stop(); } } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java index c1e27641ef..fd3734a953 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java @@ -18,7 +18,6 @@ */ package org.apache.tuscany.sca.itest.conversational.impl; - import org.apache.tuscany.sca.itest.conversational.BService; import org.apache.tuscany.sca.itest.conversational.Constants; import org.osoa.sca.annotations.ConversationID; @@ -43,7 +42,7 @@ public class BServiceImpl implements BService { public BServiceImpl() { System.out.println("---> BServiceImpl constructor for " + this); } - + /** * Returns the state for this service. * diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java index 900b8f743f..e2bca68220 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java @@ -42,8 +42,7 @@ public class BetaImpl implements Beta { public Gamma gamma; public CallableReference getRef(int param) { - ServiceReference gammaRef = componentContext - .getServiceReference(Gamma.class, "gamma"); + ServiceReference gammaRef = componentContext.getServiceReference(Gamma.class, "gamma"); Gamma g = gammaRef.getService(); g.start(param); return gammaRef; diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java index b21f956bd9..d13ff53350 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java @@ -47,7 +47,6 @@ public class CServiceImpl implements CService { dServiceRef.getService().setState(aState); } - /* * When the coversationId is set manually the client may access the * conversation id that will be used by the reference using @@ -56,15 +55,15 @@ public class CServiceImpl implements CService { public Object getConversationID() { return dServiceRef.getConversationID(); } - + /* * Whether the conversation ID is chosen by the client or is generated by * the system, the client may access the conversation ID by calling * Conversation.getConversationID(). - */ + */ public Object getConversationObjectConversationId() { // TODO Auto-generated method stub - if (dServiceRef.getConversation() != null){ + if (dServiceRef.getConversation() != null) { return dServiceRef.getConversation().getConversationID(); } else { return null; diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java index 9deef312ac..8dccf41820 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java @@ -26,16 +26,16 @@ import org.osoa.sca.annotations.Service; @Service(ConversationalService.class) @Scope("CONVERSATION") -@ConversationAttributes(maxAge="1 seconds") +@ConversationAttributes(maxAge = "1 seconds") public class ConversationAgeComponentImpl implements ConversationalService { private int count; - - public void businessException() throws Exception { + + public void businessException() throws Exception { + } + + public void businessExceptionCallback() throws Exception { } - - public void businessExceptionCallback() throws Exception { - } public void destroy() { } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java index cffa76186a..efbae3ad16 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java @@ -32,14 +32,14 @@ public class ConversationIdComponentImpl implements ConversationIdService { public String cid; private String setterCid; - + public String getCIDField() { return cid; } + public String getCIDSetter() { return setterCid; } - @ConversationID public void setCID(String cid) { diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java index 1272c7ab7f..0604d0ca98 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java @@ -26,17 +26,17 @@ import org.osoa.sca.annotations.Service; @Service(ConversationalService.class) @Scope("CONVERSATION") -@ConversationAttributes(maxIdleTime="1 seconds") +@ConversationAttributes(maxIdleTime = "1 seconds") public class ConversationMaxIdleComponentImpl implements ConversationalService { private int count; - public void businessException() throws Exception { + public void businessException() throws Exception { } - - public void businessExceptionCallback() throws Exception { - } - + + public void businessExceptionCallback() throws Exception { + } + public void destroy() { } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java index 847b038881..08d618018d 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java @@ -39,280 +39,284 @@ import org.osoa.sca.annotations.Service; * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ */ -@Service(interfaces={ConversationalClient.class}) +@Service(interfaces = {ConversationalClient.class}) @Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) +@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false) public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback { - + @Context protected ComponentContext componentContext; - - @Reference + + @Reference protected ConversationalService conversationalService; - - @Reference + + @Reference protected ConversationalService conversationalService2; - + @Reference protected ConversationalReferenceClient conversationalReferenceClient; - + private int clientCount = 0; - private int callbackCount = 0; - - + private int callbackCount = 0; + // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - + public static StringBuffer calls = new StringBuffer(); + // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromInjectedReference2(){ + public int runConversationFromInjectedReference() { + calls.append("runConversationFromInjectedReference,"); + conversationalService.initializeCount(1); + conversationalService.incrementCount(); + clientCount = conversationalService.retrieveCount(); + conversationalService.endConversation(); + + return clientCount; + } + + public int runConversationFromInjectedReference2() { calls.append("runConversationFromInjectedReference2,"); - + conversationalService2.initializeCount(1); conversationalService2.incrementCount(); - + // stick in a call to the first reference to // make sure the two references don't clash conversationalService.initializeCount(1); - + clientCount = conversationalService2.retrieveCount(); conversationalService2.endConversation(); - + // end the conversation through the first reference conversationalService.endConversation(); - + return clientCount; - } - public int runConversationFromServiceReference(){ + } + + public int runConversationFromServiceReference() { calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + // serviceReference.getConversation().end(); - + return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ + } + + public int runConversationWithUserDefinedConversationId() { calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation1"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + // serviceReference.getConversation().end(); - + return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ + } + + public String runConversationCheckUserDefinedConversationId() { calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation2"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); - + String clientConversationId = serviceReference.getConversationID().toString(); String serverConversationId = callableReference.endConversation(); - - if (clientConversationId.equals("MyConversation2") && - serverConversationId.equals("MyConversation2") ) { + + if (clientConversationId.equals("MyConversation2") && serverConversationId.equals("MyConversation2")) { return clientConversationId; } else { - return "client = " + clientConversationId + - "server = " + serverConversationId; - } - - } - public int runConversationCheckingScope(){ + return "client = " + clientConversationId + "server = " + serverConversationId; + } + + } + + public int runConversationCheckingScope() { calls.append("runConversationCheckingScope,"); // run a conversation return runConversationFromInjectedReference(); - + // test will then use a static method to find out how many times // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - callbackCount = 2; + } + + public int runConversationWithCallback() { + calls.append("runConversationWithCallback,"); + callbackCount = 2; conversationalService.initializeCountCallback(1); conversationalService.incrementCountCallback(); clientCount = conversationalService.retrieveCountCallback(); conversationalService.endConversationCallback(); - + return clientCount; - } - public int runConversationHavingPassedReference(){ + } + + public int runConversationHavingPassedReference() { calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); conversationalReferenceClient.incrementCount(serviceReference); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + serviceReference.getConversation().end(); - + return clientCount; } - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); + + public String runConversationBusinessException() { + calls.append("runConversationbusinessException,"); try { conversationalService.initializeCount(1); conversationalService.businessException(); clientCount = conversationalService.retrieveCount(); conversationalService.endConversation(); - } catch(Exception ex) { + } catch (Exception ex) { return ex.getMessage(); } - + return "No Exception Returned"; } - - public String runConversationBusinessExceptionCallback(){ + + public String runConversationBusinessExceptionCallback() { calls.append("runConversationbusinessExceptionCallback,"); try { conversationalService.initializeCountCallback(1); conversationalService.businessExceptionCallback(); clientCount = conversationalService.retrieveCountCallback(); conversationalService.endConversationCallback(); - } catch(Exception ex) { + } catch (Exception ex) { return ex.getMessage(); } - + return "No Exception Returned"; - } - - public int runConversationCallingEndedConversation(){ + } + + public int runConversationCallingEndedConversation() { calls.append("runConversationCallingEndedConversation,"); conversationalService.initializeCount(1); conversationalService.endConversation(); return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ + } + + public int runConversationCallingEndedConversationCallback() { calls.append("runConversationCallingEndedConversationCallback,"); conversationalService.initializeCountCallback(1); conversationalService.endConversationCallback(); return conversationalService.retrieveCountCallback(); - } - - public String runConversationCallingEndedConversationCheckConversationId(){ + } + + public String runConversationCallingEndedConversationCheckConversationId() { calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation3"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { + + if (serviceReference.getConversation() == null) { return null; } else { return serviceReference.getConversation().getConversationID().toString(); } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ + } + + public String runConversationCallingEndedConversationCallbackCheckConversationId() { calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation3"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { + + if (serviceReference.getConversation() == null) { return null; } else { return serviceReference.getConversation().getConversationID().toString(); } - } - - public int runConversationAgeTimeout(){ + } + + public int runConversationAgeTimeout() { calls.append("runConversationAgeTimeout,"); // done in other testing return clientCount; } - public int runConversationIdleTimeout(){ + + public int runConversationIdleTimeout() { calls.append("runConversationIdleTimeout,"); // done in other testing return clientCount; } - public int runConversationPrincipleError(){ + + public int runConversationPrincipleError() { calls.append("runConversationPrincipleError,"); // TODO - when policy framework is done return clientCount; } - - + // From ConversationalCallback @Init - public void init(){ + public void init() { calls.append("init,"); } - + @Destroy - public void destroy(){ - calls.append("destroy,"); + public void destroy() { + calls.append("destroy,"); } - - public void initializeCount(int count){ + + public void initializeCount(int count) { calls.append("initializeCount,"); callbackCount += count; } - - public void incrementCount(){ + + public void incrementCount() { calls.append("incrementCount,"); callbackCount++; } - - public int retrieveCount(){ + + public int retrieveCount() { calls.append("retrieveCount,"); - return callbackCount; + return callbackCount; } - + public void businessException() throws Exception { throw new Exception("Business Exception"); - } - - public String endConversation(){ + } + + public String endConversation() { calls.append("endConversation,"); callbackCount = 0; return null; diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java index b77e4c0194..7dbf7bcd3e 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java @@ -39,270 +39,277 @@ import org.osoa.sca.annotations.Service; * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ */ -@Service(interfaces={ConversationalClient.class}) +@Service(interfaces = {ConversationalClient.class}) @Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback { - +@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false) +public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, + NonConversationalCallback { + @Context protected ComponentContext componentContext; - - @Reference + + @Reference protected ConversationalService conversationalService; - - @Reference + + @Reference protected ConversationalService conversationalService2; - + @Reference protected ConversationalReferenceClient conversationalReferenceClient; - + private int clientCount = 0; - private int callbackCount = 0; - - + private int callbackCount = 0; + // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - + public static StringBuffer calls = new StringBuffer(); + // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromInjectedReference2(){ + public int runConversationFromInjectedReference() { + calls.append("runConversationFromInjectedReference,"); + conversationalService.initializeCount(1); + conversationalService.incrementCount(); + clientCount = conversationalService.retrieveCount(); + conversationalService.endConversation(); + + return clientCount; + } + + public int runConversationFromInjectedReference2() { calls.append("runConversationFromInjectedReference2,"); - + conversationalService2.initializeCount(1); conversationalService2.incrementCount(); - + // stick in a call to the first reference to // make sure the two references don't clash conversationalService.initializeCount(1); - + clientCount = conversationalService2.retrieveCount(); conversationalService2.endConversation(); - + // end the conversation through the first reference conversationalService.endConversation(); - + return clientCount; - } - public int runConversationFromServiceReference(){ + } + + public int runConversationFromServiceReference() { calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + // serviceReference.getConversation().end(); - + return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ + } + + public int runConversationWithUserDefinedConversationId() { calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation1"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + // serviceReference.getConversation().end(); - + return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ + } + + public String runConversationCheckUserDefinedConversationId() { calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation2"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); return callableReference.endConversation(); - - } - public int runConversationCheckingScope(){ + + } + + public int runConversationCheckingScope() { calls.append("runConversationCheckingScope,"); // run a conversation return runConversationFromInjectedReference(); - + // test will then use a static method to find out how many times // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - callbackCount = 2; + } + + public int runConversationWithCallback() { + calls.append("runConversationWithCallback,"); + callbackCount = 2; conversationalService.initializeCountCallback(1); conversationalService.incrementCountCallback(); clientCount = conversationalService.retrieveCountCallback(); conversationalService.endConversationCallback(); - + return clientCount; - } - public int runConversationHavingPassedReference(){ + } + + public int runConversationHavingPassedReference() { calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); conversationalReferenceClient.incrementCount(serviceReference); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + // serviceReference.getConversation().end(); - + return clientCount; } - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); + + public String runConversationBusinessException() { + calls.append("runConversationbusinessException,"); try { conversationalService.initializeCount(1); conversationalService.businessException(); clientCount = conversationalService.retrieveCount(); conversationalService.endConversation(); - } catch(Exception ex) { + } catch (Exception ex) { return ex.getMessage(); } - + return "No Exception Returned"; } - - public String runConversationBusinessExceptionCallback(){ + + public String runConversationBusinessExceptionCallback() { calls.append("runConversationbusinessExceptionCallback,"); try { conversationalService.initializeCountCallback(1); conversationalService.businessExceptionCallback(); clientCount = conversationalService.retrieveCountCallback(); conversationalService.endConversationCallback(); - } catch(Exception ex) { + } catch (Exception ex) { return ex.getMessage(); } - + return "No Exception Returned"; - } - - public String runConversationCallingEndedConversationCheckConversationId(){ + } + + public String runConversationCallingEndedConversationCheckConversationId() { calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation3"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { + + if (serviceReference.getConversation() == null) { return null; } else { return serviceReference.getConversation().getConversationID().toString(); } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ + } + + public String runConversationCallingEndedConversationCallbackCheckConversationId() { calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation3"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { + + if (serviceReference.getConversation() == null) { return null; } else { return serviceReference.getConversation().getConversationID().toString(); } - } - - public int runConversationCallingEndedConversation(){ + } + + public int runConversationCallingEndedConversation() { calls.append("runConversationCallingEndedConversation,"); conversationalService.initializeCount(1); conversationalService.endConversation(); return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ + } + + public int runConversationCallingEndedConversationCallback() { calls.append("runConversationCallingEndedConversationCallback,"); conversationalService.initializeCountCallback(1); conversationalService.endConversationCallback(); return conversationalService.retrieveCountCallback(); - } - - public int runConversationAgeTimeout(){ + } + + public int runConversationAgeTimeout() { calls.append("runConversationAgeTimeout,"); // done in other testing return clientCount; } - public int runConversationIdleTimeout(){ + + public int runConversationIdleTimeout() { calls.append("runConversationIdleTimeout,"); // done in other testing return clientCount; } - public int runConversationPrincipleError(){ + + public int runConversationPrincipleError() { calls.append("runConversationPrincipleError,"); // TODO - when policy framework is done return clientCount; } - - + // From ConversationalCallback @Init - public void init(){ + public void init() { calls.append("init,"); } - + @Destroy - public void destroy(){ - calls.append("destroy,"); + public void destroy() { + calls.append("destroy,"); } - - public void initializeCount(int count){ + + public void initializeCount(int count) { calls.append("initializeCount,"); callbackCount += count; } - - public void incrementCount(){ + + public void incrementCount() { calls.append("incrementCount,"); callbackCount++; } - - public int retrieveCount(){ + + public int retrieveCount() { calls.append("retrieveCount,"); - return callbackCount; + return callbackCount; } - + public void businessException() throws Exception { throw new Exception("Business Exception"); - } - - public String endConversation(){ + } + + public String endConversation() { calls.append("endConversation,"); return null; } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java index 5b3906fc2c..ddfed4519f 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java @@ -37,278 +37,283 @@ import org.osoa.sca.annotations.Service; * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ */ -@Service(interfaces={ConversationalClient.class}) +@Service(interfaces = {ConversationalClient.class}) public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback { - + @Context protected ComponentContext componentContext; - - @Reference + + @Reference protected ConversationalService conversationalService; - - @Reference + + @Reference protected ConversationalService conversationalService2; - + @Reference protected ConversationalReferenceClient conversationalReferenceClient; - + private int clientCount = 0; private int callbackCount = 0; - + // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - + public static StringBuffer calls = new StringBuffer(); + // From ConversationalClient - public int runConversationFromInjectedReference(){ + public int runConversationFromInjectedReference() { calls.append("runConversationFromInjectedReference,"); conversationalService.initializeCount(1); conversationalService.incrementCount(); clientCount = conversationalService.retrieveCount(); conversationalService.endConversation(); - + return clientCount; } - public int runConversationFromInjectedReference2(){ - calls.append("runConversationFromInjectedReference2,"); + + public int runConversationFromInjectedReference2() { + calls.append("runConversationFromInjectedReference2,"); // now test the second reference conversationalService2.initializeCount(1); conversationalService2.incrementCount(); - + // stick in a call to the first reference to // make sure the two references don't clash conversationalService.initializeCount(1); - + clientCount = conversationalService2.retrieveCount(); conversationalService2.endConversation(); - + // end the conversation through the first reference conversationalService.endConversation(); - + return clientCount; } - public int runConversationFromServiceReference(){ + + public int runConversationFromServiceReference() { calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + // serviceReference.getConversation().end(); - + return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ + } + + public int runConversationWithUserDefinedConversationId() { calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation1"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + // serviceReference.getConversation().end(); - + return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ + } + + public String runConversationCheckUserDefinedConversationId() { calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation2"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); - + String clientConversationId = serviceReference.getConversationID().toString(); String serverConfersationId = callableReference.endConversation(); - - if (clientConversationId.equals("MyConversation2") && - serverConfersationId.equals("MyConversation2") ) { + + if (clientConversationId.equals("MyConversation2") && serverConfersationId.equals("MyConversation2")) { return clientConversationId; } else { - return "client = " + clientConversationId + - "server = " + serverConfersationId; - } - } - public int runConversationCheckingScope(){ + return "client = " + clientConversationId + "server = " + serverConfersationId; + } + } + + public int runConversationCheckingScope() { calls.append("runConversationCheckingScope,"); // run a conversation return runConversationFromInjectedReference(); - + // test will then use a static method to find out how many times // init/destroy were called } - public int runConversationWithCallback(){ + + public int runConversationWithCallback() { calls.append("runConversationWithCallback,"); conversationalService.initializeCountCallback(1); conversationalService.incrementCountCallback(); clientCount = conversationalService.retrieveCountCallback(); conversationalService.endConversationCallback(); - + return clientCount; - } - - public int runConversationHavingPassedReference(){ + } + + public int runConversationHavingPassedReference() { calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); conversationalReferenceClient.incrementCount(serviceReference); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - + serviceReference.getConversation().end(); - + return clientCount; - } - - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { + } + + public String runConversationBusinessException() { + calls.append("runConversationbusinessException,"); + try { conversationalService.initializeCount(1); conversationalService.businessException(); clientCount = conversationalService.retrieveCount(); conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - + } catch (Exception ex) { + return ex.getMessage(); + } + return "No Exception Returned"; } - - public String runConversationBusinessExceptionCallback(){ + + public String runConversationBusinessExceptionCallback() { calls.append("runConversationbusinessExceptionCallback,"); try { conversationalService.initializeCountCallback(1); conversationalService.businessExceptionCallback(); clientCount = conversationalService.retrieveCountCallback(); conversationalService.endConversationCallback(); - } catch(Exception ex) { + } catch (Exception ex) { return ex.getMessage(); } - + return "No Exception Returned"; - } - - public int runConversationCallingEndedConversation(){ + } + + public int runConversationCallingEndedConversation() { calls.append("runConversationCallingEndedConversation,"); conversationalService.initializeCount(1); conversationalService.endConversation(); return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ + } + + public int runConversationCallingEndedConversationCallback() { calls.append("runConversationCallingEndedConversationCallback,"); conversationalService.initializeCountCallback(1); conversationalService.endConversationCallback(); return conversationalService.retrieveCountCallback(); - } - - public String runConversationCallingEndedConversationCheckConversationId(){ + } + + public String runConversationCallingEndedConversationCheckConversationId() { calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation3"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { + + if (serviceReference.getConversation() == null) { return null; } else { return serviceReference.getConversation().getConversationID().toString(); } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ + } + + public String runConversationCallingEndedConversationCallbackCheckConversationId() { calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); + ServiceReference serviceReference = + componentContext.getServiceReference(ConversationalService.class, "conversationalService"); serviceReference.setConversationID("MyConversation3"); - + ConversationalService callableReference = serviceReference.getService(); - + callableReference.initializeCount(1); callableReference.incrementCount(); clientCount = callableReference.retrieveCount(); callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { + + if (serviceReference.getConversation() == null) { return null; } else { return serviceReference.getConversation().getConversationID().toString(); - } - } - - public int runConversationAgeTimeout(){ + } + } + + public int runConversationAgeTimeout() { calls.append("runConversationAgeTimeout,"); // done in other testing return clientCount; } - public int runConversationIdleTimeout(){ + + public int runConversationIdleTimeout() { calls.append("runConversationIdleTimeout,"); // done in other testing return clientCount; } - public int runConversationPrincipleError(){ + + public int runConversationPrincipleError() { calls.append("runConversationPrincipleError,"); // TODO - when policy framework is done return clientCount; } - - + // From ConversationalCallback @Init - public void init(){ + public void init() { calls.append("init,"); } - + @Destroy - public void destroy(){ + public void destroy() { calls.append("destroy,"); - + } - - public void initializeCount(int count){ + + public void initializeCount(int count) { calls.append("initializeCount,"); callbackCount = 0; } - - public void incrementCount(){ + + public void incrementCount() { calls.append("incrementCount,"); callbackCount++; } - - public int retrieveCount(){ + + public int retrieveCount() { calls.append("retrieveCount,"); - return callbackCount; + return callbackCount; } - + public void businessException() throws Exception { throw new Exception("Business Exception"); - } - - public String endConversation(){ + } + + public String endConversation() { calls.append("endConversation,"); callbackCount = 0; return null; diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java index 8fe7c5b6ba..14487dcf69 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java @@ -30,14 +30,13 @@ import org.osoa.sca.annotations.Service; * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ */ -@Service(interfaces={ConversationalReferenceClient.class}) -public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{ - - public void incrementCount(CallableReference conversationalService){ +@Service(interfaces = {ConversationalReferenceClient.class}) +public class ConversationalReferenceClientImpl implements ConversationalReferenceClient { + + public void incrementCount(CallableReference conversationalService) { ConversationalService callableReference = conversationalService.getService(); - - callableReference.incrementCount(); - } + callableReference.incrementCount(); + } } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java index 9a25f0f59a..60638d70f9 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java @@ -29,7 +29,6 @@ import org.osoa.sca.annotations.Init; import org.osoa.sca.annotations.Scope; import org.osoa.sca.annotations.Service; - /** * The service used when testing stateful conversations * @@ -38,86 +37,86 @@ import org.osoa.sca.annotations.Service; @Service(ConversationalService.class) @Scope("REQUEST") public class ConversationalServiceRequestImpl implements ConversationalService { - + @ConversationID protected String conversationId; - + @Callback - protected ConversationalCallback conversationalCallback; - + protected ConversationalCallback conversationalCallback; + // static area in which to hold conversational data private static HashMap conversationalState = new HashMap(); - + // a static member variable that records the number of times this service is called public static StringBuffer calls = new StringBuffer(); - + @Init - public void init(){ + public void init() { calls.append("init,"); } - + @Destroy - public void destroy(){ + public void destroy() { calls.append("destroy,"); } - - public void initializeCount(int count){ + + public void initializeCount(int count) { calls.append("initializeCount,"); - Integer conversationalCount = new Integer(count); + Integer conversationalCount = new Integer(count); conversationalState.put(conversationId, conversationalCount); } - - public void incrementCount(){ + + public void incrementCount() { calls.append("incrementCount,"); Integer conversationalCount = conversationalState.get(conversationId); conversationalCount++; conversationalState.put(conversationId, conversationalCount); } - - public int retrieveCount(){ + + public int retrieveCount() { calls.append("retrieveCount,"); Integer count = conversationalState.get(conversationId); - if (count != null){ + if (count != null) { return count.intValue(); } else { return -999; } } - + public void businessException() throws Exception { throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ + } + + public void initializeCountCallback(int count) { calls.append("initializeCountCallback,"); initializeCount(count); conversationalCallback.initializeCount(count); } - - public void incrementCountCallback(){ + + public void incrementCountCallback() { calls.append("incrementCountCallback,"); incrementCount(); conversationalCallback.incrementCount(); } - - public int retrieveCountCallback(){ + + public int retrieveCountCallback() { calls.append("retrieveCountCallback,"); return conversationalCallback.retrieveCount(); } - + public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); + calls.append("businessExceptionCallback,"); conversationalCallback.businessException(); } - - public String endConversation(){ + + public String endConversation() { calls.append("endConversation,"); conversationalState.remove(conversationId); return conversationId; } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); + + public String endConversationCallback() { + calls.append("endConversationCallback,"); return conversationalCallback.endConversation(); - } + } } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java index efcbdff06f..cf95cc83f3 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java @@ -28,7 +28,6 @@ import org.osoa.sca.annotations.Init; import org.osoa.sca.annotations.Scope; import org.osoa.sca.annotations.Service; - /** * The service used when testing stateful conversations * @@ -36,82 +35,80 @@ import org.osoa.sca.annotations.Service; */ @Service(ConversationalService.class) @Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) +@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false) public class ConversationalServiceStatefulImpl implements ConversationalService { @ConversationID protected String conversationId; - + @Callback - protected ConversationalCallback conversationalCallback; - + protected ConversationalCallback conversationalCallback; + // local count - accumulates during the conversation private int count = 0; - + // a static member variable that records the number of times this service is called public static StringBuffer calls = new StringBuffer(); - + @Init - public void init(){ + public void init() { calls.append("init,"); } - + @Destroy - public void destroy(){ + public void destroy() { calls.append("destroy,"); } - - public void initializeCount(int count){ - calls.append("initializeCount,"); + + public void initializeCount(int count) { + calls.append("initializeCount,"); this.count = count; } - - public void incrementCount(){ - calls.append("incrementCount,"); + + public void incrementCount() { + calls.append("incrementCount,"); count++; } - - public int retrieveCount(){ - calls.append("retrieveCount,"); + + public int retrieveCount() { + calls.append("retrieveCount,"); return count; } - + public void businessException() throws Exception { throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); + } + + public void initializeCountCallback(int count) { + calls.append("initializeCountCallback,"); this.count = count; conversationalCallback.initializeCount(count); } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); + + public void incrementCountCallback() { + calls.append("incrementCountCallback,"); count++; conversationalCallback.incrementCount(); } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); + + public int retrieveCountCallback() { + calls.append("retrieveCountCallback,"); return conversationalCallback.retrieveCount(); } - + public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); + calls.append("businessExceptionCallback,"); conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); + } + + public String endConversation() { + calls.append("endConversation,"); count = 0; return conversationId; } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); + + public String endConversationCallback() { + calls.append("endConversationCallback,"); return conversationalCallback.endConversation(); } } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java index 8454b3846b..ebb474e3fe 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java @@ -28,7 +28,6 @@ import org.osoa.sca.annotations.Init; import org.osoa.sca.annotations.Scope; import org.osoa.sca.annotations.Service; - /** * The service used when testing stateful conversations * @@ -36,82 +35,81 @@ import org.osoa.sca.annotations.Service; */ @Service(ConversationalServiceNonConversationalCallback.class) @Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback { +@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false) +public class ConversationalServiceStatefulNonConversationalCallbackImpl implements + ConversationalServiceNonConversationalCallback { @ConversationID protected String conversationId; - + @Callback - protected NonConversationalCallback nonConversationalCallback; - + protected NonConversationalCallback nonConversationalCallback; + // local count - accumulates during the conversation private int count = 0; - + // a static member variable that records the number of times this service is called public static StringBuffer calls = new StringBuffer(); - + @Init - public void init(){ + public void init() { calls.append("init,"); } - + @Destroy - public void destroy(){ + public void destroy() { calls.append("destroy,"); } - - public void initializeCount(int count){ - calls.append("initializeCount,"); + + public void initializeCount(int count) { + calls.append("initializeCount,"); this.count = count; } - - public void incrementCount(){ - calls.append("incrementCount,"); + + public void incrementCount() { + calls.append("incrementCount,"); count++; } - - public int retrieveCount(){ - calls.append("retrieveCount,"); + + public int retrieveCount() { + calls.append("retrieveCount,"); return count; } - + public void businessException() throws Exception { throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); + } + + public void initializeCountCallback(int count) { + calls.append("initializeCountCallback,"); this.count = count; nonConversationalCallback.initializeCount(count); } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); + + public void incrementCountCallback() { + calls.append("incrementCountCallback,"); count++; nonConversationalCallback.incrementCount(); } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); + + public int retrieveCountCallback() { + calls.append("retrieveCountCallback,"); return nonConversationalCallback.retrieveCount(); } - + public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); + calls.append("businessExceptionCallback,"); nonConversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); + } + + public String endConversation() { + calls.append("endConversation,"); count = 0; return conversationId; } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); + + public String endConversationCallback() { + calls.append("endConversationCallback,"); return nonConversationalCallback.endConversation(); } } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java index 07186c91e1..ac8e7c8d18 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java @@ -29,7 +29,6 @@ import org.osoa.sca.annotations.Init; import org.osoa.sca.annotations.Scope; import org.osoa.sca.annotations.Service; - /** * The service used when testing stateful conversations * @@ -38,86 +37,86 @@ import org.osoa.sca.annotations.Service; @Service(ConversationalService.class) @Scope("STATELESS") public class ConversationalServiceStatelessImpl implements ConversationalService { - + @ConversationID protected String conversationId; - + @Callback - protected ConversationalCallback conversationalCallback; - + protected ConversationalCallback conversationalCallback; + // static area in which to hold conversational data private static HashMap conversationalState = new HashMap(); - + // a static member variable that records the number of times this service is called public static StringBuffer calls = new StringBuffer(); - + @Init - public void init(){ + public void init() { calls.append("init,"); } - + @Destroy - public void destroy(){ + public void destroy() { calls.append("destroy,"); } - - public void initializeCount(int count){ + + public void initializeCount(int count) { calls.append("initializeCount,"); - Integer conversationalCount = new Integer(count); + Integer conversationalCount = new Integer(count); conversationalState.put(conversationId, conversationalCount); } - - public void incrementCount(){ + + public void incrementCount() { calls.append("incrementCount,"); Integer conversationalCount = conversationalState.get(conversationId); conversationalCount++; conversationalState.put(conversationId, conversationalCount); } - - public int retrieveCount(){ + + public int retrieveCount() { calls.append("retrieveCount,"); Integer count = conversationalState.get(conversationId); - if (count != null){ + if (count != null) { return count.intValue(); } else { return -999; } } - + public void businessException() throws Exception { throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ + } + + public void initializeCountCallback(int count) { calls.append("initializeCountCallback,"); initializeCount(count); conversationalCallback.initializeCount(count); } - - public void incrementCountCallback(){ + + public void incrementCountCallback() { calls.append("incrementCountCallback,"); incrementCount(); conversationalCallback.incrementCount(); } - - public int retrieveCountCallback(){ + + public int retrieveCountCallback() { calls.append("retrieveCountCallback,"); return conversationalCallback.retrieveCount(); } - + public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); + calls.append("businessExceptionCallback,"); conversationalCallback.businessException(); } - - public String endConversation(){ + + public String endConversation() { calls.append("endConversation,"); conversationalState.remove(conversationId); return conversationId; } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); + + public String endConversationCallback() { + calls.append("endConversationCallback,"); return conversationalCallback.endConversation(); - } + } } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java index 344aa99dff..3abeda9ba3 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java @@ -33,10 +33,10 @@ public class ConversationalServiceStatelessScopeImpl implements ConversationalSe protected String cid; static Map state = new HashMap(); - + public void destroy() { // TODO Auto-generated method stub - + } public String endConversation() { @@ -47,25 +47,25 @@ public class ConversationalServiceStatelessScopeImpl implements ConversationalSe public String endConversationCallback() { // TODO Auto-generated method stub return null; - + } public void incrementCount() { - state.put(cid, Integer.valueOf(state.get(cid)+1)); + state.put(cid, Integer.valueOf(state.get(cid) + 1)); } public void businessException() throws Exception { throw new Exception("Business Exception"); } - + public void incrementCountCallback() { // TODO Auto-generated method stub - + } public void init() { // TODO Auto-generated method stub - + } public void initializeCount(int count) { @@ -74,12 +74,12 @@ public class ConversationalServiceStatelessScopeImpl implements ConversationalSe public void initializeCountCallback(int count) { // TODO Auto-generated method stub - + } - + public void businessExceptionCallback() throws Exception { throw new Exception("Business Exception"); - } + } public int retrieveCount() { return state.get(cid); @@ -89,5 +89,5 @@ public class ConversationalServiceStatelessScopeImpl implements ConversationalSe // TODO Auto-generated method stub return 0; } - + } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java index 8d79bb75e8..610a81aaa8 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java @@ -18,11 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.Constants; import org.apache.tuscany.sca.itest.conversational.DService; import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.EndsConversation; import org.osoa.sca.annotations.Scope; import org.osoa.sca.annotations.Service; @@ -62,10 +59,10 @@ public class DServiceImpl implements DService { */ @ConversationID public void setConversationID(String id) { - System.out.println ("Setting conversation ID at service = " + id ); + System.out.println("Setting conversation ID at service = " + id); } - + public void endConversationViaAnnotatedMethod() { - System.out.println ("Annotated Ends Conversation"); + System.out.println("Annotated Ends Conversation"); } } diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java index d1b769216b..67305698f1 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java @@ -37,7 +37,7 @@ public class GammaImpl implements Gamma { public String conversationId; private ArrayList list; - + public void start(int param) { list = new ArrayList(); fillList(param, conversationId); @@ -54,7 +54,7 @@ public class GammaImpl implements Gamma { public void stop() { list = null; } - + private void fillList(int param, String cid) { for (int i = 0; i < param; i++) { Record record = new Record(); diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java index 3e750bdd1e..e64a9acbe2 100644 --- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java +++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java @@ -19,8 +19,10 @@ package org.apache.tuscany.sca.itest.conversational; - -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -28,25 +30,25 @@ import org.junit.Test; public class ConversationIdTestCase { - private SCADomain domain; + private Node node; @Before public void setUp() throws Exception { - domain = SCADomain.newInstance("conversationId.composite"); - + String location = ContributionLocationHelper.getContributionLocation("conversationId.composite"); + node = NodeFactory.newInstance().createNode("conversationId.composite", new Contribution("c1", location)); + node.start(); } @After public void tearDown() throws Exception { - if (domain != null) { - domain.close(); + if (node != null) { + node.stop(); } } @Test public void testConversationId() { - ConversationIdService service = - domain.getService(ConversationIdService.class, "ConversationIdComponent"); + ConversationIdService service = node.getService(ConversationIdService.class, "ConversationIdComponent"); Assert.assertNotNull(service.getCIDField()); Assert.assertNotNull(service.getCIDSetter()); } diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java index 326a833a42..2b1aea3ff3 100644 --- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java +++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java @@ -19,25 +19,30 @@ package org.apache.tuscany.sca.itest.conversational; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; import org.junit.Assert; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; public class ConversationLifetimeTestCase { - private SCADomain domain; + private static Node node; - @Before - public void setUp() throws Exception { - domain = SCADomain.newInstance("conversationLifetime.composite"); + @BeforeClass + public static void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("conversationLifetime.composite"); + node = NodeFactory.newInstance().createNode("conversationLifetime.composite", new Contribution("c1", location)); + node.start(); } - @After - public void tearDown() throws Exception { - if (domain != null) { - domain.close(); + @AfterClass + public static void tearDown() throws Exception { + if (node != null) { + node.stop(); } } @@ -64,7 +69,7 @@ public class ConversationLifetimeTestCase { */ @Test public void getConversationID() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.getState(); Assert.assertNull(service.getConversationID()); } @@ -76,12 +81,12 @@ public class ConversationLifetimeTestCase { @Test public void getConversationID2() { String userProvidedID = "A conversation ID"; - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.setConversationID(userProvidedID); service.getState(); Assert.assertEquals(service.getConversationID(), userProvidedID); } - + /** * Whether the conversation ID is chosen by the user or is generated by the system, the client * may access the conversation ID by calling getConversationID() on the current conversation object. @@ -89,13 +94,13 @@ public class ConversationLifetimeTestCase { */ @Test public void getConversationID3() { - String userProvidedID = "A conversation ID"; - CService service = domain.getService(CService.class, "ConversationalCComponent"); + String userProvidedID = "A conversation ID 3"; + CService service = node.getService(CService.class, "ConversationalCComponent"); service.setConversationID(userProvidedID); service.getState(); Assert.assertEquals(service.getConversationObjectConversationId(), userProvidedID); } - + /** * Whether the conversation ID is chosen by the user or is generated by the system, the client * may access the conversation ID by calling getConversationID() on the current conversation object. @@ -103,11 +108,11 @@ public class ConversationLifetimeTestCase { */ @Test public void getConversationID4() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.getState(); Assert.assertNotNull(service.getConversationObjectConversationId()); - } - + } + /** * Java Common Annotations and APIs 1.00 Specification line 494-495 Verify: * If a method is invoked on a service reference after an @@ -116,7 +121,7 @@ public class ConversationLifetimeTestCase { */ @Test public void implicitStartNewConversationAfterEnd() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.getState(); Object firstID = service.getConversationObjectConversationId(); service.endConversationViaAnnotatedMethod(); @@ -132,7 +137,7 @@ public class ConversationLifetimeTestCase { */ @Test public void implicitStartNewConversationAfterEnd2() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.getState(); Object firstID = service.getConversationObjectConversationId(); service.endConversation(); @@ -148,12 +153,12 @@ public class ConversationLifetimeTestCase { */ @Test public void nullConversationIDAfterEndConversation() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.getState(); service.endConversationViaAnnotatedMethod(); Assert.assertNull(service.getConversationObjectConversationId()); } - + /** * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: * If ServiceReference.getConversationID() is called after the @@ -162,7 +167,7 @@ public class ConversationLifetimeTestCase { */ @Test public void nullConversationIDAfterEndConversation1a() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.setConversationID("User provided ID"); service.getState(); service.endConversationViaAnnotatedMethod(); @@ -178,12 +183,12 @@ public class ConversationLifetimeTestCase { */ @Test public void nullConversationIDAfterEndConversation2() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.getState(); service.endConversation(); Assert.assertNull(service.getConversationObjectConversationId()); } - + /** * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If * ServiceReference.getConversationID() is called after the @@ -193,7 +198,7 @@ public class ConversationLifetimeTestCase { */ @Test public void nullConversationIDAfterEndConversation2a() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); + CService service = node.getService(CService.class, "ConversationalCComponent"); service.setConversationID("User provided ID"); service.getState(); service.endConversation(); diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java index 431962221a..f9bb69aa30 100644 --- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java +++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java @@ -19,11 +19,15 @@ package org.apache.tuscany.sca.itest.conversational; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.itest.TestResult; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; /** @@ -31,29 +35,32 @@ import org.junit.Test; */ public class ConversationUniqueIdTestCase { - private SCADomain domain; + private Node node; @Before public void setUp() throws Exception { - domain = SCADomain.newInstance("ConversationUniqueId.composite"); + String location = ContributionLocationHelper.getContributionLocation("ConversationUniqueId.composite"); + node = NodeFactory.newInstance().createNode("ConversationUniqueId.composite", new Contribution("c1", location)); + node.start(); } @After public void tearDown() throws Exception { - if (domain != null) { - domain.close(); + if (node != null) { + node.stop(); } } + @Ignore("I'm seeing NPE in GammaImpl.hasNext()") @Test public void testConversationUniqueId() { - Alpha alpha = domain.getService(Alpha.class, "Alpha"); + Alpha alpha = node.getService(Alpha.class, "Alpha"); int numConversations = 3; - - for(int i = 0; i < numConversations; ++i) { + + for (int i = 0; i < numConversations; ++i) { alpha.run(5); } - + // Wait for the conversations to complete while (TestResult.getCompleted() < numConversations) { try { @@ -61,9 +68,9 @@ public class ConversationUniqueIdTestCase { } catch (InterruptedException e) { } } - + Assert.assertEquals(TestResult.results.size(), numConversations); - for(Boolean value : TestResult.results.values()) { + for (Boolean value : TestResult.results.values()) { Assert.assertTrue(value); } } diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java index cc31c77873..58afba0d10 100644 --- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java +++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java @@ -19,29 +19,33 @@ package org.apache.tuscany.sca.itest.conversational; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; import org.junit.Assert; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.osoa.sca.ConversationEndedException; public class ConversationalAgeTestCase { - private SCADomain domain; - - @Before - public void setUp() throws Exception { - System.setProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval", "2"); - domain = SCADomain.newInstance("ConversationAge.composite"); + private static Node node; + @BeforeClass + public static void setUp() throws Exception { + System.setProperty("org.apache.tuscany.sca.core.conversation.ConversationManager.ReaperInterval", "2"); + String location = ContributionLocationHelper.getContributionLocation("ConversationAge.composite"); + node = NodeFactory.newInstance().createNode("ConversationAge.composite", new Contribution("c1", location)); + node.start(); } - @After - public void tearDown() throws Exception { - System.clearProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval"); - if (domain != null) { - domain.close(); + @AfterClass + public static void tearDown() throws Exception { + System.clearProperty("org.apache.tuscany.sca.core.conversation.ConversationManager.ReaperInterval"); + if (node != null) { + node.stop(); } } @@ -49,7 +53,7 @@ public class ConversationalAgeTestCase { public void testMaxAge() throws InterruptedException { ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationAgeComponent"); + node.getService(ConversationalService.class, "ConversationAgeComponent"); Assert.assertEquals(0, conversationalService.retrieveCount()); conversationalService.initializeCount(42); @@ -67,7 +71,7 @@ public class ConversationalAgeTestCase { public void testAgeExpired() throws InterruptedException { ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationAgeComponent"); + node.getService(ConversationalService.class, "ConversationAgeComponent"); Assert.assertEquals(0, conversationalService.retrieveCount()); conversationalService.initializeCount(42); @@ -86,7 +90,7 @@ public class ConversationalAgeTestCase { public void testMaxIdle() throws InterruptedException { ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationIdleComponent"); + node.getService(ConversationalService.class, "ConversationIdleComponent"); Assert.assertEquals(0, conversationalService.retrieveCount()); conversationalService.initializeCount(42); diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java index 8480e04028..ee1bf84fc4 100644 --- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java +++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java @@ -19,7 +19,10 @@ package org.apache.tuscany.sca.itest.conversational; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -27,25 +30,26 @@ import org.junit.Test; public class ConversationalJ2SETestCase { - private SCADomain domain; + private Node node; @Before public void setUp() throws Exception { - domain = SCADomain.newInstance("conversational.composite"); - + String location = ContributionLocationHelper.getContributionLocation("conversational.composite"); + node = NodeFactory.newInstance().createNode("conversational.composite", new Contribution("c1", location)); + node.start(); } @After public void tearDown() throws Exception { - if (domain != null) { - domain.close(); + if (node != null) { + node.stop(); } } @Test public void testStatefulConversation() { ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationalServiceStateful"); + node.getService(ConversationalService.class, "ConversationalServiceStateful"); conversationalService.initializeCount(1); Assert.assertEquals(1, conversationalService.retrieveCount()); @@ -66,7 +70,7 @@ public class ConversationalJ2SETestCase { @Test public void testStatelessConversation() { ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationalServiceStateless"); + node.getService(ConversationalService.class, "ConversationalServiceStateless"); conversationalService.initializeCount(1); Assert.assertEquals(1, conversationalService.retrieveCount()); diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java index da359bc296..56bca7ac78 100644 --- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java +++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java @@ -19,9 +19,6 @@ package org.apache.tuscany.sca.itest.conversational; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl; import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl; import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; @@ -29,63 +26,71 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceReq import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl; import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl; import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; public class ConversationalTestCase { - private static SCADomain domain; + private static Node node; private static ConversationalClient conversationalStatelessClientStatelessService; private static ConversationalClient conversationalStatelessClientStatefulService; private static ConversationalClient conversationalStatefulClientStatelessService; - private static ConversationalClient conversationalStatefulClientStatefulService; + private static ConversationalClient conversationalStatefulClientStatefulService; private static ConversationalClient conversationalStatelessClientRequestService; - private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; + private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; @BeforeClass public static void setUp() throws Exception { - try { - domain = SCADomain.newInstance("conversational.composite"); - - conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class, - "ConversationalStatelessClientStatelessService"); - - conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class, - "ConversationalStatelessClientStatefulService"); - - conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class, - "ConversationalStatefulClientStatelessService"); - - conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class, - "ConversationalStatefulClientStatefulService"); - conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class, - "ConversationalStatelessClientRequestService"); - conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class, - "ConversationalStatefulClientNonConversationalCallbackStatefulService"); - - } catch(Exception ex) { - System.err.println(ex.toString()); - } - + try { + String location = ContributionLocationHelper.getContributionLocation("conversational.composite"); + node = NodeFactory.newInstance().createNode("conversational.composite", new Contribution("c1", location)); + node.start(); + + conversationalStatelessClientStatelessService = + node.getService(ConversationalClient.class, "ConversationalStatelessClientStatelessService"); + + conversationalStatelessClientStatefulService = + node.getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService"); + + conversationalStatefulClientStatelessService = + node.getService(ConversationalClient.class, "ConversationalStatefulClientStatelessService"); + + conversationalStatefulClientStatefulService = + node.getService(ConversationalClient.class, "ConversationalStatefulClientStatefulService"); + conversationalStatelessClientRequestService = + node.getService(ConversationalClient.class, "ConversationalStatelessClientRequestService"); + conversationalStatefulClientNonConversationalCallbackStatelessService = + node.getService(ConversationalClient.class, + "ConversationalStatefulClientNonConversationalCallbackStatefulService"); + + } catch (Exception ex) { + System.err.println(ex.toString()); + } + } @AfterClass public static void tearDown() throws Exception { - domain.close(); + node.stop(); } - + private void resetCallStack() { - + // reset the place where we record the sequence of calls passing // through each component instance ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); + ConversationalServiceStatefulImpl.calls = new StringBuffer(); + ConversationalClientStatelessImpl.calls = new StringBuffer(); + ConversationalClientStatefulImpl.calls = new StringBuffer(); ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - + } // stateless client stateful service tests @@ -94,91 +99,96 @@ public class ConversationalTestCase { public void testStatelessStatefulConversationFromInjectedReference() { int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatelessStatefulConversationFromInjectedReference2() { int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatelessStatefulConversationFromServiceReference() { int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatelessStatefulConversationWithUserDefinedConversationId() { int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatelessStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId(); + String conversationId = + conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId(); Assert.assertEquals("MyConversation2", conversationId); - } - + } + @Test public void testStatelessStatefulConversationCheckingScope() { resetCallStack(); conversationalStatelessClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", + Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", ConversationalServiceStatefulImpl.calls.toString()); - } + } @Test public void testStatelessStatefulConversationWithCallback() { resetCallStack(); int count = conversationalStatelessClientStatefulService.runConversationWithCallback(); Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); - } - + + Assert + .assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", + ConversationalClientStatelessImpl.calls.toString()); + } + //@Test public void testStatelessStatefulConversationHavingPassedReference() { int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference(); Assert.assertEquals(3, count); - } - + } + @Test public void testStatelessStatefulConversationBusinessException() { String message = conversationalStatelessClientStatefulService.runConversationBusinessException(); Assert.assertEquals("Business Exception", message); - } - + } + @Test public void testStatelessStatefulConversationBusinessExceptionCallback() { String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback(); Assert.assertEquals("Business Exception", message); - } - + } + @Test public void testStatelessStatefulConversationCallingEndedConversation() { int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatelessStatefulConversationCallingEndedConversationCallback() { int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId(); + String id = + conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId(); Assert.assertEquals(null, id); - } - + } + //@Test public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId(); + String id = + conversationalStatelessClientStatefulService + .runConversationCallingEndedConversationCallbackCheckConversationId(); Assert.assertEquals(null, id); - } + } // stateless client stateless service tests // ======================================== @@ -186,77 +196,85 @@ public class ConversationalTestCase { public void testStatelessStatelessConversationFromInjectedReference() { int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference(); Assert.assertEquals(2, count); - } + } @Test public void testStatelessStatelessConversationFromInjectedReference2() { int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatelessStatelessConversationFromServiceReference() { int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatelessStatelessConversationWithUserDefinedConversationId() { int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId(); Assert.assertEquals(2, count); - } + } + @Test public void testStatelessStatelessConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId(); + String conversationId = + conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId(); Assert.assertEquals("MyConversation2", conversationId); - } - + } + @Test public void testStatelessStatelessConversationCheckingScope() { resetCallStack(); conversationalStatelessClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - + Assert + .assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", + ConversationalServiceStatelessImpl.calls.toString()); + } + @Test public void testStatelessStatelessConversationWithCallback() { resetCallStack(); int count = conversationalStatelessClientStatelessService.runConversationWithCallback(); Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); + + Assert + .assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", + ConversationalClientStatelessImpl.calls.toString()); } + //@Test public void testStatelessStatelessConversationHavingPassedReference() { int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference(); Assert.assertEquals(3, count); - } + } @Test public void testStatelessStatelessConversationCallingEndedConversation() { int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation(); Assert.assertEquals(-999, count); - } - + } + @Test public void testStatelessStatelessConversationCallingEndedConversationCallback() { int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId(); + String id = + conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId(); Assert.assertEquals(null, id); - } - + } + //@Test public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); + String id = + conversationalStatelessClientStatelessService + .runConversationCallingEndedConversationCallbackCheckConversationId(); Assert.assertEquals(null, id); - } + } // stateful client stateful service tests // ====================================== @@ -264,348 +282,384 @@ public class ConversationalTestCase { public void testStatefulStatefulConversationFromInjectedReference() { int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulStatefulConversationFromInjectedReference2() { int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulStatefulConversationFromServiceReference() { int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulStatefulConversationWithUserDefinedConversationId() { int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId(); + String conversationId = + conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId(); Assert.assertEquals("MyConversation2", conversationId); - } - + } + @Test public void testStatefulStatefulConversationCheckingScope() { resetCallStack(); conversationalStatefulClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", + Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", ConversationalServiceStatefulImpl.calls.toString()); - } + } @Test public void testStatefulStatefulConversationWithCallback() { resetCallStack(); int count = conversationalStatefulClientStatefulService.runConversationWithCallback(); Assert.assertEquals(4, count); - - Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalClientStatefulImpl.calls.toString()); - } - + + Assert + .assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", + ConversationalClientStatefulImpl.calls.toString()); + } + //@Test public void testStatefulStatefulConversationHavingPassedReference() { int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference(); Assert.assertEquals(3, count); - } - + } + @Test public void testStatefulStatefulConversationCallingEndedConversation() { int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation(); Assert.assertEquals(0, count); - } + } @Test public void testStatefulStatefulConversationCallingEndedConversationCallback() { int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId(); + String id = + conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId(); Assert.assertEquals(null, id); - } - + } + @Test public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId(); + String id = + conversationalStatefulClientStatefulService + .runConversationCallingEndedConversationCallbackCheckConversationId(); Assert.assertEquals(null, id); - } - + } + // stateful client stateless service tests // ======================================= @Test public void testStatefulStatelessConversationFromInjectedReference() { int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulStatelessConversationFromInjectedReference2() { int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulStatelessConversationFromServiceReference() { int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulStatelessConversationWithUserDefinedConversationId() { int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId(); Assert.assertEquals(2, count); - } + } @Test public void testStatefulStatelessConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId(); + String conversationId = + conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId(); Assert.assertEquals("MyConversation2", conversationId); - } - + } + @Test public void testStatefulStatelessConversationCheckingScope() { resetCallStack(); conversationalStatefulClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } + Assert + .assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", + ConversationalServiceStatelessImpl.calls.toString()); + } @Test public void testStatefulStatelessConversationWithCallback() { resetCallStack(); int count = conversationalStatefulClientStatelessService.runConversationWithCallback(); Assert.assertEquals(4, count); - - Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalClientStatefulImpl.calls.toString()); - } - + + Assert + .assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", + ConversationalClientStatefulImpl.calls.toString()); + } + //@Test public void testStatefulStatelessConversationHavingPassedReference() { int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference(); Assert.assertEquals(3, count); - } - + } + @Test public void testStatefulStatelessConversationCallingEndedConversation() { int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation(); Assert.assertEquals(-999, count); - } - + } + @Test public void testStatefulStatelessConversationCallingEndedConversationCallback() { int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId(); + String id = + conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId(); Assert.assertEquals(null, id); - } - + } + @Test public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); + String id = + conversationalStatefulClientStatelessService + .runConversationCallingEndedConversationCallbackCheckConversationId(); Assert.assertEquals(null, id); - } - + } + // stateless client request scope service tests // ============================================ @Test public void testStatelessRequestConversationFromInjectedReference() { int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatelessRequestConversationFromInjectedReference2() { int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2(); Assert.assertEquals(1, count); - } - + } + @Test public void testStatelessRequestConversationFromServiceReference() { int count = conversationalStatelessClientRequestService.runConversationFromServiceReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatelessRequestConversationWithUserDefinedConversationId() { int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId(); Assert.assertEquals(2, count); - } - + } + //@Test public void testStatelessRequestConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId(); + String conversationId = + conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId(); Assert.assertEquals("MyConversation2", conversationId); - } - + } + @Test public void testStatelessRequestConversationCheckingScope() { resetCallStack(); - ConversationalServiceRequestImpl.calls = new StringBuffer(); - conversationalStatelessClientRequestService.runConversationCheckingScope(); - Assert.assertEquals("initializeCount,incrementCount,retrieveCount,endConversation,", - ConversationalServiceRequestImpl.calls.toString()); - } + ConversationalServiceRequestImpl.calls = new StringBuffer(); + conversationalStatelessClientRequestService.runConversationCheckingScope(); + Assert.assertEquals("initializeCount,incrementCount,retrieveCount,endConversation,", + ConversationalServiceRequestImpl.calls.toString()); + } @Test public void testStatelessRequestConversationWithCallback() { resetCallStack(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); + ConversationalClientStatelessImpl.calls = new StringBuffer(); int count = conversationalStatelessClientRequestService.runConversationWithCallback(); Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); - } - + + Assert + .assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", + ConversationalClientStatelessImpl.calls.toString()); + } + //@Test public void testStatelessRequestConversationHavingPassedReference() { int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference(); Assert.assertEquals(3, count); - } - + } + @Test public void testStatelessRequestConversationBusinessException() { String message = conversationalStatelessClientRequestService.runConversationBusinessException(); Assert.assertEquals("Business Exception", message); - } - + } + @Test public void testStatelessRequestConversationBusinessExceptionCallback() { String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback(); Assert.assertEquals("Business Exception", message); - } - + } + @Test public void testStatelessRequestConversationCallingEndedConversation() { int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation(); Assert.assertEquals(-999, count); - } - + } + @Test public void testStatelessRequestConversationCallingEndedConversationCallback() { int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId(); + String id = + conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId(); Assert.assertEquals(null, id); - } - + } + //@Test public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId(); + String id = + conversationalStatelessClientRequestService + .runConversationCallingEndedConversationCallbackCheckConversationId(); Assert.assertEquals(null, id); - } - + } + // stateful client non conversational callback stateful service tests // ================================================================== - + @Test public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference(); + int count = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationFromInjectedReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2(); + int count = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationFromInjectedReference2(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference(); + int count = + conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId(); + int count = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationWithUserDefinedConversationId(); Assert.assertEquals(2, count); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId(); + String conversationId = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationCheckUserDefinedConversationId(); Assert.assertEquals("MyConversation2", conversationId); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() { resetCallStack(); - conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString()); - } + conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope(); + Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", + ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString()); + } @Test public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() { resetCallStack(); int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback(); Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString()); - } - + + Assert + .assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", + ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString()); + } + //@Test public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference(); + int count = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationHavingPassedReference(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation(); + int count = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationCallingEndedConversation(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback(); + int count = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationCallingEndedConversationCallback(); Assert.assertEquals(0, count); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId(); + String id = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationCallingEndedConversationCheckConversationId(); Assert.assertEquals(null, id); - } - + } + @Test public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); + String id = + conversationalStatefulClientNonConversationalCallbackStatelessService + .runConversationCallingEndedConversationCallbackCheckConversationId(); Assert.assertEquals("MyConversation3", id); - } + } private static final String NEW_A_VALUE = "First Instance - TestCode Set state on A"; private static final String NEW_B_VALUE = "First Instance - TestCode Set state on B"; private static final String SECOND_NEW_A_VALUE = "Second Instance - TestCode Set state on A"; private static final String SECOND_NEW_B_VALUE = "Second Instance - TestCode Set state on B"; - + @Test public void testMultipleConversations() { ////////// // Tests on first instance ////////// System.out.println("========= First instance tests ========="); - AService aService = domain.getService(AService.class, "ConversationalAComponent"); - + AService aService = node.getService(AService.class, "ConversationalAComponent"); + // Make sure initial values are correct Assert.assertEquals(Constants.A_INITIAL_VALUE, aService.getState()); Assert.assertEquals(Constants.B_INITIAL_VALUE, aService.getStateOnB()); @@ -613,28 +667,27 @@ public class ConversationalTestCase { // Set some new values aService.setState(NEW_A_VALUE); aService.setStateOnB(NEW_B_VALUE); - + // Verify the set worked Assert.assertEquals(NEW_A_VALUE, aService.getState()); Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB()); - ////////// // Tests on second instance ////////// System.out.println("========= Second instance tests ========="); // Do another look up - AService aService2 = domain.getService(AService.class, "ConversationalAComponent"); + AService aService2 = node.getService(AService.class, "ConversationalAComponent"); // Make sure initial values are correct on the second instance Assert.assertEquals(Constants.A_INITIAL_VALUE, aService2.getState()); Assert.assertEquals(Constants.B_INITIAL_VALUE, aService2.getStateOnB()); - + // Set some new values on the second instance aService2.setState(SECOND_NEW_A_VALUE); aService2.setStateOnB(SECOND_NEW_B_VALUE); - + // Verify the set worked on the second instance Assert.assertEquals(SECOND_NEW_A_VALUE, aService2.getState()); Assert.assertEquals(SECOND_NEW_B_VALUE, aService2.getStateOnB()); @@ -642,8 +695,8 @@ public class ConversationalTestCase { // Verify the values have not been changed on the first instance Assert.assertEquals(NEW_A_VALUE, aService.getState()); Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB()); - + System.out.println("========= Done instance tests ========="); } - + } diff --git a/java/sca/itest/exceptions/pom.xml b/java/sca/itest/exceptions/pom.xml index a726d5a5c9..441c150d90 100644 --- a/java/sca/itest/exceptions/pom.xml +++ b/java/sca/itest/exceptions/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java index b95b0ccb31..1f57116bac 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java @@ -19,7 +19,6 @@ package org.apache.tuscany.sca.test.exceptions; - public class Checked extends Exception { private static final long serialVersionUID = -129752837478357452L; diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java index 55d81102d2..bbf0f3c0e1 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java @@ -19,7 +19,6 @@ package org.apache.tuscany.sca.test.exceptions; - /** * Local exception thrower * @version $Rev$ $Date$ diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java index 1987490a0a..98cb71bdc0 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java @@ -91,7 +91,7 @@ public class ExceptionHandlerImpl implements ExceptionHandler { } - @Reference + @Reference public void setExceptionThrower(ExceptionThrower exceptionThrower) { this.exceptionThrower = exceptionThrower; } diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java index f82a30d529..bca32122f6 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java @@ -92,7 +92,7 @@ public class RemoteExceptionHandlerImpl implements ExceptionHandler { } - @Reference + @Reference public void setExceptionThrower(ExceptionRemoteThrower exceptionThrower) { this.exceptionThrower = exceptionThrower; } diff --git a/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java index f84205c096..7794348476 100644 --- a/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java +++ b/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java @@ -18,56 +18,68 @@ */ package org.apache.tuscany.sca.test.exceptions; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; -public class ExceptionsTestCase extends TestCase { +public class ExceptionsTestCase { - private SCADomain domain; + private static Node node; /** * Test exception handling over a local interface */ + @Test public void testLocal() { - ExceptionHandler exceptionHandler = domain.getService(ExceptionHandler.class, "main"); + ExceptionHandler exceptionHandler = node.getService(ExceptionHandler.class, "main"); exceptionHandler.testing(); - assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() ); + assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood()); assertNotNull(exceptionHandler.getTheBad()); - assertEquals( Checked.class, exceptionHandler.getTheBad().getClass()); + assertEquals(Checked.class, exceptionHandler.getTheBad().getClass()); assertSame(ExceptionThrower.BAD, exceptionHandler.getTheBad()); assertNotNull(exceptionHandler.getTheUgly()); - assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass()); + assertEquals(UnChecked.class, exceptionHandler.getTheUgly().getClass()); assertSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly()); } - + /** * Test exception handling over a remotable interface */ + @Test public void testRemote() { - ExceptionHandler exceptionHandler = domain.getService(ExceptionHandler.class, "mainRemote"); + ExceptionHandler exceptionHandler = node.getService(ExceptionHandler.class, "mainRemote"); exceptionHandler.testing(); - assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() ); + assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood()); assertNotNull(exceptionHandler.getTheBad()); - assertEquals( Checked.class, exceptionHandler.getTheBad().getClass()); + assertEquals(Checked.class, exceptionHandler.getTheBad().getClass()); assertNotSame(ExceptionThrower.BAD, exceptionHandler.getTheBad()); assertNotNull(exceptionHandler.getTheUgly()); - assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass()); - + assertEquals(UnChecked.class, exceptionHandler.getTheUgly().getClass()); + // [rfeng] We're not in a position to copy non business exceptions // assertNotSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly()); } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("ExceptionTest.composite"); + @BeforeClass + public static void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("ExceptionTest.composite"); + node = NodeFactory.newInstance().createNode("ExceptionTest.composite", new Contribution("c1", location)); + node.start(); } - - @Override - protected void tearDown() throws Exception { - domain.close(); + + @AfterClass + public static void tearDown() throws Exception { + node.stop(); } - + } diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java index 5bc872ef83..132b3ecc97 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java @@ -18,7 +18,6 @@ */ package org.apache.tuscany.sca.itest.interfaces; - /** * only for callBack */ diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java index 0bc8d10904..816c11dc17 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java @@ -33,7 +33,6 @@ public class ParameterObject implements Serializable { this.field1 = field1; } - @Override public boolean equals(Object o) { if (o == this) return true; diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java index dd591eabeb..c877fb7b4c 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java @@ -47,6 +47,7 @@ import org.osoa.sca.annotations.Remotable; public interface RemoteClientComponent { String foo1(ParameterObject po); + String foo3(ParameterObject po); String foo2(int i, String str1) throws Exception; diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java index d4731f35d3..5773d1e83f 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java @@ -41,7 +41,7 @@ public class RemoteClientComponentImpl implements RemoteClientComponent, RemoteC po.field1 = "BComponent"; return "BComponent"; } - + public String foo2(int i, String str) throws Exception { return str + "BComponent" + i; } diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java index 6c40db0e70..065e39a8a9 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java @@ -33,6 +33,6 @@ public interface RemoteServiceComponent { void modifyParameter(); ParameterObject getPO(); - + String[] bar(int[][] intArray); } diff --git a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java index 04c6069dfe..babbfbc91b 100644 --- a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java +++ b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java @@ -23,7 +23,7 @@ package org.apache.tuscany.sca.itest.oneway; * * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ */ -public interface OneWayClient { +public interface OneWayClient { /** * This method will invoke the doSomething() @OneWay method on the OneWayService diff --git a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java index b3cec51b1f..e91adb71eb 100644 --- a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java +++ b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java @@ -18,11 +18,9 @@ */ package org.apache.tuscany.sca.itest.oneway; - import org.osoa.sca.annotations.OneWay; import org.osoa.sca.annotations.Remotable; - /** * The service interface used when testing @OneWay interactions. * diff --git a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java index 8013c5c0e8..3920083484 100644 --- a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java +++ b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java @@ -23,7 +23,6 @@ import org.apache.tuscany.sca.itest.oneway.OneWayService; import org.junit.Assert; import org.osoa.sca.annotations.Reference; - /** * The client for the oneway itest. * @@ -33,7 +32,7 @@ public class OneWayClientImpl implements OneWayClient { /** * Injected reference to the OneWayService. */ - @Reference + @Reference protected OneWayService oneWayService; /** diff --git a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java index 01f956cb67..8dad4d669b 100644 --- a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java +++ b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.oneway.impl; -import org.apache.tuscany.sca.itest.oneway.OneWayService; +import java.util.concurrent.atomic.AtomicInteger; -import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; +import org.apache.tuscany.sca.itest.oneway.OneWayService; /** * The service for the oneway itest. @@ -28,7 +28,6 @@ import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ */ - public class OneWayServiceImpl implements OneWayService { /** @@ -53,8 +52,8 @@ public class OneWayServiceImpl implements OneWayService { public void doSomething(int count) { CALL_COUNT.incrementAndGet(); - // System.out.println("Service: doSomething " + count + " callCount = " + callCount); - // System.out.flush(); + // System.out.println("Service: doSomething " + count + " callCount = " + callCount); + // System.out.flush(); } /** diff --git a/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java index 776b6ffdf7..a088b2090f 100644 --- a/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java +++ b/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java @@ -25,15 +25,16 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -import junit.framework.Assert; - import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor; import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl; import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl; import org.apache.tuscany.sca.node.Client; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -50,25 +51,30 @@ public class OneWayTestCase { private static final int MAX_SLEEP_TIME = 10000; private Node node; - + /** - * Initialise the SCADomain. + * Initialise the Node. * - * @throws Exception Failed to initialise the SCADomain + * @throws Exception Failed to initialise the Node */ @Before public void setUp() throws Exception { - + NodeFactory nodeFactory = NodeFactory.newInstance(); - node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null); + String location = + ContributionLocationHelper + .getContributionLocation("OneWayContribution/META-INF/sca-deployables/oneWay.composite"); + node = + nodeFactory.createNode("OneWayContribution/META-INF/sca-deployables/oneWay.composite", + new Contribution("c1", location)); node.start(); - + } /** - * This method will ensure that the SCADomain is shutdown. + * This method will ensure that the Node is shutdown. * - * @throws Exception Failed to shutdown the SCADomain + * @throws Exception Failed to shutdown the Node */ @After public void tearDown() throws Exception { @@ -83,14 +89,13 @@ public class OneWayTestCase { */ @Test public void testOneWay() throws Exception { - OneWayClient client = - ((Client)node).getService(OneWayClient.class, "OneWayClientComponent"); + OneWayClient client = ((Client)node).getService(OneWayClient.class, "OneWayClientComponent"); int count = 100; for (int i = 0; i < 10; i++) { - // System.out.println("Test: doSomething " + count); - // System.out.flush(); + // System.out.println("Test: doSomething " + count); + // System.out.flush(); client.doSomething(count); // TUSCANY-2192 - We need to sleep to allow the @OneWay method calls to complete. @@ -99,8 +104,7 @@ public class OneWayTestCase { // This loop will wait for the required number of @OneWay method calls to // have taken place or MAX_SLEEP_TIME to have passed. long startSleep = System.currentTimeMillis(); - while (OneWayClientImpl.callCount != OneWayServiceImpl.CALL_COUNT.get() - && System.currentTimeMillis() - startSleep < MAX_SLEEP_TIME) { + while (OneWayClientImpl.callCount != OneWayServiceImpl.CALL_COUNT.get() && System.currentTimeMillis() - startSleep < MAX_SLEEP_TIME) { Thread.sleep(100); // System.out.println("" + OneWayClientImpl.callCount + "," + OneWayServiceImpl.callCount); } @@ -119,9 +123,8 @@ public class OneWayTestCase { */ @Test public void testOneWayUsingNonBlockingInterceptorThrowsAnException() { - OneWayClient client = - ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding"); - + OneWayClient client = ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding"); + // We need to modify the JDK Logger for the NonBlockingInterceptor so we // can check that it logs a message for the @OneWay invocation that throws // an Exception @@ -198,7 +201,7 @@ public class OneWayTestCase { /** * {@inheritDoc} */ - @Override + public void close() throws SecurityException { // Nothing to do } @@ -206,7 +209,7 @@ public class OneWayTestCase { /** * {@inheritDoc} */ - @Override + public void flush() { // Nothing to do } @@ -217,13 +220,12 @@ public class OneWayTestCase { * * @param record The Log Record that is being published */ - @Override + public void publish(LogRecord record) { // The log message we are looking for is Severe if (record.getLevel() == Level.SEVERE) { - if (record.getThrown() != null - && record.getThrown().toString().indexOf( - OneWayServiceImpl.EXCEPTION_MESSAGE) != -1) { + if (record.getThrown() != null && record.getThrown().toString() + .indexOf(OneWayServiceImpl.EXCEPTION_MESSAGE) != -1) { // We have found our Exception. exceptionLogged.set(true); } diff --git a/java/sca/itest/operation-overloading/pom.xml b/java/sca/itest/operation-overloading/pom.xml index 9cfa1e6318..7092f47984 100644 --- a/java/sca/itest/operation-overloading/pom.xml +++ b/java/sca/itest/operation-overloading/pom.xml @@ -31,15 +31,23 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java index 0b3b12c762..62e5c14ce2 100644 --- a/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java +++ b/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java @@ -18,20 +18,26 @@ */ package org.apache.tuscany.sca.test.opoverload.impl; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +public class OverloadATestCase { -public class OverloadATestCase extends TestCase { - - private SCADomain domain; - private OverloadASourceTarget overloadA; + private static Node node; + private static OverloadASourceTarget overloadA; /** * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This * test verifies the values compared are same as the values retrieved from the SCA runtime. */ + @Test public void testOperationAall() { String[] result = overloadA.operationAall(); assertEquals(5, result.length); @@ -42,21 +48,25 @@ public class OverloadATestCase extends TestCase { assertEquals(OverloadASourceTarget.opName + "four" + 4, result[4]); } + @Test public void testOperationAInt() { String result = overloadA.operationA(29); assertEquals(OverloadASourceTarget.opName + 29, result); } + @Test public void testOperationAString() { String result = overloadA.operationA("rick:-)"); assertEquals(OverloadASourceTarget.opName + "rick:-)", result); } + @Test public void testOperationAIntString() { String result = overloadA.operationA(123, "Tuscany"); assertEquals(OverloadASourceTarget.opName + 123 + "Tuscany", result); } + @Test public void testOperationStringInt() { String result = overloadA.operationA("StringInt", 77); assertEquals(OverloadASourceTarget.opName + "StringInt" + 77, result); @@ -64,21 +74,25 @@ public class OverloadATestCase extends TestCase { /** * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and + * unit.framework.TestCase. So this method is used to create a test Embedded SCA node, to start the SCA node and * to get a reference to the contribution service */ - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("OperationOverload.composite"); - overloadA = domain.getService(OverloadASourceTarget.class, "OverloadASourceComponent"); + + @BeforeClass + public static void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("OperationOverload.composite"); + node = NodeFactory.newInstance().createNode("OperationOverload.composite", new Contribution("c1", location)); + node.start(); + overloadA = node.getService(OverloadASourceTarget.class, "OverloadASourceComponent"); } /** * tearDown() is a method in JUnit Frame Work which is executed after all other methods in the class extending - * unit.framework.TestCase. So this method is used to close the SCA domain. + * unit.framework.TestCase. So this method is used to close the SCA node. */ - @Override - protected void tearDown() throws Exception { - domain.close(); + + @AfterClass + public static void tearDown() throws Exception { + node.stop(); } } diff --git a/java/sca/itest/pom.xml b/java/sca/itest/pom.xml index 7592682344..32caa47c7b 100644 --- a/java/sca/itest/pom.xml +++ b/java/sca/itest/pom.xml @@ -50,8 +50,6 @@ true - builder - callablereferences callback-api callback-basic callback-complex-type @@ -61,22 +59,17 @@ callback-set-callback callback-set-conversation component-type - contribution - contribution-import-export conversations exceptions - extended-api interfaces - late-reference-resolution - oneway operation-overloading + recursive-multi-level references - serialization - services scopes + services wires diff --git a/java/sca/itest/properties/pom.xml b/java/sca/itest/properties/pom.xml index 8ab9eccb6d..edd4c8c6a1 100644 --- a/java/sca/itest/properties/pom.xml +++ b/java/sca/itest/properties/pom.xml @@ -31,15 +31,30 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + + + + + xalan + xalan + 2.7.1 + test diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java index c0c068d12e..87f87d6c22 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java @@ -97,7 +97,7 @@ public class ComplexPropertyBean { /** * It is a method which implements toString() function */ - @Override + public String toString() { return Double.toString(integerNumber) + " - " + Double.toString(floatNumber) diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java index 17b4e582d6..5217ede572 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java @@ -21,9 +21,10 @@ package org.apache.tuscany.sca.itest; import java.util.Collection; +import test.jaxb.props.ReturnCodeProperties; + import commonj.sdo.DataObject; -import test.jaxb.props.ReturnCodeProperties; /** * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this * interface. Implementation for these methods is provided in PropertyComponentImpl Class @@ -113,7 +114,7 @@ public interface PropertyComponent { * PropertyComponentImpl */ public DataObject getCustomerSdo(); - + /** * This is a method to get a property value from the SCA runtime environment. It is implemented in the class * PropertyComponentImpl diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java index eb642b6637..16029a6584 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java @@ -25,11 +25,11 @@ import org.osoa.sca.ComponentContext; import org.osoa.sca.annotations.Context; import org.osoa.sca.annotations.Property; +import test.jaxb.props.ReturnCodeProperties; + import com.example.customer.sdo.impl.CustomerImpl; import commonj.sdo.DataObject; -import test.jaxb.props.ReturnCodeProperties; - /** * This class Implements the interface PropertyComponent and gives implementation for all methods which are declared in * that interface. @@ -37,7 +37,7 @@ import test.jaxb.props.ReturnCodeProperties; public class PropertyComponentImpl implements PropertyComponent { @Context protected ComponentContext context; - + @Property protected CustomerImpl customerSdo; @@ -173,7 +173,7 @@ public class PropertyComponentImpl implements PropertyComponent { public DataObject[] getSdoArrayProperty() { return sdoArray; } - + public String getLocationFromComponentContext() { return context.getProperty(String.class, "location"); } diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java index 76bcd06fca..15fb49ea4e 100644 --- a/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java +++ b/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java @@ -22,8 +22,6 @@ // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2008.06.07 at 03:30:47 PM EDT // - - package test.jaxb.props; import javax.xml.bind.JAXBElement; @@ -31,7 +29,6 @@ import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; - /** * This object contains factory methods for each * Java content interface and Java element interface diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java index 7a809ebf1e..0a1d4a34a3 100644 --- a/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java +++ b/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java @@ -22,8 +22,6 @@ // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2008.06.07 at 03:30:47 PM EDT // - - package test.jaxb.props; import java.math.BigInteger; @@ -33,7 +31,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** *

Java class for ReturnCodeProperties complex type. * @@ -55,10 +52,7 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ReturnCodeProperties", namespace = "http://test.sca.jaxb/rcprops", propOrder = { - "a", - "b" -}) +@XmlType(name = "ReturnCodeProperties", namespace = "http://test.sca.jaxb/rcprops", propOrder = {"a", "b"}) public class ReturnCodeProperties { @XmlElement(name = "AInt") diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java b/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java index f726552a62..6a6fdd00cc 100644 --- a/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java +++ b/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java @@ -22,6 +22,6 @@ // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2008.06.07 at 03:30:47 PM EDT // - @javax.xml.bind.annotation.XmlSchema(namespace = "http://test.sca.jaxb/rcprops", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package test.jaxb.props; + diff --git a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java index 8cf182e24a..efc635c72b 100644 --- a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java +++ b/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java @@ -18,10 +18,13 @@ */ package org.apache.tuscany.sca.itest; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import mysca.test.myservice.impl.MyService; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -31,7 +34,7 @@ public class MyTotalServiceTestCase { private static MyService service2; private static MyService service3; - private static SCADomain domain; + private static Node node; /** * Method annotated with @@ -75,25 +78,27 @@ public class MyTotalServiceTestCase { * Method annotated with * * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test - * Embedded SCA Domain, to start the SCA Domain and to get a reference to the 'outerABService' service + * Embedded SCA node, to start the SCA node and to get a reference to the 'outerABService' service */ @BeforeClass public static void setUp() throws Exception { - domain = SCADomain.newInstance("Outer.composite"); - service1 = domain.getService(MyService.class, "MyServiceComponent/MyService"); - service2 = domain.getService(MyService.class, "MyServiceComponentNew/MyService"); - service3 = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother"); + String location = ContributionLocationHelper.getContributionLocation("Outer.composite"); + node = NodeFactory.newInstance().createNode("Outer.composite", new Contribution("c1", location)); + node.start(); + service1 = node.getService(MyService.class, "MyServiceComponent/MyService"); + service2 = node.getService(MyService.class, "MyServiceComponentNew/MyService"); + service3 = node.getService(MyService.class, "MySimpleServiceInRecursiveAnother"); } /** * Method annotated with * * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the - * domain, close any previously opened connections etc + * node, close any previously opened connections etc */ @AfterClass public static void tearDown() { - domain.close(); + node.stop(); } } diff --git a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java index 28357c5bbe..da1ec5186f 100644 --- a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java +++ b/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java @@ -19,11 +19,14 @@ package org.apache.tuscany.sca.itest; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.Iterator; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -36,30 +39,32 @@ import org.junit.Test; */ public class OuterPropertyTestCase { - private static SCADomain domain; + private static Node node; private static ABComponent outerABService; /** * Method annotated with * * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test - * Embedded SCA Domain, to start the SCA Domain and to get a reference to the 'outerABService' service + * Embedded SCA node, to start the SCA node and to get a reference to the 'outerABService' service */ @BeforeClass public static void init() throws Exception { - domain = SCADomain.newInstance("OuterPropertyTest.composite"); - outerABService = domain.getService(ABComponent.class, "OuterComponent"); + String location = ContributionLocationHelper.getContributionLocation("OuterPropertyTest.composite"); + node = NodeFactory.newInstance().createNode("OuterPropertyTest.composite", new Contribution("c1", location)); + node.start(); + outerABService = node.getService(ABComponent.class, "OuterComponent"); } /** * Method annotated with * * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the - * domain, close any previously opened connections etc + * node, close any previously opened connections etc */ @AfterClass public static void destroy() throws Exception { - domain.close(); + node.stop(); } /** diff --git a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java index 6979659ece..caf5a5e052 100644 --- a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java +++ b/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java @@ -19,22 +19,24 @@ package org.apache.tuscany.sca.itest; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import java.math.BigInteger; import java.util.Arrays; import java.util.Iterator; -import java.math.BigInteger; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import test.jaxb.props.ReturnCodeProperties; + import commonj.sdo.DataObject; /** @@ -43,14 +45,12 @@ import commonj.sdo.DataObject; * 'PropertyTest.composite'. It basically tests all types of property values returned from SCA runtime environment. */ public class PropertyTestCase { - private static SCADomain domain; + private static Node node; private static ABComponent abService; private static CDComponent cdService; private static ABCDComponent abcdService; private static PropertyComponent propertyService; - - /** * Method annotated with * @@ -368,7 +368,6 @@ public class PropertyTestCase { assertEquals("Sdo Middler Name", dataObject.getString("middleName")); assertEquals("Sdo Lasting Name", dataObject.getString("lastName")); } - @Test public void testGetLocationFromComponentContext() { @@ -439,30 +438,32 @@ public class PropertyTestCase { * Method annotated with * * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test - * Embedded SCA Domain, to start the SCA Domain and to get a reference to 4 services namely 'abService' + * Embedded SCA node, to start the SCA node and to get a reference to 4 services namely 'abService' * service, 'cdService' service, 'abcdService' service and 'propertyService' service */ @BeforeClass public static void init() throws Exception { try { - domain = SCADomain.newInstance("PropertyTest.composite"); + String location = ContributionLocationHelper.getContributionLocation("PropertyTest.composite"); + node = NodeFactory.newInstance().createNode("PropertyTest.composite", new Contribution("c1", location)); + node.start(); } catch (Exception e) { e.printStackTrace(); } - abService = domain.getService(ABComponent.class, "ABComponent"); - cdService = domain.getService(CDComponent.class, "CDComponent"); - abcdService = domain.getService(ABCDComponent.class, "ABCDComponent"); - propertyService = domain.getService(PropertyComponent.class, "PropertyComponent"); + abService = node.getService(ABComponent.class, "ABComponent"); + cdService = node.getService(CDComponent.class, "CDComponent"); + abcdService = node.getService(ABCDComponent.class, "ABCDComponent"); + propertyService = node.getService(PropertyComponent.class, "PropertyComponent"); } /** * Method annotated with * * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the - * domain, close any previously opened connections etc + * node, close any previously opened connections etc */ @AfterClass public static void destroy() throws Exception { - domain.close(); + node.stop(); } } diff --git a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java index 8ee5dce91f..a0213ced46 100644 --- a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java +++ b/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java @@ -18,27 +18,55 @@ */ package org.apache.tuscany.sca.itest.cdi; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; -public class ConstructorPropertyInjectionTestCase extends TestCase { +public class ConstructorPropertyInjectionTestCase { + private static org.apache.tuscany.sca.node.Node node; + + @BeforeClass + public static void init() throws Exception { + try { + String location = ContributionLocationHelper.getContributionLocation("ConstructorPropertyInjection.composite"); + node = NodeFactory.newInstance().createNode("ConstructorPropertyInjection.composite", new Contribution("c1", location)); + node.start(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Method annotated with + * + * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the + * node, close any previously opened connections etc + */ + @AfterClass + public static void destroy() throws Exception { + node.stop(); + } + @Test public void testFoo1() throws Exception { - SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite"); - Bar foo = sca.getService(Bar.class, "Foo1Component"); + Bar foo = node.getService(Bar.class, "Foo1Component"); assertEquals("fubar", foo.getBar()); } + @Test public void testFoo2() throws Exception { - SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite"); - Bar foo = sca.getService(Bar.class, "Foo2Component"); + Bar foo = node.getService(Bar.class, "Foo2Component"); assertEquals("fubar", foo.getBar()); } + @Test public void testFoo3() throws Exception { - SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite"); - Bar foo = sca.getService(Bar.class, "Foo3Component"); + Bar foo = node.getService(Bar.class, "Foo3Component"); assertEquals("fubar", foo.getBar()); } } diff --git a/java/sca/itest/recursive-multi-level/pom.xml b/java/sca/itest/recursive-multi-level/pom.xml index aeb3e4a570..d6013dbcfa 100644 --- a/java/sca/itest/recursive-multi-level/pom.xml +++ b/java/sca/itest/recursive-multi-level/pom.xml @@ -31,15 +31,31 @@ org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime - + test + + + + + xalan + xalan + 2.7.1 + test + + diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java index 214d4d8a1f..986c8305dd 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java @@ -19,8 +19,8 @@ package mysca.test.myservice; - public interface MyService { String getLocation(); + String getYear(); } diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java index 51948a3b81..87773d8361 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java @@ -22,27 +22,21 @@ package mysca.test.myservice; import org.osoa.sca.annotations.Property; import org.osoa.sca.annotations.Service; -import mysca.test.myservice.MyService; - @Service(MyService.class) public class MyServiceImpl implements MyService { - - @Property(name="location") - protected String location = "ABC"; - @Property(name="year") + @Property(name = "location") + protected String location = "ABC"; + + @Property(name = "year") protected String year = "2006"; - - public String getLocation() - { - return location; + public String getLocation() { + return location; } - public String getYear() - { + public String getYear() { return year; } - } diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java index 08df8ade17..261eff2584 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java @@ -21,5 +21,6 @@ package mysca.test.myservice; public interface MySimpleTotalService { String getLocation(); + String getYear(); } diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java index 2ad9f815f0..a9afe052ba 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java @@ -22,24 +22,17 @@ package mysca.test.myservice; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; -import mysca.test.myservice.MyService; -import mysca.test.myservice.MySimpleTotalService; - @Service(MySimpleTotalService.class) -public class MySimpleTotalServiceImpl implements MySimpleTotalService -{ +public class MySimpleTotalServiceImpl implements MySimpleTotalService { // default required==true so it is 1:1 @Reference public MyService myService; - - public String getLocation() - { + public String getLocation() { return myService.getLocation(); } - public String getYear() - { + public String getYear() { return myService.getYear(); } diff --git a/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java index d8d6fe0dc5..da14cdef13 100644 --- a/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java +++ b/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java @@ -18,51 +18,72 @@ */ package test.sca.tests; -import org.apache.tuscany.sca.host.embedded.SCADomain; - +import static org.junit.Assert.assertEquals; import mysca.test.myservice.MySimpleTotalService; -import junit.framework.TestCase; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; /** * Tests to make sure that autowiring and recusive composite work together * */ -public class MultiLevelTestCase extends TestCase -{ - private SCADomain domain1; - private SCADomain domain2; - private SCADomain domain3; - private MySimpleTotalService myService1; - private MySimpleTotalService myService2; - private MySimpleTotalService myService3; +public class MultiLevelTestCase { + private static Node node1; + private static Node node2; + private static Node node3; + private static MySimpleTotalService myService1; + private static MySimpleTotalService myService2; + private static MySimpleTotalService myService3; - protected void setUp() throws Exception { - super.setUp(); - domain1 = SCADomain.newInstance("TotalService1Auto.composite"); - domain2 = SCADomain.newInstance("TotalService2Auto.composite"); - domain3 = SCADomain.newInstance("TotalService3Auto.composite"); + @BeforeClass + public static void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("TotalService1Auto.composite"); + Contribution contribution = new Contribution("c1", location); + try { + node1 = NodeFactory.newInstance().createNode("TotalService1Auto.composite", contribution); + } catch (Exception e) { + e.printStackTrace(); + } + node2 = NodeFactory.newInstance().createNode("TotalService2Auto.composite", contribution); + node3 = NodeFactory.newInstance().createNode("TotalService3Auto.composite", contribution); + + node1.start(); + node2.start(); + node3.start(); - myService1 = domain1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto"); - myService2 = domain2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto"); - myService3 = domain3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto"); + myService1 = node1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto"); + myService2 = node2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto"); + myService3 = node3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto"); } - - public void testLevel1() - { - assertEquals("Level 1",myService1.getLocation()); - assertEquals("2001",myService1.getYear()); + + @Test + public void testLevel1() { + assertEquals("Level 1", myService1.getLocation()); + assertEquals("2001", myService1.getYear()); } - - public void testLevel2() - { - assertEquals("Default 2",myService2.getLocation()); - assertEquals("1992",myService2.getYear()); + + @Test + public void testLevel2() { + assertEquals("Default 2", myService2.getLocation()); + assertEquals("1992", myService2.getYear()); } - public void testLevel3() - { - assertEquals("Default 3",myService3.getLocation()); - assertEquals("1993",myService3.getYear()); + @Test + public void testLevel3() { + assertEquals("Default 3", myService3.getLocation()); + assertEquals("1993", myService3.getYear()); + } + + @AfterClass + public static void tearDown() { + node1.stop(); + node2.stop(); + node3.stop(); } } diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java index 647fff0159..ab275ece52 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java @@ -37,11 +37,10 @@ public class AComponentImpl implements AComponent { @Reference(name = "dReferences") public Collection dReferences; - + @Reference(name = "dReferenceArray") public DComponent[] dReferenceArray; - @Reference(name = "dServiceReferences") public List> dServiceReferences; @@ -93,8 +92,8 @@ public class AComponentImpl implements AComponent { str.deleteCharAt(str.length() - 1); } return str.toString(); - } - + } + public String fooMultipleD() { StringBuffer str = new StringBuffer(); for (DComponent d : dReferences) { @@ -106,7 +105,7 @@ public class AComponentImpl implements AComponent { } return str.toString(); } - + public String fooMultipleDServiceRef() { StringBuffer str = new StringBuffer(); for (ServiceReference d : dServiceReferences) { diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java index 2618ec7095..80617bdec2 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java @@ -18,10 +18,9 @@ */ package org.apache.tuscany.sca.itest.references; -import org.osoa.sca.annotations.Remotable; - public interface DComponent { String dFoo(); + String getComponentName(); } diff --git a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java index bfd542e2f2..1034bda02d 100644 --- a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java +++ b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java @@ -18,29 +18,40 @@ */ package org.apache.tuscany.sca.itest.references; -import static junit.framework.Assert.assertEquals; -import junit.framework.Assert; +import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; public class AutoWiredReferenceTestCase { - private static SCADomain domain; + private static Node node; private static AComponent acomponent; private static AComponent acomponentAutowire; @BeforeClass public static void init() throws Exception { - domain = SCADomain.newInstance("AutoWiredReferencesTest.composite"); - acomponent = domain.getService(AComponent.class, "AComponent"); - acomponentAutowire = domain.getService(AComponent.class, "AComponentAutowire"); + try { + String location = ContributionLocationHelper.getContributionLocation("AutoWiredReferencesTest.composite"); + node = + NodeFactory.newInstance().createNode("AutoWiredReferencesTest.composite", + new Contribution("c1", location)); + node.start(); + acomponent = node.getService(AComponent.class, "AComponent"); + acomponentAutowire = node.getService(AComponent.class, "AComponentAutowire"); + } catch (Throwable e) { + e.printStackTrace(); + } } @AfterClass public static void destroy() throws Exception { - domain.close(); + node.stop(); } @Test @@ -67,19 +78,19 @@ public class AutoWiredReferenceTestCase { public void testD2Reference() { assertEquals("DComponent", acomponent.fooD2()); } - + @Test public void testMultiDReferenceArray() { String components = acomponent.fooMultipleDArray(); Assert.assertTrue(components.contains("DComponent1")); - } - + } + @Test public void testMultiDServiceReference() { String components = acomponent.fooMultipleDServiceRef(); Assert.assertTrue(components.contains("DComponent")); Assert.assertTrue(components.contains("DComponent1")); - } + } @Test public void testRequiredFalseReference() { @@ -89,7 +100,7 @@ public class AutoWiredReferenceTestCase { Assert.assertTrue(true); } } - + @Test public void testTargetPrecendence() { try { diff --git a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java index 1d8284f0fd..db2e3f175d 100644 --- a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java +++ b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java @@ -18,27 +18,32 @@ */ package org.apache.tuscany.sca.itest.references; -import static junit.framework.Assert.assertEquals; -import junit.framework.Assert; +import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; public class InnerReferenceTestCase { - private static SCADomain domain; + private static Node node; private static AComponent acomponent; @BeforeClass public static void init() throws Exception { - domain = SCADomain.newInstance("InnerReferencesTest.composite"); - acomponent = domain.getService(AComponent.class, "AComponent"); + String location = ContributionLocationHelper.getContributionLocation("InnerReferencesTest.composite"); + node = NodeFactory.newInstance().createNode("InnerReferencesTest.composite", new Contribution("c1", location)); + node.start(); + acomponent = node.getService(AComponent.class, "AComponent"); } @AfterClass public static void destroy() throws Exception { - domain.close(); + node.stop(); } @Test @@ -65,26 +70,26 @@ public class InnerReferenceTestCase { public void testD2Reference() { assertEquals("DComponent", acomponent.fooD2()); } - + @Test public void testMultiDReference() { String components = acomponent.fooMultipleD(); Assert.assertTrue(components.contains("DComponent")); Assert.assertTrue(components.contains("DComponent1")); } - + @Test public void testMultiDReferenceArray() { String components = acomponent.fooMultipleDArray(); Assert.assertTrue(components.equals("DComponent1")); - } - + } + @Test public void testMultiDServiceReference() { String components = acomponent.fooMultipleDServiceRef(); Assert.assertTrue(components.contains("DComponent")); Assert.assertTrue(components.contains("DComponent1")); - } + } @Test(expected = NullPointerException.class) public void testRequiredFalseReference() { diff --git a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java index 4b3a745a19..6349e4f827 100644 --- a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java +++ b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java @@ -18,28 +18,33 @@ */ package org.apache.tuscany.sca.itest.references; -import static junit.framework.Assert.assertEquals; -import junit.framework.Assert; +import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; public class ManualWiredReferenceTestCase { - private static SCADomain domain; + private static Node node; private static AComponent acomponent; @BeforeClass public static void init() throws Exception { - domain = SCADomain.newInstance("ManualWiredReferencesTest.composite"); - acomponent = domain.getService(AComponent.class, "AComponent"); + String location = ContributionLocationHelper.getContributionLocation("ManualWiredReferencesTest.composite"); + node = NodeFactory.newInstance().createNode("ManualWiredReferencesTest.composite", new Contribution("c1", location)); + node.start(); + acomponent = node.getService(AComponent.class, "AComponent"); } @AfterClass public static void destroy() throws Exception { - domain.close(); + node.stop(); } @Test @@ -67,19 +72,19 @@ public class ManualWiredReferenceTestCase { public void testD2Reference() { assertEquals("DComponent", acomponent.fooD2()); } - + @Test public void testMultiDReferenceArray() { String components = acomponent.fooMultipleDArray(); Assert.assertTrue(components.contains("DComponent1")); - } - + } + @Test public void testMultiDServiceReference() { String components = acomponent.fooMultipleDServiceRef(); Assert.assertTrue(components.contains("DComponent")); Assert.assertTrue(components.contains("DComponent1")); - } + } @Test public void testRequiredFalseReference() { diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java index 4aa414be8e..f4ef805644 100644 --- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java +++ b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java @@ -32,15 +32,15 @@ public class CompositeScopeStateVerifierImpl implements StateVerifier { ThreadLocal moduleState; public CompositeScopeStateVerifierImpl() { - moduleState = new ThreadLocal(); + moduleState = new ThreadLocal(); } public void setState(int i) { - moduleState.set(i); + moduleState.set(i); } public boolean checkState(int i) { - return (moduleState.get() == i); + return (moduleState.get() == i); } } diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java index fae4dcd586..7e19a15cb1 100644 --- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java +++ b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java @@ -17,6 +17,7 @@ * under the License. */ package org.apache.tuscany.sca.itest.scopes; + import org.osoa.sca.annotations.Destroy; import org.osoa.sca.annotations.Init; import org.osoa.sca.annotations.Scope; @@ -30,21 +31,21 @@ public class RequestScopeStateVerifierImpl implements StateVerifier { int requestState; public void setState(int i) { - requestState = i; + requestState = i; } public boolean checkState(int i) { - return (requestState == i); + return (requestState == i); } - + @Init public void init() { requestState = 0; } - + @Destroy public void destroy() { - requestState = -1; + requestState = -1; } -} \ No newline at end of file +} diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java index 878f7e4cc6..e6bf08ccf2 100644 --- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java +++ b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java @@ -20,6 +20,6 @@ package org.apache.tuscany.sca.itest.scopes; public interface StateVerifier { void setState(int i); + boolean checkState(int i); } - diff --git a/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java index ce2519cbc0..028cea6304 100644 --- a/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java +++ b/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java @@ -18,76 +18,81 @@ */ package org.apache.tuscany.sca.test; -import junit.framework.TestCase; +import static org.junit.Assert.fail; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.itest.scopes.StateVerifier; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -public class ScopeTestCase extends TestCase { +public class ScopeTestCase { final static int numThreads = 4; // number of threads to drive each scope container final static int iterations = 200; // number of iterations per thread - private SCADomain domain; + private Node node; // Test scope containers. // The request scope container isn't hooked up for some reason so the code below // that tests request scope is commented out. // Code could be added to test session scope once it is supported in a standalone environment. - + @Test public void testScopes() throws InterruptedException { - Thread[] moduleScopeThreadTable = new Thread[numThreads]; - Thread[] requestScopeThreadTable = new Thread[numThreads]; + Thread[] moduleScopeThreadTable = new Thread[numThreads]; + Thread[] requestScopeThreadTable = new Thread[numThreads]; - for(int i=0; i org.apache.tuscany.sca - tuscany-host-embedded + tuscany-node-api 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT - runtime + test + diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java index f0964ebb93..9cb845d4b2 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java @@ -19,8 +19,7 @@ package org.apache.tuscany.sca.itest; -import junit.framework.Assert; - +import org.junit.Assert; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; @@ -41,10 +40,10 @@ public class WireClientImpl implements WireClient { public void runTests() { // Make sure the wire has injected a reference Assert.assertNotNull(aWireService); - + // Test the injected reference String msg = aWireService.sayHello("MCC"); - + // Validate the response Assert.assertNotNull(msg); Assert.assertEquals("Hello MCC", msg); diff --git a/java/sca/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/java/sca/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java index 95f721cd8e..cd1b22ba91 100644 --- a/java/sca/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java +++ b/java/sca/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java @@ -19,10 +19,16 @@ package org.apache.tuscany.sca.itest; -import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * This test case will attempt to use a wire @@ -30,10 +36,10 @@ import org.apache.tuscany.sca.host.embedded.SCADomain; public class WireTestCase extends TestCase { /** - * The SCADomain we are using + * The Node we are using */ - private SCADomain domain; - + private Node node; + /** * The client the tests should use */ @@ -42,28 +48,33 @@ public class WireTestCase extends TestCase { /** * Run the wire tests */ + @Test public void testWire() { - aWireClient.runTests(); + aWireClient.runTests(); } /** * Load the Wire composite and look up the client. */ - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("WireTest.composite"); - aWireClient = domain.getService(WireClient.class, "WireClient"); + + @Before + public void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("WireTest.composite"); + node = NodeFactory.newInstance().createNode("WireTest.composite", new Contribution("c1", location)); + node.start(); + aWireClient = node.getService(WireClient.class, "WireClient"); Assert.assertNotNull(aWireClient); - - aWireClient = domain.getService(WireClient.class, "AnotherWireClient"); + + aWireClient = node.getService(WireClient.class, "AnotherWireClient"); Assert.assertNotNull(aWireClient); } /** - * Shutdown the SCA domain + * Shutdown the SCA node */ - @Override - protected void tearDown() throws Exception { - domain.close(); + + @After + public void tearDown() throws Exception { + node.stop(); } } -- cgit v1.2.3