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

7 files changed, 42 insertions, 35 deletions

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 @@
     <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>
 </project>
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<CallBackSetCallbackConvService> aCallBackServiceRef
-                = componentContext.cast(aCallBackService);
+        ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef = componentContext.cast(aCallBackService);
         aCallBackServiceRef.setCallback(aCallbackObject);
         aCallBackService.knockKnock("Knock Knock 7");
 
@@ -102,8 +100,8 @@ public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackCon
         //
 
         try {
-            ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
-                    = componentContext.cast(aCallBackService);
+            ServiceReference<CallBackSetCallbackConvService> 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<CallBackSetCallbackConvService> aCallBackServiceRef
-                    = componentContext.cast(aCallBackService);
+            ServiceReference<CallBackSetCallbackConvService> 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();
     }
 
 }