[jboss-cvs] JBossAS SVN: r63853 - trunk/testsuite/src/main/org/jboss/test/cluster/test.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-07-05 22:33:35 -0400 (Thu, 05 Jul 2007)
New Revision: 63853

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java
Log:
Use undeploy/deploy instead of stop/start

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java	2007-07-05 23:18:32 UTC (rev 63852)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java	2007-07-06 02:33:35 UTC (rev 63853)
@@ -65,6 +65,9 @@
       }
    }
    
+   private static boolean deployed0 = true;
+   private static boolean deployed1 = true;
+   
    protected String setUrl_;
    protected String getUrl_;
    protected String setUrlBase_;
@@ -120,6 +123,18 @@
          Fqn fqn = new Fqn(names);
          warFqn_ = fqn.toString();
       }
+      
+      if (!deployed0)
+      {
+         deploy(adaptor0_, getWarName() + ".war");
+         deployed0 = true;
+      }
+      
+      if (!deployed1)
+      {
+         deploy(adaptor1_, getWarName() + ".war");
+         deployed1 = true;
+      }
    }
    
    protected String getWarName()
@@ -133,9 +148,8 @@
 
       getLog().debug(setUrl_ + ":::::::" + getUrl_);
       
-      // Stop the war on server1 (but leave the CacheHelper
-      SessionTestUtil.leaveHelperOnServer(adaptor1_);
-      adaptor1_.invoke(warObjectName, "stop" , NULL_ARGS, NULL_TYPES);
+      // Stop the war on server1
+      undeploy(adaptor1_, getWarName() + ".war");
 
       // Confirm the war isn't available on server1
       HttpClient client0 = new HttpClient();
@@ -163,7 +177,7 @@
       getLog().debug("Server1 has no cached sessions");
       
       // Start the war on server1
-      adaptor1_.invoke(warObjectName, "start" , NULL_ARGS, NULL_TYPES);
+      deploy(adaptor1_, getWarName() + ".war");
       
       getLog().debug("Server1 started");
       
@@ -187,8 +201,7 @@
       sleep(500);
       
       // Stop the war on server0
-      SessionTestUtil.leaveHelperOnServer(adaptor0_);
-      adaptor0_.invoke(warObjectName, "stop" , NULL_ARGS, NULL_TYPES);
+      undeploy(adaptor0_, getWarName() + ".war");
       
       // Confirm there are no sessions in the server0 cache
       sessions = SessionTestUtil.getSessionIds(adaptor0_, warFqn_);