[jboss-svn-commits] JBL Code SVN: r36702 - in labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit: testgroup and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Feb 24 11:28:43 EST 2011


Author: jhalliday
Date: 2011-02-24 11:28:43 -0500 (Thu, 24 Feb 2011)
New Revision: 36702

Modified:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_recovery.java
Log:
Modify qa test harness and tests to support optional in-process recovery model. JBTM-825


Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java	2011-02-24 16:22:42 UTC (rev 36701)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java	2011-02-24 16:28:43 UTC (rev 36702)
@@ -124,6 +124,14 @@
 		client.waitFor();
     }
 
+    protected void startAndWaitForClientWithFixedStoreDir(Class clazz, String... args) {
+        String name = "client_"+clientCount;
+        clientCount+=1;
+        Task client = createTask(name, clazz, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
+		client.start(args);
+		client.waitFor();
+    }
+
     protected Task createTask(String taskName, Class clazz, Task.TaskType taskType, int timeout) {
         return createTask(taskName, clazz, taskType, timeout, taskName);
     }

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_recovery.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_recovery.java	2011-02-24 16:22:42 UTC (rev 36701)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_recovery.java	2011-02-24 16:28:43 UTC (rev 36702)
@@ -39,246 +39,246 @@
 
 	@Test public void Recovery_Crash_AbstractRecord_Test001()
 	{
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, "100", "1", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, "100", "1", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, "100", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_AbstractRecord_Test002()
 	{
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, "100", "2", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, "100", "2", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, "100", "2", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_AbstractRecord_Test003()
 	{
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, "100", "5", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, "100", "5", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, "100", "5", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_AbstractRecord_Test004()
 	{
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, "100", "10", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, "100", "10", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, "100", "10", "$(1)");
 	}
 
 
 	@Test public void Recovery_Crash_LockManager_Test001()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, "100", "1", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, "100", "1", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, "100", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test002()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, "100", "2", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, "100", "2", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, "100", "2", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test003()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, "100", "5", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, "100", "5", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, "100", "5", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test004()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, "100", "10", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, "100", "10", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, "100", "10", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test005()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, "100", "1", "3", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, "100", "1", "3", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, "100", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test006()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, "100", "2", "3", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, "100", "2", "3", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, "100", "2", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test007()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, "100", "5", "3", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, "100", "5", "3", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, "100", "5", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test008()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, "100", "10", "3", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, "100", "10", "3", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, "100", "10", "$(1)");
 	}
 
 
 	@Test public void Recovery_Crash_StateManager_Test001()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, "100", "1", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, "100", "1", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, "100", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test002()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, "100", "2", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, "100", "2", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, "100", "2", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test003()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, "100", "5", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, "100", "5", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, "100", "5", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test004()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, "100", "10", "1", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, "100", "10", "1", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, "100", "10", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test005()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, "100", "1", "3", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, "100", "1", "3", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, "100", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test006()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, "100", "2", "3", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, "100", "2", "3", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, "100", "2", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test007()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, "100", "5", "3", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, "100", "5", "3", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, "100", "5", "$(1)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test008()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, "100", "10", "3", "0", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, "100", "10", "3", "0", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, "100", "10", "$(1)");
 	}
 
 
 	@Test public void Recovery_Fail_AbstractRecord_Test001()
 	{
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "2", "1", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "2", "1", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Fail_AbstractRecord_Test002()
 	{
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "3", "1", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "3", "1", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Fail_AbstractRecord_Test003()
 	{
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "5", "1", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "5", "1", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Fail_AbstractRecord_Test004()
 	{
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "10", "1", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "10", "1", "1", "$(1)");
 	}
 
     
 	@Test public void Recovery_Restore_AbstractRecord_Test001()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, "100", "1", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, "100", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_AbstractRecord_Test002()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, "100", "2", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, "100", "2", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_AbstractRecord_Test003()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, "100", "5", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, "100", "5", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_AbstractRecord_Test004()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, "100", "10", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, "100", "10", "$(1)");
 	}
 
 
 	@Test public void Recovery_Restore_LockManager_Test001()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, "100", "1", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, "100", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_LockManager_Test002()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, "100", "2", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, "100", "2", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_LockManager_Test003()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, "100", "5", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, "100", "5", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_LockManager_Test004()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, "100", "10", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, "100", "10", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_StateManager_Test001()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, "100", "1", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, "100", "1", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, "100", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_StateManager_Test002()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, "100", "2", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, "100", "2", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, "100", "2", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_StateManager_Test003()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, "100", "5", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, "100", "5", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, "100", "5", "$(1)");
 	}
 
 	@Test public void Recovery_Restore_StateManager_Test004()
 	{
         startServer(com.arjuna.ats.arjuna.recovery.RecoveryManager.class, "-test");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, "100", "10", "$(1)");
-        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, "100", "10", "$(1)");
+        startAndWaitForClientWithFixedStoreDir(org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, "100", "10", "$(1)");
 	}
 }
\ No newline at end of file



More information about the jboss-svn-commits mailing list