[Jboss-cvs] JBossAS SVN: r55445 - branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test

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

Author: bstansberry at jboss.com
Date: 2006-08-09 14:02:26 -0400 (Wed, 09 Aug 2006)
New Revision: 55445

Modified:
   branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
   branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test/SingleRetryInterceptorUnitTestCase.java
Log:
Make deployment tracking fields static

Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java	2006-08-09 16:56:31 UTC (rev 55444)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java	2006-08-09 18:02:26 UTC (rev 55445)
@@ -52,7 +52,12 @@
  * @version $Revision $
  */
 public class RetryInterceptorUnitTestCase extends JBossClusteredTestCase
-{
+{   
+   // NOTE: these variables must be static as apparently a separate instance
+   // of this class is created for each test.
+   private static boolean deployed0 = false;
+   private static boolean deployed1 = false;
+   
    static abstract class RetryCaller extends Thread
    {
       Properties env;
@@ -226,9 +231,6 @@
       }
    }
    
-   protected boolean deployed0 = false;
-   protected boolean deployed1 = false;
-   
    /**
     * Create a new RetryInterceptorUnitTestCase.
     * 
@@ -387,7 +389,7 @@
       // Undeploy the ear
       RMIAdaptor[] adaptors = getAdaptors();
       undeploy(adaptors[0], "test-retry.ear");
-      deployed0 = false;
+      setDeployed0(false);
       
       sleep(1000);
       
@@ -399,7 +401,7 @@
       if (caller.isAlive()) // don't bother deploying otherwise
       {
          deploy(adaptors[1], "test-retry.ear");
-         deployed1 = true;
+         setDeployed1(true);
       }
       
       // Give the caller 3 secs to complete (extremely generous)
@@ -525,17 +527,17 @@
    {
       RMIAdaptor[] adaptors = getAdaptors();
    
-      if (!deployed0)
+      if (!isDeployed0())
    {
          deploy(adaptors[0], "test-retry.ear");
          getLog().debug("Deployed test-retry.ear on server0");
-         deployed0 = true;
+         setDeployed0(true);
    }
-      if (deployed1)
+      if (isDeployed1())
       {
          undeploy(adaptors[1], "test-retry.ear");
          getLog().debug("Undeployed test-retry.ear on server1");
-         deployed1 = false;
+         setDeployed1(false);
       }
    
       sleep(2000);
@@ -545,12 +547,12 @@
    {
       RMIAdaptor[] adaptors = getAdaptors();
       deploy(adaptors[1], "test-retry.ear");
-      deployed1 = true;
+      setDeployed1(true);
       
       sleep(2000);
       
       undeploy(adaptors[0], "test-retry.ear");
-      deployed0 = false;
+      setDeployed0(false);
       
       sleep(2000);
    }
@@ -564,19 +566,38 @@
          System.setProperty("JBossCluster-DoFail", "false");
       
       RMIAdaptor[] adaptors = getAdaptors();
-      if (deployed0)
+      if (isDeployed0())
       {
          undeploy(adaptors[0], "test-retry.ear");
          getLog().debug("Undeployed test-retry.ear on server0");
-         deployed0 = false;
+         setDeployed0(false);
 }
-      if (deployed1)
+      if (isDeployed1())
       {
          undeploy(adaptors[1], "test-retry.ear");
          getLog().debug("Undeployed test-retry.ear on server1");
-         deployed1 = false;
+         setDeployed1(false);
       }
    }
-   
 
+   protected boolean isDeployed0()
+   {
+      return deployed0;
+   }
+
+   protected void setDeployed0(boolean deployed)
+   {
+      deployed0 = deployed;
+   }
+
+   protected boolean isDeployed1()
+   {
+      return deployed1;
+   }
+
+   protected void setDeployed1(boolean deployed)
+   {
+      deployed1 = deployed;
+   }   
+
 }

Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test/SingleRetryInterceptorUnitTestCase.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test/SingleRetryInterceptorUnitTestCase.java	2006-08-09 16:56:31 UTC (rev 55444)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/testbeancluster/test/SingleRetryInterceptorUnitTestCase.java	2006-08-09 18:02:26 UTC (rev 55445)
@@ -32,7 +32,12 @@
  * @version $Revision$
  */
 public class SingleRetryInterceptorUnitTestCase extends RetryInterceptorUnitTestCase
-{
+{   
+   // NOTE: these variables must be static as apparently a separate instance
+   // of this class is created for each test.
+   private static boolean deployed0 = false;
+   private static boolean deployed1 = false;
+   
    /**
     * Create a new SingleRetryInterceptorUnitTestCase.
     * 
@@ -67,6 +72,25 @@
    {
       return "_SingleRetry";
    }
+
+   protected boolean isDeployed0()
+   {
+      return deployed0;
+   }
    
+   protected void setDeployed0(boolean deployed)
+   {
+      deployed0 = deployed;
    }
    
+   protected boolean isDeployed1()
+   {
+      return deployed1;
+   }
+   
+   protected void setDeployed1(boolean deployed)
+   {
+      deployed1 = deployed;
+   }
+   
+}
\ No newline at end of file