Merge itest changes from sca-equinox branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723439 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 34 insertions, 20 deletions

diff --git a/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java b/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 08afd922b3..1a222990c1 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java
@@ -19,7 +19,10 @@
 
 package calculator;
 
-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;
 
 /**
  * This client program shows how to create an SCA runtime, start it,
@@ -28,10 +31,12 @@ import org.apache.tuscany.sca.host.embedded.SCADomain;
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
 
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
+        String location = ContributionLocationHelper.getContributionLocation("Calculator.composite");
+        Node node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("c1", location));
+        node.start();
         
         CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
+            node.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
 
         // Calculate
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
@@ -39,7 +44,7 @@ public class CalculatorClient {
         System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
         System.out.println("3 / 2=" + calculatorService.divide(3, 2));
 
-        scaDomain.close();
+        node.stop();
     }
 
 }
diff --git a/java/sca/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/java/sca/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index 08fc8e33bf..b428819736 100644
--- a/java/sca/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/java/sca/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
@@ -18,35 +18,44 @@
  */
 package calculator;
 
-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;
 
 /**
  * This shows how to test the Calculator service component.
  */
-public class CalculatorTestCase extends TestCase {
+public class CalculatorTestCase {
 
     private CalculatorService calculatorService;
-    private SCADomain scaDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("Calculator.composite");
-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
+    private Node node;
+
+    @Before
+    public void setUp() throws Exception {
+        String location = ContributionLocationHelper.getContributionLocation("Calculator.composite");
+        node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("c1", location));
+        node.start();
+        calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
+    @After
+    public void tearDown() throws Exception {
+        node.stop();
     }
 
+    @Test
     public void testCalculator() throws Exception {
         // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
-        assertEquals(calculatorService.subtract(3, 2), 1.0);
-        assertEquals(calculatorService.multiply(3, 2), 6.0);
-        assertEquals(calculatorService.divide(3, 2), 1.5);
+        assertEquals(calculatorService.add(3, 2), 5.0, 0.0);
+        assertEquals(calculatorService.subtract(3, 2), 1.0, 0.0);
+        assertEquals(calculatorService.multiply(3, 2), 6.0, 0.0);
+        assertEquals(calculatorService.divide(3, 2), 1.5, 0.0);
 
     }
 }