svn commit: r719806 - /tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java

[lresende]

Author: lresende
Date: Fri Nov 21 21:02:28 2008
New Revision: 719806

URL: http://svn.apache.org/viewvc?rev=719806&view=rev
Log:
Converting test to latest junit format, and bringing up the sample to 
demonstrate simple J2SE environment working

Modified:
    
tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java

Modified: 
tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java?rev=719806&r1=719805&r2=719806&view=diff
==============================================================================
--- 
tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
 (original)
+++ 
tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
 Fri Nov 21 21:02:28 2008
@@ -18,38 +18,45 @@
  */
 package calculator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
 import org.apache.tuscany.sca.node.Client;
 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;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Scope;
 
 /**
  * This shows how to test the Calculator service component.
  */
-public class CalculatorTestCase extends TestCase {
[EMAIL PROTECTED]("COMPOSITE") @EagerInit
+public class CalculatorTestCase{
+       private static Node node;
+    private static CalculatorService calculatorService;
+    
 
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
         node = NodeFactory.newInstance().createNode();
         node.start();
         
         calculatorService = ((Client)node).getService(CalculatorService.class, 
"CalculatorServiceComponent");
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+       node.stop();
     }
 
+    @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);
+        assertEquals(calculatorService.subtract(3, 2), 1.0, 0);
+        assertEquals(calculatorService.multiply(3, 2), 6.0, 0);
+        assertEquals(calculatorService.divide(3, 2), 1.5, 0);
     }
 }