Update the node creation to be per test so it properly tests the scenarios

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@808001 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 7 deletions

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java
index 65b0b4defa..d14dfd4a02 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;

 import itest.nodes.Helloworld;

 

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

+import org.junit.After;

+import org.junit.Before;

 import org.junit.Test;

 import org.oasisopen.sca.NoSuchDomainException;

 import org.oasisopen.sca.NoSuchServiceException;

@@ -39,9 +39,8 @@ public class OneNodeTestCase{
     private static DomainNode domain;

     private static String serviceContributionUri;

     

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-

+    @Before

+    public void setUpBeforeClass() throws Exception {

         domain = new DomainNode();

         serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar");

         domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar");

@@ -93,8 +92,8 @@ public class OneNodeTestCase{
         }

     }

 

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

+    @After

+    public void tearDownAfterClass() throws Exception {

         if (domain != null && domain.isStarted()) {

             domain.stop();

         }