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

6 files changed, 47 insertions, 29 deletions

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