diff options
Diffstat (limited to 'java')
-rw-r--r-- | java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java | 1 | ||||
-rw-r--r-- | java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java | 16 |
2 files changed, 2 insertions, 15 deletions
diff --git a/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java index 2bb8f96dcf..bfcab602e1 100644 --- a/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java +++ b/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java @@ -42,6 +42,7 @@ public class CalculatorClient { 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)); diff --git a/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java index 85bf73b264..48489143f0 100644 --- a/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java +++ b/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java @@ -34,19 +34,13 @@ import org.osoa.sca.annotations.Scope; @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 class CalculatorTestCase extends TestCase { 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); - } } |