[jboss-svn-commits] JBL Code SVN: r32094 - 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
Mon Mar 15 10:42:40 EDT 2010


Author: jhalliday
Date: 2010-03-15 10:42:40 -0400 (Mon, 15 Mar 2010)
New Revision: 32094

Added:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/QATestNameRule.java
Modified:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/Task.java
   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_jtatests01.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_abstractrecord.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_lockrecord.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_memory.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_statemanager.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_utility.java
Log:
Refactor QA test to reduce code duplication. JBTM-731


Added: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/QATestNameRule.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/QATestNameRule.java	                        (rev 0)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/QATestNameRule.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates,
+ * and individual contributors as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2010,
+ * @author JBoss, by Red Hat.
+ */
+package org.jboss.jbossts.qa.junit;
+
+import org.junit.rules.MethodRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+/**
+ * A modified version of org.junit.rules.TestName to support naming of qa tests.
+ * Original code is from junit 4.8.1. under IBM CPL 0.5 licence.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com) 2010-03
+ */
+public class QATestNameRule implements MethodRule
+{
+    private String groupName;
+    private String methodName;
+    private Integer parameterSetNumber;
+
+    /**
+     * @return the name of the currently running test group.
+     * This is normally the (unqualified) name of the class being run, which
+     * may be a subclass of the one actually containing hte test method.
+     */
+    public String getGroupName() {
+        return groupName;
+    }
+
+	/**
+	 * @return the name of the currently-running test method
+	 */
+	public String getMethodName() {
+		return methodName;
+	}
+
+    public Integer getParameterSetNumber()
+    {
+        return parameterSetNumber;
+    }
+
+    public void setParameterSetNumber(Integer parameterSetNumber)
+    {
+        this.parameterSetNumber = parameterSetNumber;
+    }
+
+    /**
+     * Modifies the method-running {@link org.junit.runners.model.Statement} to implement an additional
+     * test-running rule.
+     *
+     * @param base   The {@link org.junit.runners.model.Statement} to be modified
+     * @param method The method to be run
+     * @param target The object on with the method will be run.
+     * @return a new statement, which may be the same as {@code base},
+     *         a wrapper around {@code base}, or a completely new Statement.
+     */
+    @Override
+    public Statement apply(final Statement base, final FrameworkMethod method, final Object target)
+    {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                methodName = method.getName();
+                
+                groupName = target.getClass().getSimpleName();
+                if(groupName.startsWith("TestGroup_")) {
+                    groupName = groupName.substring(10);
+                }
+
+                if(includeTest()) {
+                    base.evaluate(); // calls setUp, test, testDown - see BlockJUnit4ClassRunner.methodBlock
+                }
+            }
+        };
+    }
+
+    protected boolean includeTest() {
+        String includePattern = System.getProperty("names");
+        if(includePattern != null && methodName != null) {
+            if(!methodName.matches(includePattern)) {
+                System.out.println("QATestNameRule.checkIncludes: skipping test "+methodName+" as it does not match 'names' pattern "+includePattern);
+                return false;
+            }
+        }
+        return true;
+    }
+}

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/Task.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/Task.java	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/Task.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -30,13 +30,13 @@
     public enum TaskType { EXPECT_PASS_FAIL, EXPECT_READY }
 
     /**
-     * execute a type READY task in a subprocess passing no arguments to the Main method of the
+     * execute a type PASS_FAIL task in a subprocess passing no arguments to the Main method of the
      * implementing class then wait for the subprocess to exit.
      */
     public void perform();
 
     /**
-     * execute a type READY task in a subprocess passing the supplied arguments to the Main method
+     * execute a type PASS_FAIL task in a subprocess passing the supplied arguments to the Main method
      * of the implementing class then wait for the subprocess to exit.
      * @param params arguments to supply to the main method of the implementing class
      */

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	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -20,14 +20,12 @@
  */
 package org.jboss.jbossts.qa.junit;
 
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.jboss.jbossts.qa.Utils.RemoveServerIORStore;
+import org.junit.*;
 import org.jboss.jbossts.qa.Utils.FileServerIORStore;
 
 import java.io.*;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * Base class from which all autogenerated test suites inherit common behaviour.
