1 files changed, 21 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
index 8f6b5e4845..9d3024f451 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
@@ -18,17 +18,33 @@
  */
 package calculator;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
-import sample.SampleClientImpl;
+import org.junit.Test;
 
 /**
- * Test the Calculator composition.
+ * A unit test of the basic Java implementation classes in this contribution 
+ * without using SCA
  */
 public class CalculatorTestCase {
 
     @Test
-    public void testSample() throws Exception {
-        SampleClientImpl.main(null);
+    public void testCalculator() throws Exception {
+        AddService add = new AddServiceImpl();
+        SubtractService subtract = new SubtractServiceImpl();
+        MultiplyService multiply = new MultiplyServiceImpl();
+        DivideService divide = new DivideServiceImpl();
+        
+        CalculatorServiceImpl calculator = new CalculatorServiceImpl();
+        
+        calculator.setAddService(add);
+        calculator.setSubtractService(subtract);
+        calculator.setMultiplyService(multiply);
+        calculator.setDivideService(divide);
+        
+        assertEquals(calculator.add(3, 2), 5.0, 0);
+        assertEquals(calculator.subtract(3, 2), 1.0, 0);
+        assertEquals(calculator.multiply(3, 2), 6.0, 0);
+        assertEquals(calculator.divide(3, 2), 1.5, 0);
     }
 }