[jboss-svn-commits] JBL Code SVN: r32302 - labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Mar 30 08:09:18 EDT 2010


Author: jhalliday
Date: 2010-03-30 08:09:17 -0400 (Tue, 30 Mar 2010)
New Revision: 32302

Modified:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_currenttests01.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_otsserver.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_recovery.java
Log:
Refactor to clean up tests. JBTM-731


Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_currenttests01.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_currenttests01.java	2010-03-30 09:49:37 UTC (rev 32301)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_currenttests01.java	2010-03-30 12:09:17 UTC (rev 32302)
@@ -25,214 +25,187 @@
 
 public class TestGroup_currenttests01 extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "currenttests01";
-	}
-
-	protected Task server0 = null;
-
-	@Before public void setUp()
-	{
-		super.setUp();
-		server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 600);
-		server0.start("-test");
-	}
-
-	@After public void tearDown()
-	{
-		try {
-			server0.terminate();
-		} finally {
-			super.tearDown();
-		}
-	}
-
-    private void doTest(String testName, Class clazz) {
-        setTestName(testName);
-        Task client0 = createTask("client0", clazz, Task.TaskType.EXPECT_PASS_FAIL, 600);
-        client0.start();
-        client0.waitFor();
+    public TestGroup_currenttests01() {
+        isRecoveryManagerNeeded = true;
     }
 
 	@Test public void CurrentTests01_Test001()
 	{
-        doTest("Test001", org.jboss.jbossts.qa.CurrentTests01.Test01.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test01.class);
 	}
 
 	@Test public void CurrentTests01_Test002()
 	{
-        doTest("Test002", org.jboss.jbossts.qa.CurrentTests01.Test02.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test02.class);
 	}
 
 	@Test public void CurrentTests01_Test003()
 	{
-        doTest("Test003", org.jboss.jbossts.qa.CurrentTests01.Test03.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test03.class);
 	}
 
 	@Test public void CurrentTests01_Test004()
 	{
-        doTest("Test004", org.jboss.jbossts.qa.CurrentTests01.Test04.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test04.class);
 	}
 
 	@Test public void CurrentTests01_Test005()
 	{
-        doTest("Test005", org.jboss.jbossts.qa.CurrentTests01.Test05.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test05.class);
 	}
 
 	@Test public void CurrentTests01_Test006()
 	{
-        doTest("Test006", org.jboss.jbossts.qa.CurrentTests01.Test06.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test06.class);
 	}
 
 	@Test public void CurrentTests01_Test007()
 	{
-        doTest("Test007", org.jboss.jbossts.qa.CurrentTests01.Test07.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test07.class);
 	}
 
 	@Test public void CurrentTests01_Test008()
 	{
-        doTest("Test008", org.jboss.jbossts.qa.CurrentTests01.Test08.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test08.class);
 	}
 
 	@Test public void CurrentTests01_Test009()
 	{
-        doTest("Test009", org.jboss.jbossts.qa.CurrentTests01.Test09.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test09.class);
 	}
 
 	@Test public void CurrentTests01_Test010()
 	{
-        doTest("Test010", org.jboss.jbossts.qa.CurrentTests01.Test10.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test10.class);
 	}
 
 	@Test public void CurrentTests01_Test011()
 	{
-        doTest("Test011", org.jboss.jbossts.qa.CurrentTests01.Test11.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test11.class);
 	}
 
 	@Test public void CurrentTests01_Test012()
 	{
-        doTest("Test012", org.jboss.jbossts.qa.CurrentTests01.Test12.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test12.class);
 	}
 
 	@Test public void CurrentTests01_Test013()
 	{
-        doTest("Test013", org.jboss.jbossts.qa.CurrentTests01.Test13.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test13.class);
 	}
 
 	@Test public void CurrentTests01_Test014()
 	{
-        doTest("Test014", org.jboss.jbossts.qa.CurrentTests01.Test14.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test14.class);
 	}
 
 	@Test public void CurrentTests01_Test015()
 	{
-        doTest("Test015", org.jboss.jbossts.qa.CurrentTests01.Test15.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test15.class);
 	}
 
 	@Test public void CurrentTests01_Test016()
 	{
-        doTest("Test016", org.jboss.jbossts.qa.CurrentTests01.Test16.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test16.class);
 	}
 
 	@Test public void CurrentTests01_Test017()
 	{
-        doTest("Test017", org.jboss.jbossts.qa.CurrentTests01.Test17.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test17.class);
 	}
 
 	@Test public void CurrentTests01_Test018()
 	{
-        doTest("Test018", org.jboss.jbossts.qa.CurrentTests01.Test18.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test18.class);
 	}
 
 	@Test public void CurrentTests01_Test019()
 	{
-        doTest("Test019", org.jboss.jbossts.qa.CurrentTests01.Test19.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test19.class);
 	}
 
 	@Test public void CurrentTests01_Test020()
 	{
-        doTest("Test020", org.jboss.jbossts.qa.CurrentTests01.Test20.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test20.class);
 	}
 
 	@Test public void CurrentTests01_Test021()
 	{
-        doTest("Test021", org.jboss.jbossts.qa.CurrentTests01.Test21.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test21.class);
 	}
 
 	@Test public void CurrentTests01_Test022()
 	{
-        doTest("Test022", org.jboss.jbossts.qa.CurrentTests01.Test22.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test22.class);
 	}
 
 	@Test public void CurrentTests01_Test023()
 	{
-        doTest("Test023", org.jboss.jbossts.qa.CurrentTests01.Test23.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test23.class);
 	}
 
 	@Test public void CurrentTests01_Test024()
 	{
-        doTest("Test024", org.jboss.jbossts.qa.CurrentTests01.Test24.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test24.class);
 	}
 
 	@Test public void CurrentTests01_Test025()
 	{
-        doTest("Test025", org.jboss.jbossts.qa.CurrentTests01.Test25.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test25.class);
 	}
 
 	@Test public void CurrentTests01_Test026()
 	{
-        doTest("Test026", org.jboss.jbossts.qa.CurrentTests01.Test26.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test26.class);
 	}
 
 	@Test public void CurrentTests01_Test027()
 	{
-        doTest("Test027", org.jboss.jbossts.qa.CurrentTests01.Test27.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test27.class);
 	}
 
 	@Test public void CurrentTests01_Test028()
 	{
-        doTest("Test028", org.jboss.jbossts.qa.CurrentTests01.Test28.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test28.class);
 	}
 
 	@Test public void CurrentTests01_Test029()
 	{
-        doTest("Test029", org.jboss.jbossts.qa.CurrentTests01.Test29.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test29.class);
 	}
 
 	@Test public void CurrentTests01_Test030()
 	{
-        doTest("Test030", org.jboss.jbossts.qa.CurrentTests01.Test30.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test30.class);
 	}
 
 	@Test public void CurrentTests01_Test031()
 	{
-        doTest("Test031", org.jboss.jbossts.qa.CurrentTests01.Test31.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test31.class);
 	}
 
 	@Test public void CurrentTests01_Test032()
 	{
-        doTest("Test032", org.jboss.jbossts.qa.CurrentTests01.Test32.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test32.class);
 	}
 
 	@Test public void CurrentTests01_Test033()
 	{
-        doTest("Test033", org.jboss.jbossts.qa.CurrentTests01.Test33.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test33.class);
 	}
 
 	@Test public void CurrentTests01_Test034()
 	{
-        doTest("Test034", org.jboss.jbossts.qa.CurrentTests01.Test34.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test34.class);
 	}
 
 	@Test public void CurrentTests01_Test035()
 	{
-        doTest("Test035", org.jboss.jbossts.qa.CurrentTests01.Test35.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test35.class);
 	}
 
 	@Test public void CurrentTests01_Test036()
 	{
-        doTest("Test036", org.jboss.jbossts.qa.CurrentTests01.Test36.class);
+        startAndWaitForClient(org.jboss.jbossts.qa.CurrentTests01.Test36.class);
 	}
-
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_otsserver.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_otsserver.java	2010-03-30 09:49:37 UTC (rev 32301)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_otsserver.java	2010-03-30 12:09:17 UTC (rev 32302)
@@ -26,11 +26,6 @@
 // Automatically generated by XML2JUnit
 public class TestGroup_otsserver extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "otsserver";
-	}
-
 	protected Task server3 = null;
 	protected Task server2 = null;
 	protected Task server1 = null;
