Bring up the RMI samples with 2.x

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

1 files changed, 27 insertions, 17 deletions

diff --git a/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 15e00f5946..f14191c411 100644
--- a/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
@@ -18,43 +18,53 @@
  */

 package calculator;

 

+import static org.junit.Assert.assertEquals;

+

 import java.rmi.registry.LocateRegistry;

 import java.rmi.registry.Registry;

 

-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.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

 

 

 /**

  * This shows how to test the Calculator service component.

  */

-public class CalculatorRMIReferenceTestCase extends TestCase {

+public class CalculatorRMIReferenceTestCase {

 

-    private SCADomain scaDomain;

-    private CalculatorService calculatorService;

+    private static Node node;

+    private static CalculatorService calculatorService;

 

-    @Override

-    protected void setUp() throws Exception {

+    @BeforeClass

+    public static void setUp() throws Exception {

         CalculatorRMIServiceImpl rmiCalculatorImpl = new CalculatorRMIServiceImpl();

         Registry rmiRegistry = LocateRegistry.createRegistry(8099);

         rmiRegistry.bind("CalculatorRMIService", rmiCalculatorImpl);

         

-        scaDomain = SCADomain.newInstance("CalculatorRMIReference.composite");

-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

+        String uri = ContributionLocationHelper.getContributionLocation("CalculatorRMIReference.composite");

+        Contribution contribution = new Contribution("c1", uri);

+        node = NodeFactory.newInstance().createNode("CalculatorRMIReference.composite", contribution);

+        node.start();

+        calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent");

     }

     

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

+    @AfterClass

+    public static void tearDown() throws Exception {

+        node.stop();

         LocateRegistry.getRegistry(8099).unbind("CalculatorRMIService");

     }

 

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

     }

 }