svn commit: r709106 - /tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java

[lresende]

Author: lresende
Date: Thu Oct 30 00:28:13 2008
New Revision: 709106

URL: http://svn.apache.org/viewvc?rev=709106&view=rev
Log:
Updating test case to follow new JUnit test style

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

Modified: 
tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java?rev=709106&r1=709105&r2=709106&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
 (original)
+++ 
tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
 Thu Oct 30 00:28:13 2008
@@ -18,23 +18,30 @@
  */
 package calculator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
 import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
 
 /**
  * This shows how to test the Calculator composition.
  */
-public class CalculatorTestCase extends TestCase {
[EMAIL PROTECTED]("COMPOSITE") @EagerInit
+public class CalculatorTestCase {
 
-    private NodeLauncher launcher;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
+    private static NodeLauncher launcher;
+    private static Node node;   
+    
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
         launcher = NodeLauncher.newInstance();
         String location = 
ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
         node = launcher.createNode("Calculator.composite", new 
Contribution("test", location));
@@ -42,8 +49,8 @@
         node.start();
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
         if (node != null) {
             node.stop();
             node.destroy();
@@ -53,7 +60,7 @@
         }
     }
 
-    public void testDummy() {
+    @Test
+    public void testDummy() throws Exception {
     }
-
 }