@@ -65,106 +60,67 @@
 
 	@Test public void OTSServer_Test001()
 	{
-		setTestName("Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start();
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client01.class);
 	}
 
 	@Test public void OTSServer_Test002()
 	{
-		setTestName("Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client02.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start();
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client02.class);
 	}
 
 	@Test public void OTSServer_Test003()
 	{
-		setTestName("Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client03.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start();
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client03.class);
 	}
 
 	@Test public void OTSServer_Test004()
 	{
-		setTestName("Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client04.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start();
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client04.class);
 	}
 
 	@Test public void OTSServer_Test005()
 	{
-		setTestName("Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client05.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start();
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client05.class);
 	}
 
 	@Test public void OTSServer_Test006()
 	{
-		setTestName("Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client06.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start();
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client06.class);
 	}
 
 	@Test public void OTSServer_Test007()
 	{
-		setTestName("Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client07.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start("800");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client07.class, "800");
 	}
 
 	@Test public void OTSServer_Test008()
 	{
-		setTestName("Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client08.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start("800");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client08.class, "800");
 	}
 
 	@Test public void OTSServer_Test009()
 	{
-		setTestName("Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client09.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start("800");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client09.class, "800");
 	}
 
 	@Test public void OTSServer_Test010()
 	{
-		setTestName("Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client10.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start("800");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client10.class, "800");
 	}
 
 	@Test public void OTSServer_Test011()
 	{
-		setTestName("Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client11.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start("800");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client11.class, "800");
 	}
 
 	@Test public void OTSServer_Test012()
 	{
-		setTestName("Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client12.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start("800");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client12.class, "800");
 	}
 
 	@Test public void OTSServer_Test013()
 	{
-		setTestName("Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client13.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start("4", "250");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client13.class, "4", "250");
 	}
 
 	@Test public void OTSServer_Test014()
@@ -211,10 +167,7 @@
 
 	@Test public void OTSServer_Test017()
 	{
-		setTestName("Test017");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.OTSServerClients.Client14.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
-		client0.start("4", "200");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.OTSServerClients.Client14.class, "4", "200");
 	}
 
 	@Test public void OTSServer_Test018()

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	2010-03-30 09:49:37 UTC (rev 32301)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_recovery.java	2010-03-30 12:09:17 UTC (rev 32302)
@@ -25,690 +25,260 @@
 
 public class TestGroup_txcore_recovery extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "txcore_recovery";
-	}
-
-
-	@Before public void setUp()
-	{
-		super.setUp();
-	}
-
 	@After public void tearDown()
 	{
-		try {
-		} finally {
-			super.tearDown();
-		}
+        try {
+            Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+            task1.perform();
+            Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+            task2.perform();
+        } finally {
+            super.tearDown();
+        }
 	}
 
 	@Test public void Recovery_Crash_AbstractRecord_Test001()
 	{
-		setTestName("Recovery_Crash_AbstractRecord_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "1", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "1", "$(1)");
-		client1.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_AbstractRecord_Test002()
 	{
-		setTestName("Recovery_Crash_AbstractRecord_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "2", "$(1)");
-		client1.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_AbstractRecord_Test003()
 	{
-		setTestName("Recovery_Crash_AbstractRecord_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "5", "$(1)");
-		client1.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_AbstractRecord_Test004()
 	{
-		setTestName("Recovery_Crash_AbstractRecord_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "10", "$(1)");
-		client1.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
+        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)");
 	}
 
+
 	@Test public void Recovery_Crash_LockManager_Test001()
 	{
-		setTestName("Recovery_Crash_LockManager_Test001");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "1", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "1", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test002()
 	{
-		setTestName("Recovery_Crash_LockManager_Test002");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "2", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test003()
 	{
-		setTestName("Recovery_Crash_LockManager_Test003");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "5", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test004()
 	{
-		setTestName("Recovery_Crash_LockManager_Test004");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "10", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test005()
 	{
-		setTestName("Recovery_Crash_LockManager_Test005");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "1", "3", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "1", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test006()
 	{
-		setTestName("Recovery_Crash_LockManager_Test006");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "3", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "2", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test007()
 	{
-		setTestName("Recovery_Crash_LockManager_Test007");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "3", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "5", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_LockManager_Test008()
 	{
-		setTestName("Recovery_Crash_LockManager_Test008");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "3", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.Client002a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "10", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
+
 	@Test public void Recovery_Crash_StateManager_Test001()
 	{
-		setTestName("Recovery_Crash_StateManager_Test001");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "1", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "1", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test002()
 	{
-		setTestName("Recovery_Crash_StateManager_Test002");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "2", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test003()
 	{
-		setTestName("Recovery_Crash_StateManager_Test003");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "5", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test004()
 	{
-		setTestName("Recovery_Crash_StateManager_Test004");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "1", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "10", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test005()
 	{
-		setTestName("Recovery_Crash_StateManager_Test005");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "1", "3", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "1", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test006()
 	{
-		setTestName("Recovery_Crash_StateManager_Test006");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "3", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "2", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test007()
 	{
-		setTestName("Recovery_Crash_StateManager_Test007");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "3", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "5", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Crash_StateManager_Test008()
 	{
-		setTestName("Recovery_Crash_StateManager_Test008");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "3", "0", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.Client002a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "10", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
+
 	@Test public void Recovery_Fail_AbstractRecord_Test001()
 	{
-		setTestName("Recovery_Fail_AbstractRecord_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "1", "1", "$(1)");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "2", "1", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Fail_AbstractRecord_Test002()
 	{
-		setTestName("Recovery_Fail_AbstractRecord_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "3", "1", "1", "$(1)");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "3", "1", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Fail_AbstractRecord_Test003()
 	{
-		setTestName("Recovery_Fail_AbstractRecord_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "1", "1", "$(1)");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "5", "1", "1", "$(1)");
 	}
 
 	@Test public void Recovery_Fail_AbstractRecord_Test004()
 	{
-		setTestName("Recovery_Fail_AbstractRecord_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "1", "1", "$(1)");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.Client001.class, "100", "10", "1", "1", "$(1)");
 	}
 
+    
 	@Test public void Recovery_Restore_AbstractRecord_Test001()
 	{
-		setTestName("Recovery_Restore_AbstractRecord_Test001");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "1", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "1", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_AbstractRecord_Test002()
 	{
-		setTestName("Recovery_Restore_AbstractRecord_Test002");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "2", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_AbstractRecord_Test003()
 	{
-		setTestName("Recovery_Restore_AbstractRecord_Test003");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "5", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_AbstractRecord_Test004()
 	{
-		setTestName("Recovery_Restore_AbstractRecord_Test004");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "10", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
+
 	@Test public void Recovery_Restore_LockManager_Test001()
 	{
-		setTestName("Recovery_Restore_LockManager_Test001");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "1", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "1", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_LockManager_Test002()
 	{
-		setTestName("Recovery_Restore_LockManager_Test002");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "2", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_LockManager_Test003()
 	{
-		setTestName("Recovery_Restore_LockManager_Test003");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "5", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_LockManager_Test004()
 	{
-		setTestName("Recovery_Restore_LockManager_Test004");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.LockManager.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "10", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_StateManager_Test001()
 	{
-		setTestName("Recovery_Restore_StateManager_Test001");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "1", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "1", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_StateManager_Test002()
 	{
-		setTestName("Recovery_Restore_StateManager_Test002");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "2", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "2", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_StateManager_Test003()
 	{
-		setTestName("Recovery_Restore_StateManager_Test003");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "5", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 
 	@Test public void Recovery_Restore_StateManager_Test004()
 	{
-		setTestName("Recovery_Restore_StateManager_Test004");
-		Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "10", "$(1)");
-		client0.waitFor();
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.ArjunaCore.StateManager.CrashRecovery.client.RestoreClient001a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client1.start("100", "10", "$(1)");
-		client1.waitFor();
-		server0.terminate();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
-		Task task1 = createTask("task1", org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task1.perform();
-		Task task2 = createTask("task2", org.jboss.jbossts.qa.Utils.RemoveObjectUidStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task2.perform();
+        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)");
 	}
 }
\ No newline at end of file



More information about the jboss-svn-commits mailing list