svn commit: r943495 - in /tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src: main/java/calculator/CalculatorClientImpl.java main/java/sample/ main/resources/Calculator.composite test/java/calculator/CalculatorTestCase.java

[slaws]

Author: slaws
Date: Wed May 12 13:48:35 2010
New Revision: 943495

URL: http://svn.apache.org/viewvc?rev=943495&view=rev
Log:
Using binding-ws-calulator as an example of turning samples into contributions. 
First step is to remove the client code from the contribution and adjust the 
composite and test case accordingly.

Removed:
    
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
    
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/sample/
Modified:
    
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/Calculator.composite
    
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java

Modified: 
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/Calculator.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/Calculator.composite?rev=943495&r1=943494&r2=943495&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/Calculator.composite
 (original)
+++ 
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/Calculator.composite
 Wed May 12 13:48:35 2010
@@ -22,11 +22,6 @@
            xmlns:sample="http://sample";
            name="Calculator">
 
-    <component name="SampleClient">
-               <implementation.java class="calculator.CalculatorClientImpl"/>
-        <reference name="calculatorService" 
target="CalculatorServiceComponent" />
-    </component>
-
     <component name="CalculatorServiceComponent">
                <implementation.java class="calculator.CalculatorServiceImpl"/>
         <reference name="addService" >   

Modified: 
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java?rev=943495&r1=943494&r2=943495&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
 Wed May 12 13:48:35 2010
@@ -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);
     }
 }