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

2 files changed, 24 insertions, 15 deletions

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();