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

4 files changed, 25 insertions, 21 deletions

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