svn commit: r692914 - in /tuscany/java/sca/samples/calculator-osgi/src: main/java/calculator/CalculatorClient.java test/java/calculator/CalculatorTestCase.java

[jsdelfino]

Author: jsdelfino
Date: Sun Sep  7 11:05:26 2008
New Revision: 692914

URL: http://svn.apache.org/viewvc?rev=692914&view=rev
Log:
Simplified the sample a bit to really isolate the test case from the component 
running inside the OSGi environment.

Modified:
    
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
    
tuscany/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java

Modified: 
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java?rev=692914&r1=692913&r2=692914&view=diff
==============================================================================
--- 
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
 (original)
+++ 
tuscany/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
 Sun Sep  7 11:05:26 2008
@@ -42,6 +42,7 @@
     public void calculate() {
 
         // Calculate
+        System.out.println(getClass().getClassLoader());
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
         System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
         System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

Modified: 
tuscany/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java?rev=692914&r1=692913&r2=692914&view=diff
==============================================================================
--- 
tuscany/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
 (original)
+++ 
tuscany/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
 Sun Sep  7 11:05:26 2008
@@ -34,19 +34,13 @@
 @EagerInit
 public class CalculatorTestCase extends TestCase {
 
-    private static CalculatorService calculatorService;
     private NodeLauncher launcher;
     private SCANode node;
 
-    @Reference
-    public void setCalculatorService(CalculatorService calculatorService) {
-        CalculatorTestCase.calculatorService = calculatorService;
-    }
-
     @Override
     protected void setUp() throws Exception {
         launcher = NodeLauncher.newInstance();
-        node = launcher.createNodeFromClassLoader("CalculatorTest.composite", 
getClass().getClassLoader());
+        node = launcher.createNodeFromClassLoader("Calculator.composite", 
getClass().getClassLoader());
         node.start();
     }
 
@@ -61,12 +55,4 @@
     public void testDummy() {
     }
 
-    @Init
-    public void init() 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);
-    }
 }