@@ -37,49 +35,87 @@
 
 public class TestGroupBase
 {
+    @Rule public final QATestNameRule testName = new QATestNameRule();
+
+    protected boolean isRecoveryManagerNeeded = false;
+    private Task recoveryManager;
+
+    private final List<Task> servers = new LinkedList<Task>();
+    private int clientCount = 0;
+
     @Before public void setUp()
 	{
         // no need to do this here as it gets done in tearDown
         // TaskImpl.cleanupTasks();
 
+        if(isRecoveryManagerNeeded) {
+            recoveryManager = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
+		    recoveryManager.start("-test");
+        }
+
 		Task emptyObjectStore = createTask("emptyObjectStore", org.jboss.jbossts.qa.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
 		emptyObjectStore.perform();
     }
 
 	@After public void tearDown()
 	{
+        stopServers();
+
+        if(isRecoveryManagerNeeded) {
+                recoveryManager.terminate();
+        }
+
         TaskImpl.cleanupTasks();
+
+        servers.clear();
     }
 
-    public String getTestGroupName() {
-        return "TestGroupsShouldOverrideThisDefaultTestGroupName";
+    /**
+     * By default the group name for a test method is the name of the class
+     * with any TestGroup_ prefix removed.
+     * 
+     * @return the test group name for the current test.
+     */
+    protected String getTestGroupName() {
+        return testName.getGroupName();
     }
 
-    private String testName;
+    protected void setTestName(String testMethodName) {
+        // QATestNameRule is now used instead
+    }
 
-    // jUnit does not appear to make it easy to ask the framework
-    // for the name of the current test method, so the tests have to
-    // inform us of it explicitly.
-    protected void setTestName(String testName) {
-        this.testName = testName;
-        checkIncludes();
+    protected void startServer(Class clazz, String... args) {
+
+        Task server;
+        synchronized(servers) {
+            String name = "server_"+servers.size();
+            server = createTask(name, clazz, Task.TaskType.EXPECT_READY, 480);
+            servers.add(server);
+        }
+
+        server.start(args);
     }
 
-    protected void checkIncludes() {
-        String includePattern = System.getProperty("names");
-        if(includePattern != null && testName != null) {
-            if(!testName.matches(includePattern)) {
-                System.out.println("TestGroupBase.checkIncludes: skipping test "+testName+" as it does not match 'names' pattern "+includePattern);
-                 // 'assume' causes the default junit4 runner to behave as with @Ignore
-                // except that @setUp has already run and @tearDown will still run.
-                Assume.assumeTrue(false);
-            }
+    private void stopServers() {
+        // stop them in reverse order
+        while(!servers.isEmpty()) {
+            Task server = servers.remove(servers.size()-1);
+            server.terminate();
         }
     }
 
-    public Task createTask(String taskName, Class clazz, Task.TaskType taskType, int timeout) {
+    protected void startAndWaitForClient(Class clazz, String... args) {
+        String name = "client_"+clientCount;
+        clientCount+=1;
+        Task client = createTask(name, clazz, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		client.start(args);
+		client.waitFor();
+    }
+
+    protected Task createTask(String taskName, Class clazz, Task.TaskType taskType, int timeout) {
         OutputStream out;
-        String filename = "./testoutput/"+getTestGroupName()+"/"+(testName == null ? "" : testName+"/")+taskName+"_output.txt";
+        String filename = "./testoutput/"+getTestGroupName()+"/"+(testName.getMethodName() == null ? "" : testName.getMethodName())+
+                (testName.getParameterSetNumber() == null ? "" : "_paramSet"+testName.getParameterSetNumber())+"/"+taskName+"_output.txt";
         try {
             File outFile = new File(filename);
             if (outFile.isDirectory()) {
@@ -102,7 +138,7 @@
     /**
      * 
      */
-    public void removeServerIORStore(String name, String... params) {
+    protected void removeServerIORStore(String name, String... params) {
         // the old, slow way spawned a cleanup task:
         //Task task = createTask(name, org.jboss.jbossts.qa.Utils.RemoveServerIORStore.class, Task.TaskType.EXPECT_PASS_FAIL, 1480);
         //task.perform(params);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jtatests01.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jtatests01.java	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jtatests01.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -23,78 +23,40 @@
 import org.jboss.jbossts.qa.junit.*;
 import org.junit.*;
 
-// Automatically generated by XML2JUnit
 public class TestGroup_jtatests01 extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "jtatests01";
-	}
+    public TestGroup_jtatests01() {
+        isRecoveryManagerNeeded = true;
+    }
 
-	protected Task server0 = null;
-
-	@Before public void setUp()
-	{
-		super.setUp();
-		server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
-		server0.start("-test");
-	}
-
-	@After public void tearDown()
-	{
-		try {
-			server0.terminate();
-		} finally {
-			super.tearDown();
-		}
-	}
-
 	@Test public void JTATests01_Test001()
 	{
-		setTestName("Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.JTA01Tests.Test01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(LOCAL_PARAMETER)");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.JTA01Tests.Test01.class, "$(LOCAL_PARAMETER)");
 	}
 
 	@Test public void JTATests01_Test002()
 	{
-		setTestName("Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.JTA01Tests.Test02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(LOCAL_PARAMETER)");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.JTA01Tests.Test02.class, "$(LOCAL_PARAMETER)");
 	}
 
 	@Test public void JTATests01_Test003()
 	{
-		setTestName("Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.JTA01Tests.Test03.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(LOCAL_PARAMETER)");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.JTA01Tests.Test03.class, "$(LOCAL_PARAMETER)");
 	}
 
 	@Test public void JTATests01_Test004()
 	{
-		setTestName("Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.JTA01Tests.Test04.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(LOCAL_PARAMETER)", "1000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.JTA01Tests.Test04.class, "$(LOCAL_PARAMETER)", "1000");
 	}
 
 	@Test public void JTATests01_Test005()
 	{
-		setTestName("Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.JTA01Tests.Test05.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(LOCAL_PARAMETER)", "1000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.JTA01Tests.Test05.class, "$(LOCAL_PARAMETER)", "1000");
 	}
 
 	@Test public void JTATests01_Test006()
 	{
-		setTestName("Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.JTA01Tests.Test06.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(LOCAL_PARAMETER)", "32", "1000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.JTA01Tests.Test06.class, "$(LOCAL_PARAMETER)", "32", "1000");
 	}
 
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore.java	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -25,327 +25,148 @@
 
 public class TestGroup_txcore extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "txcore";
-	}
-
-
-	@Before public void setUp()
-	{
-		super.setUp();
-	}
-
-	@After public void tearDown()
-	{
-		try {
-		} finally {
-			super.tearDown();
-		}
-	}
-
 	@Test public void TX_Statistics_Test001()
 	{
-		setTestName("TX_Statistics_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client001.class, "$(CALLS)", "1");
 	}
 
 	@Test public void TX_Statistics_Test002()
 	{
-		setTestName("TX_Statistics_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client001.class, "$(CALLS)", "2");
 	}
 
 	@Test public void TX_Statistics_Test003()
 	{
-		setTestName("TX_Statistics_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "3");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client001.class, "$(CALLS)", "3");
 	}
 
 	@Test public void TX_Statistics_Test004()
 	{
-		setTestName("TX_Statistics_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "4");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client001.class, "$(CALLS)", "4");
 	}
 
+
 	@Test public void TX_Statistics_Test005()
 	{
-		setTestName("TX_Statistics_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client002.class, "$(CALLS)", "1");
 	}
 
 	@Test public void TX_Statistics_Test006()
 	{
-		setTestName("TX_Statistics_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client002.class, "$(CALLS)", "2");
 	}
 
 	@Test public void TX_Statistics_Test007()
 	{
-		setTestName("TX_Statistics_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "3");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client002.class, "$(CALLS)", "3");
 	}
 
 	@Test public void TX_Statistics_Test008()
 	{
-		setTestName("TX_Statistics_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "4");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client002.class, "$(CALLS)", "4");
 	}
 
+
 	@Test public void TX_Statistics_Test009()
 	{
-		setTestName("TX_Statistics_Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client003.class, "$(CALLS)", "1");
 	}
 
 	@Test public void TX_Statistics_Test010()
 	{
-		setTestName("TX_Statistics_Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client003.class, "$(CALLS)", "2");
 	}
 
 	@Test public void TX_Statistics_Test011()
 	{
-		setTestName("TX_Statistics_Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "3");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client003.class, "$(CALLS)", "3");
 	}
 
 	@Test public void TX_Statistics_Test012()
 	{
-		setTestName("TX_Statistics_Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "4");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client003.class, "$(CALLS)", "4");
 	}
 
+
 	@Test public void TX_Statistics_Test013()
 	{
-		setTestName("TX_Statistics_Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client004.class, "$(CALLS)", "1");
 	}
 
 	@Test public void TX_Statistics_Test014()
 	{
-		setTestName("TX_Statistics_Test014");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client004.class, "$(CALLS)", "2");
 	}
 
 	@Test public void TX_Statistics_Test015()
 	{
-		setTestName("TX_Statistics_Test015");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "3");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+		startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client004.class, "$(CALLS)", "3");
 	}
 
 	@Test public void TX_Statistics_Test016()
 	{
-		setTestName("TX_Statistics_Test016");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Stats.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "4");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Stats.Client004.class, "$(CALLS)", "4");
 	}
 
+    
 	@Test public void Uid_Test001()
 	{
-		setTestName("Uid_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("1", "100");
-		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.Common.UidTest.class, "1", "100");
 	}
 
 	@Test public void Uid_Test002()
 	{
-		setTestName("Uid_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("1", "1000");
-		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.Common.UidTest.class, "1", "1000");
 	}
 
 	@Test public void Uid_Test003()
 	{
-		setTestName("Uid_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("1", "10000");
-		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.Common.UidTest.class, "1", "10000");
 	}
 
 	@Test public void Uid_Test004()
 	{
-		setTestName("Uid_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("10", "100");
-		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.Common.UidTest.class, "10", "100");
 	}
 
 	@Test public void Uid_Test005()
 	{
-		setTestName("Uid_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("10", "800");
-		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.Common.UidTest.class, "10", "800");
 	}
 
 	@Test public void Uid_Test006()
 	{
-		setTestName("Uid_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("10", "1000");
-		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.Common.UidTest.class, "10", "1000");
 	}
 
 	@Test public void Uid_Test007()
 	{
-		setTestName("Uid_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("20", "100");
-		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.Common.UidTest.class, "20", "100");
 	}
 
 	@Test public void Uid_Test008()
 	{
-		setTestName("Uid_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("20", "1000");
-		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.Common.UidTest.class, "20", "1000");
 	}
 
 	@Test public void Uid_Test009()
 	{
-		setTestName("Uid_Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("20", "2000");
-		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.Common.UidTest.class, "20", "2000");
 	}
 
 	@Test public void Uid_Test010()
 	{
-		setTestName("Uid_Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("25", "100");
-		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.Common.UidTest.class, "25", "100");
 	}
 
 	@Test public void Uid_Test011()
 	{
-		setTestName("Uid_Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("28", "100");
-		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.Common.UidTest.class, "28", "100");
 	}
 
 	@Test public void Uid_Test012()
 	{
-		setTestName("Uid_Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UidTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("30", "50");
-		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.Common.UidTest.class, "30", "50");
 	}
 
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_abstractrecord.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_abstractrecord.java	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_abstractrecord.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -25,344 +25,166 @@
 
 public class TestGroup_txcore_abstractrecord extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "txcore_abstractrecord";
-	}
-
-
-	@Before public void setUp()
-	{
-		super.setUp();
-	}
-
-	@After public void tearDown()
-	{
-		try {
-		} finally {
-			super.tearDown();
-		}
-	}
-
-
-
 	@Test public void AbstractRecord_Test001()
 	{
-		setTestName("AbstractRecord_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client001.class, "$(CALLS)", "1");
 	}
 
 	@Test public void AbstractRecord_Test002()
 	{
-		setTestName("AbstractRecord_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client001.class, "$(CALLS)", "2");
 	}
 
 	@Test public void AbstractRecord_Test003()
 	{
-		setTestName("AbstractRecord_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client001.class, "$(CALLS)", "5");
 	}
 
 	@Test public void AbstractRecord_Test004()
 	{
-		setTestName("AbstractRecord_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client001.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void AbstractRecord_Test005()
 	{
-		setTestName("AbstractRecord_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client002.class, "$(CALLS)", "1");
 	}
 
 	@Test public void AbstractRecord_Test006()
 	{
-		setTestName("AbstractRecord_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client002.class, "$(CALLS)", "2");
 	}
 
 	@Test public void AbstractRecord_Test007()
 	{
-		setTestName("AbstractRecord_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client002.class, "$(CALLS)", "5");
 	}
 
 	@Test public void AbstractRecord_Test008()
 	{
-		setTestName("AbstractRecord_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.Client002.class, "$(CALLS)", "10");
 	}
+    
 
 	@Test public void AbstractRecord_Thread_Test001()
 	{
-		setTestName("AbstractRecord_Thread_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void AbstractRecord_Thread_Test002()
 	{
-		setTestName("AbstractRecord_Thread_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void AbstractRecord_Thread_Test003()
 	{
-		setTestName("AbstractRecord_Thread_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void AbstractRecord_Thread_Test004()
 	{
-		setTestName("AbstractRecord_Thread_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "10", "2");
 	}
 
 	@Test public void AbstractRecord_Thread_Test005()
 	{
-		setTestName("AbstractRecord_Thread_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "1", "5");
 	}
 
 	@Test public void AbstractRecord_Thread_Test006()
 	{
-		setTestName("AbstractRecord_Thread_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "2", "5");
 	}
 
 	@Test public void AbstractRecord_Thread_Test007()
 	{
-		setTestName("AbstractRecord_Thread_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "5", "5");
 	}
 
 	@Test public void AbstractRecord_Thread_Test008()
 	{
-		setTestName("AbstractRecord_Thread_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "10", "5");
 	}
 
 	@Test public void AbstractRecord_Thread_Test009()
 	{
-		setTestName("AbstractRecord_Thread_Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "1", "10");
 	}
 
 	@Test public void AbstractRecord_Thread_Test010()
 	{
-		setTestName("AbstractRecord_Thread_Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "2", "10");
 	}
 
 	@Test public void AbstractRecord_Thread_Test011()
 	{
-		setTestName("AbstractRecord_Thread_Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "5", "10");
 	}
 
 	@Test public void AbstractRecord_Thread_Test012()
 	{
-		setTestName("AbstractRecord_Thread_Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient001.class,  "$(CALLS)", "10", "10");
 	}
 
+
 	@Test public void AbstractRecord_Thread_Test013()
 	{
-		setTestName("AbstractRecord_Thread_Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "1", "2");
 	}
 
 	@Test public void AbstractRecord_Thread_Test014()
 	{
-		setTestName("AbstractRecord_Thread_Test014");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "2", "2");
 	}
 
 	@Test public void AbstractRecord_Thread_Test015()
 	{
-		setTestName("AbstractRecord_Thread_Test015");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "5", "2");
 	}
 
 	@Test public void AbstractRecord_Thread_Test016()
 	{
-		setTestName("AbstractRecord_Thread_Test016");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "10", "2");
 	}
 
 	@Test public void AbstractRecord_Thread_Test017()
 	{
-		setTestName("AbstractRecord_Thread_Test017");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "1", "5");
 	}
 
 	@Test public void AbstractRecord_Thread_Test018()
 	{
-		setTestName("AbstractRecord_Thread_Test018");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "2", "5");
 	}
 
 	@Test public void AbstractRecord_Thread_Test019()
 	{
-		setTestName("AbstractRecord_Thread_Test019");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "5", "5");
 	}
 
 	@Test public void AbstractRecord_Thread_Test020()
 	{
-		setTestName("AbstractRecord_Thread_Test020");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "10", "5");
 	}
 
 	@Test public void AbstractRecord_Thread_Test021()
 	{
-		setTestName("AbstractRecord_Thread_Test021");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "1", "10");
 	}
 
 	@Test public void AbstractRecord_Thread_Test022()
 	{
-		setTestName("AbstractRecord_Thread_Test022");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "2", "10");
 	}
 
 	@Test public void AbstractRecord_Thread_Test023()
 	{
-		setTestName("AbstractRecord_Thread_Test023");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "5", "10");
 	}
 
 	@Test public void AbstractRecord_Thread_Test024()
 	{
-		setTestName("AbstractRecord_Thread_Test024");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.WorkerClient002.class,  "$(CALLS)", "10", "10");
 	}
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_lockrecord.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_lockrecord.java	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_lockrecord.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -25,1143 +25,571 @@
 
 public class TestGroup_txcore_lockrecord extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "txcore_lockrecord";
-	}
-
-
-	@Before public void setUp()
-	{
-		super.setUp();
-	}
-
-	@After public void tearDown()
-	{
-		try {
-		} finally {
-			super.tearDown();
-		}
-	}
-
-
 	@Test public void LockRecord_Test001()
 	{
-		setTestName("LockRecord_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client001.class, "$(CALLS)", "1");
 	}
 
 	@Test public void LockRecord_Test002()
 	{
-		setTestName("LockRecord_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client001.class, "$(CALLS)", "2");
 	}
 
 	@Test public void LockRecord_Test003()
 	{
-		setTestName("LockRecord_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client001.class, "$(CALLS)", "5");
 	}
 
 	@Test public void LockRecord_Test004()
 	{
-		setTestName("LockRecord_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client001.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void LockRecord_Test005()
 	{
-		setTestName("LockRecord_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, "$(CALLS)", "1");
 	}
 
 	@Test public void LockRecord_Test006()
 	{
-		setTestName("LockRecord_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, "$(CALLS)", "2");
 	}
 
 	@Test public void LockRecord_Test007()
 	{
-		setTestName("LockRecord_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, "$(CALLS)", "5");
 	}
 
 	@Test public void LockRecord_Test008()
 	{
-		setTestName("LockRecord_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void LockRecord_Test009()
 	{
-		setTestName("LockRecord_Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client003.class, "$(CALLS)", "1");
 	}
 
 	@Test public void LockRecord_Test010()
 	{
-		setTestName("LockRecord_Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client003.class, "$(CALLS)", "2");
 	}
 
 	@Test public void LockRecord_Test011()
 	{
-		setTestName("LockRecord_Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client003.class, "$(CALLS)", "5");
 	}
 
 	@Test public void LockRecord_Test012()
 	{
-		setTestName("LockRecord_Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client003.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void LockRecord_Test013()
 	{
-		setTestName("LockRecord_Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client004.class, "$(CALLS)", "1");
 	}
 
 	@Test public void LockRecord_Test014()
 	{
-		setTestName("LockRecord_Test014");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client004.class, "$(CALLS)", "2");
 	}
 
+
 	@Test public void LockRecord_Test015()
 	{
-		setTestName("LockRecord_Test015");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("100", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client004.class, "100", "5");
 	}
 
 	@Test public void LockRecord_Test016()
 	{
-		setTestName("LockRecord_Test016");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.Client004.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void LockRecord_Thread_Test001a()
 	{
-		setTestName("LockRecord_Thread_Test001a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test001b()
 	{
-		setTestName("LockRecord_Thread_Test001b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test002a()
 	{
-		setTestName("LockRecord_Thread_Test002a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test002b()
 	{
-		setTestName("LockRecord_Thread_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test003a()
 	{
-		setTestName("LockRecord_Thread_Test003a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test003b()
 	{
-		setTestName("LockRecord_Thread_Test003b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "5", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test004a()
 	{
-		setTestName("LockRecord_Thread_Test004a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "10", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test004b()
 	{
-		setTestName("LockRecord_Thread_Test004b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "10", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test005a()
 	{
-		setTestName("LockRecord_Thread_Test005a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "1", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test005b()
 	{
-		setTestName("LockRecord_Thread_Test005b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "1", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test006a()
 	{
-		setTestName("LockRecord_Thread_Test006a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test006b()
 	{
-		setTestName("LockRecord_Thread_Test006b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "2", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test007a()
 	{
-		setTestName("LockRecord_Thread_Test007a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "5", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test007b()
 	{
-		setTestName("LockRecord_Thread_Test007b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "5", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test008a()
 	{
-		setTestName("LockRecord_Thread_Test008a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "10", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test008b()
 	{
-		setTestName("LockRecord_Thread_Test008b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "10", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test009a()
 	{
-		setTestName("LockRecord_Thread_Test009a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "1", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test009b()
 	{
-		setTestName("LockRecord_Thread_Test009b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "1", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test010a()
 	{
-		setTestName("LockRecord_Thread_Test010a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "2", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test010b()
 	{
-		setTestName("LockRecord_Thread_Test010b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "2", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test011a()
 	{
-		setTestName("LockRecord_Thread_Test011a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "5", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test011b()
 	{
-		setTestName("LockRecord_Thread_Test011b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "5", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test012a()
 	{
-		setTestName("LockRecord_Thread_Test012a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "$(CALLS)", "10", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test012b()
 	{
-		setTestName("LockRecord_Thread_Test012b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient001.class, "-newlock", "$(CALLS)", "10", "10");
 	}
 
+
 	@Test public void LockRecord_Thread_Test013a()
 	{
-		setTestName("LockRecord_Thread_Test013a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test013b()
 	{
-		setTestName("LockRecord_Thread_Test013b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test014a()
 	{
-		setTestName("LockRecord_Thread_Test014a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test014b()
 	{
-		setTestName("LockRecord_Thread_Test014b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test015a()
 	{
-		setTestName("LockRecord_Thread_Test015a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test015b()
 	{
-		setTestName("LockRecord_Thread_Test015b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)","5", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test016a()
 	{
-		setTestName("LockRecord_Thread_Test016a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "10", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test016b()
 	{
-		setTestName("LockRecord_Thread_Test016b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "10", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test017a()
 	{
-		setTestName("LockRecord_Thread_Test017a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "1", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test017b()
 	{
-		setTestName("LockRecord_Thread_Test017b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test018a()
 	{
-		setTestName("LockRecord_Thread_Test018a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "2", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test018b()
 	{
-		setTestName("LockRecord_Thread_Test018b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "2", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test019a()
 	{
-		setTestName("LockRecord_Thread_Test019a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "5", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test019b()
 	{
-		setTestName("LockRecord_Thread_Test019b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "5", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test020a()
 	{
-		setTestName("LockRecord_Thread_Test020a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "10", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test020b()
 	{
-		setTestName("LockRecord_Thread_Test020b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "10", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test021a()
 	{
-		setTestName("LockRecord_Thread_Test021a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "1", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test021b()
 	{
-		setTestName("LockRecord_Thread_Test021b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "1", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test022a()
 	{
-		setTestName("LockRecord_Thread_Test022a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "2", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test022b()
 	{
-		setTestName("LockRecord_Thread_Test022b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "2", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test023a()
 	{
-		setTestName("LockRecord_Thread_Test023a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "5", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test023b()
 	{
-		setTestName("LockRecord_Thread_Test023b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "5", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test024a()
 	{
-		setTestName("LockRecord_Thread_Test024a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "$(CALLS)", "10", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test024b()
 	{
-		setTestName("LockRecord_Thread_Test024b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient002.class, "-newlock", "$(CALLS)", "10", "10");
 	}
 
+
 	@Test public void LockRecord_Thread_Test025a()
 	{
-		setTestName("LockRecord_Thread_Test025a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test025b()
 	{
-		setTestName("LockRecord_Thread_Test025b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test026a()
 	{
-		setTestName("LockRecord_Thread_Test026a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test026b()
-	{
-		setTestName("LockRecord_Thread_Test026b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+    {
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test027a()
 	{
-		setTestName("LockRecord_Thread_Test027a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test027b()
 	{
-		setTestName("LockRecord_Thread_Test027b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "5", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test028a()
 	{
-		setTestName("LockRecord_Thread_Test028a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "10", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test028b()
 	{
-		setTestName("LockRecord_Thread_Test028b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "10", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test029a()
 	{
-		setTestName("LockRecord_Thread_Test029a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "1", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test029b()
 	{
-		setTestName("LockRecord_Thread_Test029b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "1", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test030a()
 	{
-		setTestName("LockRecord_Thread_Test030a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "2", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test030b()
 	{
-		setTestName("LockRecord_Thread_Test030b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "2", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test031a()
 	{
-		setTestName("LockRecord_Thread_Test031a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "5", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test031b()
 	{
-		setTestName("LockRecord_Thread_Test031b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "5", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test032a()
 	{
-		setTestName("LockRecord_Thread_Test032a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "10", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test032b()
 	{
-		setTestName("LockRecord_Thread_Test032b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "10", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test033a()
 	{
-		setTestName("LockRecord_Thread_Test033a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "1", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test033b()
 	{
-		setTestName("LockRecord_Thread_Test033b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "1", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test034a()
 	{
-		setTestName("LockRecord_Thread_Test034a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "2", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test034b()
 	{
-		setTestName("LockRecord_Thread_Test034b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "2", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test035a()
 	{
-		setTestName("LockRecord_Thread_Test035a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "5", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test035b()
 	{
-		setTestName("LockRecord_Thread_Test035b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "5", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test036a()
 	{
-		setTestName("LockRecord_Thread_Test036a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "$(CALLS)", "10", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test036b()
 	{
-		setTestName("LockRecord_Thread_Test036b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient003.class, "-newlock", "$(CALLS)", "10", "10");
 	}
 
+
 	@Test public void LockRecord_Thread_Test037a()
 	{
-		setTestName("LockRecord_Thread_Test037a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test037b()
 	{
-		setTestName("LockRecord_Thread_Test037b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test038a()
 	{
-		setTestName("LockRecord_Thread_Test038a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test038b()
 	{
-		setTestName("LockRecord_Thread_Test038b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "2", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test039a()
 	{
-		setTestName("LockRecord_Thread_Test039a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test039b()
 	{
-		setTestName("LockRecord_Thread_Test039b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "5", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test040a()
 	{
-		setTestName("LockRecord_Thread_Test040a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "10", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test040b()
 	{
-		setTestName("LockRecord_Thread_Test040b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "10", "2");
 	}
 
 	@Test public void LockRecord_Thread_Test041a()
 	{
-		setTestName("LockRecord_Thread_Test041a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "1", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test041b()
 	{
-		setTestName("LockRecord_Thread_Test041b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "1", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test042a()
 	{
-		setTestName("LockRecord_Thread_Test042a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "2", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test042b()
 	{
-		setTestName("LockRecord_Thread_Test042b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "2", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test043a()
 	{
-		setTestName("LockRecord_Thread_Test043a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "5", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test043b()
 	{
-		setTestName("LockRecord_Thread_Test043b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "5", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test044a()
 	{
-		setTestName("LockRecord_Thread_Test044a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "10", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test044b()
 	{
-		setTestName("LockRecord_Thread_Test044b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "10", "5");
 	}
 
 	@Test public void LockRecord_Thread_Test045a()
 	{
-		setTestName("LockRecord_Thread_Test045a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "1", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test045b()
 	{
-		setTestName("LockRecord_Thread_Test045b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "1", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test046a()
 	{
-		setTestName("LockRecord_Thread_Test046a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "2", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test046b()
 	{
-		setTestName("LockRecord_Thread_Test046b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "2", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test047a()
 	{
-		setTestName("LockRecord_Thread_Test047a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "5", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test047b()
 	{
-		setTestName("LockRecord_Thread_Test047b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "5", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test048a()
 	{
-		setTestName("LockRecord_Thread_Test048a");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("-newlock", "$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "$(CALLS)", "10", "10");
 	}
 
 	@Test public void LockRecord_Thread_Test048b()
 	{
-		setTestName("LockRecord_Thread_Test048b");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.WorkerClient004.class, "-newlock", "$(CALLS)", "10", "10");
 	}
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_memory.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_memory.java	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_memory.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -25,112 +25,50 @@
 
 /**
  * Memory leak tests gathered from txcore abstractrecord, lockrecord and statemanager.
- * Memory leak tests are centralized here as running htem requires a custom environment,
+ * Memory leak tests are centralized here as running them requires a custom environment,
  * see run-tests.xml
  */
 public class TestGroup_txcore_memory extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "txcore_memory";
-	}
-
-
-	@Before
-    public void setUp()
-	{
-		super.setUp();
-	}
-
-	@After
-    public void tearDown()
-	{
-		try {
-		} finally {
-			super.tearDown();
-		}
-	}
-
-    /////////////////////////////////////////////////////
-
     @Test public void AbstractRecord_Memory_Test001()
     {
-        setTestName("AbstractRecord_Memory_Test001");
-        Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        client0.start("$(CALLS)", "1", "999");
-        client0.waitFor();
-        Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient001.class, "$(CALLS)", "1", "999");
     }
 
     @Test public void AbstractRecord_Memory_Test002()
     {
-        setTestName("AbstractRecord_Memory_Test002");
-        Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        client0.start("$(CALLS)", "2", "999");
-        client0.waitFor();
-        Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient001.class, "$(CALLS)", "2", "999");
     }
 
     @Test public void AbstractRecord_Memory_Test003()
     {
-        setTestName("AbstractRecord_Memory_Test003");
-        Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        client0.start("$(CALLS)", "5", "999");
-        client0.waitFor();
-        Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient001.class, "$(CALLS)", "5", "999");
     }
 
     @Test public void AbstractRecord_Memory_Test004()
     {
-        setTestName("AbstractRecord_Memory_Test004");
-        Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        client0.start("$(CALLS)", "10", "999");
-        client0.waitFor();
-        Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient001.class, "$(CALLS)", "10", "999");
     }
 
+
     @Test public void AbstractRecord_Memory_Test005()
     {
-        setTestName("AbstractRecord_Memory_Test005");
-        Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        client0.start("$(CALLS)", "1", "999");
-        client0.waitFor();
-        Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient002.class, "$(CALLS)", "1", "999");
     }
 
     @Test public void AbstractRecord_Memory_Test006()
     {
-        setTestName("AbstractRecord_Memory_Test006");
-        Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        client0.start("$(CALLS)", "2", "999");
-        client0.waitFor();
-        Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-        task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient002.class, "$(CALLS)", "2", "999");
     }
 
 	@Test public void AbstractRecord_Memory_Test007()
 	{
-		setTestName("AbstractRecord_Memory_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient002.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void AbstractRecord_Memory_Test008()
 	{
-		setTestName("AbstractRecord_Memory_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.client.MemoryClient002.class, "$(CALLS)", "10", "999");
 	}
 
     /////////////////////////////////////////////////////
@@ -138,323 +76,163 @@
 
 	@Test public void LockRecord_Memory_Test001()
 	{
-		setTestName("LockRecord_Memory_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient001.class, "$(CALLS)", "1", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test002()
 	{
-		setTestName("LockRecord_Memory_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient001.class, "$(CALLS)", "2", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test003()
 	{
-		setTestName("LockRecord_Memory_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient001.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test004()
 	{
-		setTestName("LockRecord_Memory_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient001.class, "$(CALLS)", "10", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test005()
 	{
-		setTestName("LockRecord_Memory_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient002.class, "$(CALLS)", "1", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test006()
 	{
-		setTestName("LockRecord_Memory_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient002.class, "$(CALLS)", "2", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test007()
 	{
-		setTestName("LockRecord_Memory_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient002.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test008()
 	{
-		setTestName("LockRecord_Memory_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient002.class, "$(CALLS)", "10", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test009()
 	{
-		setTestName("LockRecord_Memory_Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient003.class, "$(CALLS)", "1", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test010()
 	{
-		setTestName("LockRecord_Memory_Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient003.class, "$(CALLS)", "2", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test011()
 	{
-		setTestName("LockRecord_Memory_Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient003.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test012()
 	{
-		setTestName("LockRecord_Memory_Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient003.class, "$(CALLS)", "10", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test013()
 	{
-		setTestName("LockRecord_Memory_Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient004.class, "$(CALLS)", "1", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test014()
 	{
-		setTestName("LockRecord_Memory_Test014");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient004.class, "$(CALLS)", "2", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test015()
 	{
-		setTestName("LockRecord_Memory_Test015");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient004.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void LockRecord_Memory_Test016()
 	{
-		setTestName("LockRecord_Memory_Test016");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.LockManager.client.MemoryClient004.class, "$(CALLS)", "10", "999");
 	}
 
     /////////////////////////////////////////////////////
     
 	@Test public void StateManager_Memory_Test001()
 	{
-		setTestName("StateManager_Memory_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient001.class, "$(CALLS)", "1", "999");
 	}
 
 	@Test public void StateManager_Memory_Test002()
 	{
-		setTestName("StateManager_Memory_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient001.class, "$(CALLS)", "2", "999");
 	}
 
 	@Test public void StateManager_Memory_Test003()
 	{
-		setTestName("StateManager_Memory_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient001.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void StateManager_Memory_Test004()
 	{
-		setTestName("StateManager_Memory_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient001.class, "$(CALLS)", "10", "999");
 	}
 
 	@Test public void StateManager_Memory_Test005()
 	{
-		setTestName("StateManager_Memory_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient002.class, "$(CALLS)", "1", "999");
 	}
 
 	@Test public void StateManager_Memory_Test006()
 	{
-		setTestName("StateManager_Memory_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient002.class, "$(CALLS)", "2", "999");
 	}
 
 	@Test public void StateManager_Memory_Test007()
 	{
-		setTestName("StateManager_Memory_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient002.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void StateManager_Memory_Test008()
 	{
-		setTestName("StateManager_Memory_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient002.class, "$(CALLS)", "10", "999");
 	}
 
 	@Test public void StateManager_Memory_Test009()
 	{
-		setTestName("StateManager_Memory_Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient003.class, "$(CALLS)", "1", "999");
 	}
 
 	@Test public void StateManager_Memory_Test010()
 	{
-		setTestName("StateManager_Memory_Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient003.class, "$(CALLS)", "2", "999");
 	}
 
 	@Test public void StateManager_Memory_Test011()
 	{
-		setTestName("StateManager_Memory_Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient003.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void StateManager_Memory_Test012()
 	{
-		setTestName("StateManager_Memory_Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient003.class, "$(CALLS)", "10", "999");
 	}
 
 	@Test public void StateManager_Memory_Test013()
 	{
-		setTestName("StateManager_Memory_Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient004.class, "$(CALLS)", "1", "999");
 	}
 
 	@Test public void StateManager_Memory_Test014()
 	{
-		setTestName("StateManager_Memory_Test014");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient004.class, "$(CALLS)", "2", "999");
 	}
 
 	@Test public void StateManager_Memory_Test015()
 	{
-		setTestName("StateManager_Memory_Test015");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient004.class, "$(CALLS)", "5", "999");
 	}
 
 	@Test public void StateManager_Memory_Test016()
 	{
-		setTestName("StateManager_Memory_Test016");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "999");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.MemoryClient004.class, "$(CALLS)", "10", "999");
     }
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_statemanager.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_statemanager.java	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_statemanager.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -25,664 +25,330 @@
 
 public class TestGroup_txcore_statemanager extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "txcore_statemanager";
-	}
-
-
-	@Before public void setUp()
-	{
-		super.setUp();
-	}
-
-	@After public void tearDown()
-	{
-		try {
-		} finally {
-			super.tearDown();
-		}
-	}
-
-
-
 	@Test public void StateManager_Test001()
 	{
-		setTestName("StateManager_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client001.class, "$(CALLS)", "1");
 	}
 
 	@Test public void StateManager_Test002()
 	{
-		setTestName("StateManager_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client001.class, "$(CALLS)", "2");
 	}
 
 	@Test public void StateManager_Test003()
 	{
-		setTestName("StateManager_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client001.class, "$(CALLS)", "5");
 	}
 
 	@Test public void StateManager_Test004()
 	{
-		setTestName("StateManager_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client001.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void StateManager_Test005()
 	{
-		setTestName("StateManager_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client002.class, "$(CALLS)", "1");
 	}
 
 	@Test public void StateManager_Test006()
 	{
-		setTestName("StateManager_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client002.class, "$(CALLS)", "2");
 	}
 
 	@Test public void StateManager_Test007()
 	{
-		setTestName("StateManager_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client002.class, "$(CALLS)", "5");
 	}
 
 	@Test public void StateManager_Test008()
 	{
-		setTestName("StateManager_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client002.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void StateManager_Test009()
 	{
-		setTestName("StateManager_Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client003.class, "$(CALLS)", "1");
 	}
 
 	@Test public void StateManager_Test010()
 	{
-		setTestName("StateManager_Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client003.class, "$(CALLS)", "2");
 	}
 
 	@Test public void StateManager_Test011()
 	{
-		setTestName("StateManager_Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client003.class, "$(CALLS)", "5");
 	}
 
 	@Test public void StateManager_Test012()
 	{
-		setTestName("StateManager_Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client003.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void StateManager_Test013()
 	{
-		setTestName("StateManager_Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client004.class, "$(CALLS)", "1");
 	}
 
 	@Test public void StateManager_Test014()
 	{
-		setTestName("StateManager_Test014");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client004.class, "$(CALLS)", "2");
 	}
 
 	@Test public void StateManager_Test015()
 	{
-		setTestName("StateManager_Test015");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client004.class, "$(CALLS)", "5");
 	}
 
 	@Test public void StateManager_Test016()
 	{
-		setTestName("StateManager_Test016");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.Client004.class, "$(CALLS)", "10");
 	}
 
+
 	@Test public void StateManager_Thread_Test001()
 	{
-		setTestName("StateManager_Thread_Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void StateManager_Thread_Test002()
 	{
-		setTestName("StateManager_Thread_Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void StateManager_Thread_Test003()
 	{
-		setTestName("StateManager_Thread_Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void StateManager_Thread_Test004()
 	{
-		setTestName("StateManager_Thread_Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "10", "2");
 	}
 
 	@Test public void StateManager_Thread_Test005()
 	{
-		setTestName("StateManager_Thread_Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "1", "5");
 	}
 
 	@Test public void StateManager_Thread_Test006()
 	{
-		setTestName("StateManager_Thread_Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "2", "5");
 	}
 
 	@Test public void StateManager_Thread_Test007()
 	{
-		setTestName("StateManager_Thread_Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "5", "5");
 	}
 
 	@Test public void StateManager_Thread_Test008()
 	{
-		setTestName("StateManager_Thread_Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "10", "5");
 	}
 
 	@Test public void StateManager_Thread_Test009()
 	{
-		setTestName("StateManager_Thread_Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "1", "10");
 	}
 
 	@Test public void StateManager_Thread_Test010()
 	{
-		setTestName("StateManager_Thread_Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "2", "10");
 	}
 
 	@Test public void StateManager_Thread_Test011()
 	{
-		setTestName("StateManager_Thread_Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "5", "10");
 	}
 
 	@Test public void StateManager_Thread_Test012()
 	{
-		setTestName("StateManager_Thread_Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient001.class, "$(CALLS)", "10", "10");
 	}
 
+
 	@Test public void StateManager_Thread_Test013()
 	{
-		setTestName("StateManager_Thread_Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void StateManager_Thread_Test014()
 	{
-		setTestName("StateManager_Thread_Test014");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void StateManager_Thread_Test015()
 	{
-		setTestName("StateManager_Thread_Test015");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void StateManager_Thread_Test016()
 	{
-		setTestName("StateManager_Thread_Test016");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "10", "2");
 	}
 
 	@Test public void StateManager_Thread_Test017()
 	{
-		setTestName("StateManager_Thread_Test017");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "1", "5");
 	}
 
 	@Test public void StateManager_Thread_Test018()
 	{
-		setTestName("StateManager_Thread_Test018");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "2", "5");
 	}
 
 	@Test public void StateManager_Thread_Test019()
 	{
-		setTestName("StateManager_Thread_Test019");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "5", "5");
 	}
 
 	@Test public void StateManager_Thread_Test020()
 	{
-		setTestName("StateManager_Thread_Test020");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "10", "5");
 	}
 
 	@Test public void StateManager_Thread_Test021()
 	{
-		setTestName("StateManager_Thread_Test021");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "1", "10");
 	}
 
 	@Test public void StateManager_Thread_Test022()
 	{
-		setTestName("StateManager_Thread_Test022");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "2", "10");
 	}
 
 	@Test public void StateManager_Thread_Test023()
 	{
-		setTestName("StateManager_Thread_Test023");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "5", "10");
 	}
 
 	@Test public void StateManager_Thread_Test024()
 	{
-		setTestName("StateManager_Thread_Test024");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient002.class, "$(CALLS)", "10", "10");
 	}
 
+
 	@Test public void StateManager_Thread_Test025()
 	{
-		setTestName("StateManager_Thread_Test025");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void StateManager_Thread_Test026()
 	{
-		setTestName("StateManager_Thread_Test026");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void StateManager_Thread_Test027()
 	{
-		setTestName("StateManager_Thread_Test027");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void StateManager_Thread_Test028()
 	{
-		setTestName("StateManager_Thread_Test028");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "10", "2");
 	}
 
 	@Test public void StateManager_Thread_Test029()
 	{
-		setTestName("StateManager_Thread_Test029");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "1", "5");
 	}
 
 	@Test public void StateManager_Thread_Test030()
 	{
-		setTestName("StateManager_Thread_Test030");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "2", "5");
 	}
 
 	@Test public void StateManager_Thread_Test031()
 	{
-		setTestName("StateManager_Thread_Test031");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "5", "5");
 	}
 
 	@Test public void StateManager_Thread_Test032()
 	{
-		setTestName("StateManager_Thread_Test032");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "10", "5");
 	}
 
 	@Test public void StateManager_Thread_Test033()
 	{
-		setTestName("StateManager_Thread_Test033");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "1", "10");
 	}
 
 	@Test public void StateManager_Thread_Test034()
 	{
-		setTestName("StateManager_Thread_Test034");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "2", "10");
 	}
 
 	@Test public void StateManager_Thread_Test035()
 	{
-		setTestName("StateManager_Thread_Test035");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "5", "10");
 	}
 
 	@Test public void StateManager_Thread_Test036()
 	{
-		setTestName("StateManager_Thread_Test036");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient003.class, "$(CALLS)", "10", "10");
 	}
 
+
 	@Test public void StateManager_Thread_Test037()
 	{
-		setTestName("StateManager_Thread_Test037");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "1", "2");
 	}
 
 	@Test public void StateManager_Thread_Test038()
 	{
-		setTestName("StateManager_Thread_Test038");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "2", "2");
 	}
 
 	@Test public void StateManager_Thread_Test039()
 	{
-		setTestName("StateManager_Thread_Test039");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "5", "2");
 	}
 
 	@Test public void StateManager_Thread_Test040()
 	{
-		setTestName("StateManager_Thread_Test040");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "2");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "10", "2");
 	}
 
 	@Test public void StateManager_Thread_Test041()
 	{
-		setTestName("StateManager_Thread_Test041");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "1", "5");
 	}
 
 	@Test public void StateManager_Thread_Test042()
 	{
-		setTestName("StateManager_Thread_Test042");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "2", "5");
 	}
 
 	@Test public void StateManager_Thread_Test043()
 	{
-		setTestName("StateManager_Thread_Test043");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "5", "5");
 	}
 
 	@Test public void StateManager_Thread_Test044()
 	{
-		setTestName("StateManager_Thread_Test044");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "5");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "10", "5");
 	}
 
 	@Test public void StateManager_Thread_Test045()
 	{
-		setTestName("StateManager_Thread_Test045");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "1", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "1", "10");
 	}
 
 	@Test public void StateManager_Thread_Test046()
 	{
-		setTestName("StateManager_Thread_Test046");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "2", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "2", "10");
 	}
 
 	@Test public void StateManager_Thread_Test047()
 	{
-		setTestName("StateManager_Thread_Test047");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "5", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "5", "10");
 	}
 
 	@Test public void StateManager_Thread_Test048()
 	{
-		setTestName("StateManager_Thread_Test048");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("$(CALLS)", "10", "10");
-		client0.waitFor();
-		Task task0 = createTask("task0", org.jboss.jbossts.qa.ArjunaCore.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		task0.perform();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.StateManager.client.WorkerClient004.class, "$(CALLS)", "10", "10");
 	}
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_utility.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_utility.java	2010-03-15 13:57:51 UTC (rev 32093)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_txcore_utility.java	2010-03-15 14:42:40 UTC (rev 32094)
@@ -25,343 +25,205 @@
 
 public class TestGroup_txcore_utility extends TestGroupBase
 {
-	public String getTestGroupName()
-	{
-		return "txcore_utility";
-	}
-
-
-	@Before public void setUp()
-	{
-		super.setUp();
-	}
-
-	@After public void tearDown()
-	{
-		try {
-		} finally {
-			super.tearDown();
-		}
-	}
-
 	@Test public void Utility_Test001()
 	{
-		setTestName("Test001");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "0");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "0");
 	}
 
 	@Test public void Utility_Test002()
 	{
-		setTestName("Test002");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "10");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "10");
 	}
 
 	@Test public void Utility_Test003()
 	{
-		setTestName("Test003");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "50");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "50");
 	}
 
 	@Test public void Utility_Test004()
 	{
-		setTestName("Test004");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "100");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "100");
 	}
 
 	@Test public void Utility_Test005()
 	{
-		setTestName("Test005");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "250");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "250");
 	}
 
 	@Test public void Utility_Test006()
 	{
-		setTestName("Test006");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "1000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "1000");
 	}
 
 	@Test public void Utility_Test007()
 	{
-		setTestName("Test007");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "10000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "10000");
 	}
 
 	@Test public void Utility_Test008()
 	{
-		setTestName("Test008");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "100000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "100000");
 	}
 
 	@Test public void Utility_Test009()
 	{
-		setTestName("Test009");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "9999999");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "9999999");
 	}
 
 	@Test public void Utility_Test010()
 	{
-		setTestName("Test010");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "max");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "max");
 	}
 
 	@Test public void Utility_Test011()
 	{
-		setTestName("Test011");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-1");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-1");
 	}
 
 	@Test public void Utility_Test012()
 	{
-		setTestName("Test012");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-10");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-10");
 	}
 
 	@Test public void Utility_Test013()
 	{
-		setTestName("Test013");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-50");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-50");
 	}
 
 	@Test public void Utility_Test014()
 	{
-		setTestName("Test014");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-100");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-100");
 	}
 
 	@Test public void Utility_Test015()
 	{
-		setTestName("Test015");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-250");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-250");
 	}
 
 	@Test public void Utility_Test016()
 	{
-		setTestName("Test016");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-1000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-1000");
 	}
 
 	@Test public void Utility_Test017()
 	{
-		setTestName("Test017");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-10000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-10000");
 	}
 
 	@Test public void Utility_Test018()
 	{
-		setTestName("Test018");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-100000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-100000");
 	}
 
 	@Test public void Utility_Test019()
 	{
-		setTestName("Test019");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "-9999999");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "-9999999");
 	}
 
 	@Test public void Utility_Test020()
 	{
-		setTestName("Test020");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("int", "min");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "int", "min");
 	}
 
+
 	@Test public void Utility_Test021()
 	{
-		setTestName("Test021");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "0");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "0");
 	}
 
 	@Test public void Utility_Test022()
 	{
-		setTestName("Test022");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "10");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "10");
 	}
 
 	@Test public void Utility_Test023()
 	{
-		setTestName("Test023");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "50");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "inlongt", "50");
 	}
 
 	@Test public void Utility_Test024()
 	{
-		setTestName("Test024");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "100");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "100");
 	}
 
 	@Test public void Utility_Test025()
 	{
-		setTestName("Test025");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "250");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "250");
 	}
 
 	@Test public void Utility_Test026()
 	{
-		setTestName("Test026");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "1000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "1000");
 	}
 
 	@Test public void Utility_Test027()
 	{
-		setTestName("Test027");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "10000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "10000");
 	}
 
 	@Test public void Utility_Test028()
 	{
-		setTestName("Test028");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "100000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "100000");
 	}
 
 	@Test public void Utility_Test029()
 	{
-		setTestName("Test029");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "9999999");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "9999999");
 	}
 
 	@Test public void Utility_Test030()
 	{
-		setTestName("Test030");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "max");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "max");
 	}
 
 	@Test public void Utility_Test031()
 	{
-		setTestName("Test031");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-1");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-1");
 	}
 
 	@Test public void Utility_Test032()
 	{
-		setTestName("Test032");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-10");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-10");
 	}
 
 	@Test public void Utility_Test033()
 	{
-		setTestName("Test033");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-50");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-50");
 	}
 
 	@Test public void Utility_Test034()
 	{
-		setTestName("Test034");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-100");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-100");
 	}
 
 	@Test public void Utility_Test035()
 	{
-		setTestName("Test035");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-250");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-250");
 	}
 
 	@Test public void Utility_Test036()
 	{
-		setTestName("Test036");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-1000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-1000");
 	}
 
 	@Test public void Utility_Test037()
 	{
-		setTestName("Test037");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-10000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-10000");
 	}
 
 	@Test public void Utility_Test038()
 	{
-		setTestName("Test038");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-100000");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-100000");
 	}
 
 	@Test public void Utility_Test039()
 	{
-		setTestName("Test039");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "-9999999");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "-9999999");
 	}
 
 	@Test public void Utility_Test040()
 	{
-		setTestName("Test040");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
-		client0.start("long", "min");
-		client0.waitFor();
+        startAndWaitForClient(org.jboss.jbossts.qa.ArjunaCore.Common.UtilityTest.class, "long", "min");
 	}
 
 }
\ No newline at end of file



More information about the jboss-svn-commits mailing list