diff options
Diffstat (limited to 'java/sca/itest/callback-basic')
3 files changed, 31 insertions, 18 deletions
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 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-api</artifactId> <version>2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node-impl</artifactId> + <version>2.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> + </dependencies> <properties> 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(); + } } |