[jboss-svn-commits] JBL Code SVN: r34499 - in labs/jbosstm/trunk: ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 4 06:38:55 EDT 2010
Author: jhalliday
Date: 2010-08-04 06:38:54 -0400 (Wed, 04 Aug 2010)
New Revision: 34499
Added:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jtsremote.java
Modified:
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestUtility.java
labs/jbosstm/trunk/qa/TaskImpl.properties
labs/jbosstm/trunk/qa/run-tests.xml
labs/jbosstm/trunk/qa/tests/build-jts.xml
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java
Log:
Hook up jts remote tests to qa. JBTM-728
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -44,13 +44,9 @@
import org.omg.CORBA.IntHolder;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class ExplicitArjunaClient
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -65,16 +61,11 @@
ORBManager.setPOA(myOA);
CurrentImple current = OTSImpleManager.current();
- String refFile = "/tmp/explicitstack.ref";
- String serverName = "ExplicitStack";
+ String refFile = args[0];
+
int value = 1;
Control cont = null;
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- refFile = "C:\\temp\\explicitstack.ref";
- }
-
try
{
System.out.println("Starting initialising top-level transaction.");
@@ -85,8 +76,7 @@
}
catch (Exception e)
{
- e.printStackTrace(System.err);
- fail();
+ TestUtility.fail(e.toString());
}
ExplicitStack stackVar = null; // pointer the grid object that will be used.
@@ -97,8 +87,7 @@
}
catch (Exception e)
{
- System.err.println("Bind error: "+e);
- fail();
+ TestUtility.fail("Bind error: "+e);
}
try
@@ -116,8 +105,7 @@
}
catch (Exception e)
{
- e.printStackTrace(System.err);
- fail();
+ TestUtility.fail(e.toString());
}
try
@@ -176,7 +164,7 @@
System.out.println("Error - current transaction name: "
+current.get_transaction_name());
- assertEquals(value, val.value);
+ TestUtility.assertEquals(value, val.value);
}
else
@@ -196,16 +184,18 @@
}
catch (Exception e)
{
- fail("\nError - could not print.");
+ TestUtility.fail("\nError - could not print.");
}
}
catch (Exception e)
{
- fail("Caught unexpected exception: "+e);
+ TestUtility.fail("Caught unexpected exception: "+e);
}
myOA.destroy();
myORB.shutdown();
+
+ System.out.println("Passed");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -42,13 +42,9 @@
import org.omg.CORBA.IntHolder;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class ImplicitArjunaClient
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -62,14 +58,9 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
- String refFile = "/tmp/stack.ref";
- String serverName = "Stack";
+ String refFile = args[0];
CurrentImple current = OTSImpleManager.current();
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- refFile = "C:\\temp\\stack.ref"; }
-
stack stackVar = null; // pointer the grid object that will be used.
try
@@ -85,7 +76,7 @@
catch (Exception e)
{
e.printStackTrace(System.err);
- fail();
+ TestUtility.fail(e.toString());
}
System.out.println("pushing 1 onto stack");
@@ -99,7 +90,7 @@
catch (Exception e)
{
e.printStackTrace(System.err);
- fail();
+ TestUtility.fail(e.toString());
}
try
@@ -128,12 +119,12 @@
current.commit(false);
- assertEquals(1, val.value);
+ TestUtility.assertEquals(1, val.value);
}
else
{
- fail("Error getting stack value.");
+ TestUtility.fail("Error getting stack value.");
current.rollback();
}
@@ -141,11 +132,13 @@
catch (Exception e)
{
e.printStackTrace(System.err);
- fail();
+ TestUtility.fail(e.toString());
}
myOA.destroy();
myORB.shutdown();
+
+ System.out.println("Passed");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -42,13 +42,9 @@
import org.omg.CosTransactions.*;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class CurrentTest
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -65,16 +61,12 @@
CurrentImple current = OTSImpleManager.current();
Control myControl = null;
- String gridReference = "/tmp/grid.ref";
- String serverName = "Grid";
+
+ String gridReference = args[0];
+
grid gridVar = null; // pointer the grid object that will be used.
int h = -1, w = -1, v = -1;
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- gridReference = "C:\\temp\\grid.ref";
- }
-
System.out.println("Beginning transaction.");
try
@@ -83,12 +75,12 @@
myControl = current.get_control();
- assertNotNull(myControl);
+ TestUtility.assertTrue(myControl != null);
}
catch (Exception sysEx)
{
sysEx.printStackTrace(System.err);
- fail();
+ TestUtility.fail(sysEx.toString());
}
try
@@ -99,7 +91,7 @@
}
catch (Exception sysEx)
{
- fail("failed to bind to grid: "+sysEx);
+ TestUtility.fail("failed to bind to grid: "+sysEx);
sysEx.printStackTrace(System.err);
}
@@ -110,7 +102,7 @@
}
catch (Exception sysEx)
{
- fail("grid height/width failed: "+sysEx);
+ TestUtility.fail("grid height/width failed: "+sysEx);
sysEx.printStackTrace(System.err);
}
@@ -124,7 +116,7 @@
}
catch (Exception sysEx)
{
- fail("grid set/get failed: "+sysEx);
+ TestUtility.fail("grid set/get failed: "+sysEx);
sysEx.printStackTrace(System.err);
}
@@ -134,8 +126,7 @@
// sanity check: make sure we got the value 123 back:
if (v != 123)
{
- fail();
- System.err.println("something went seriously wrong");
+ TestUtility.fail("something went seriously wrong");
try
{
@@ -143,11 +134,9 @@
}
catch (Exception e)
{
- fail("rollback error: "+e);
+ TestUtility.fail("rollback error: "+e);
e.printStackTrace(System.err);
}
-
- fail();
}
else
{
@@ -159,14 +148,14 @@
}
catch (Exception e)
{
- fail("commit error: "+e);
+ TestUtility.fail("commit error: "+e);
e.printStackTrace(System.err);
}
myOA.destroy();
myORB.shutdown();
- System.out.println("Test completed successfully.");
+ System.out.println("Passed");
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -42,13 +42,9 @@
import org.omg.CosTransactions.*;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class ExplicitInterClient
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -65,15 +61,9 @@
CurrentImple current = OTSImpleManager.current();
Control theControl = null;
- String objectReference = "/tmp/object.ref";
- String serverName = "SetGet";
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- objectReference = "C:\\temp\\object.ref";
- }
+ String objectReference = args[0];
-
SetGet SetGetVar = null;
short h = 0;
@@ -85,7 +75,7 @@
}
catch (Exception e)
{
- fail("Caught exception during begin: "+e);
+ TestUtility.fail("Caught exception during begin: "+e);
e.printStackTrace(System.err);
}
@@ -97,7 +87,7 @@
}
catch (Exception ex)
{
- fail("Failed to bind to setget server: "+ex);
+ TestUtility.fail("Failed to bind to setget server: "+ex);
ex.printStackTrace(System.err);
}
@@ -114,7 +104,7 @@
}
catch (Exception ex1)
{
- fail("Unexpected system exception during set: "+ex1);
+ TestUtility.fail("Unexpected system exception during set: "+ex1);
ex1.printStackTrace(System.err);
}
@@ -132,7 +122,7 @@
}
catch (Exception sysEx)
{
- fail("Caught unexpected exception during commit: "+sysEx);
+ TestUtility.fail("Caught unexpected exception during commit: "+sysEx);
sysEx.printStackTrace(System.err);
}
@@ -148,7 +138,7 @@
}
catch (Exception ex2)
{
- fail("Unexpected system exception during get: "+ex2);
+ TestUtility.fail("Unexpected system exception during get: "+ex2);
ex2.printStackTrace(System.err);
}
@@ -160,11 +150,13 @@
}
catch (Exception ep)
{
- fail("Caught commit exception for top-level action: "+ep);
+ TestUtility.fail("Caught commit exception for top-level action: "+ep);
ep.printStackTrace(System.err);
}
myOA.destroy();
myORB.shutdown();
+
+ System.out.println("Passed");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -41,9 +41,6 @@
import org.omg.CORBA.IntHolder;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class DistributedHammer1
{
private final static int START_VALUE_1 = 10;
@@ -51,8 +48,7 @@
private final static int EXPECTED_RESULT = START_VALUE_1 + START_VALUE_2;
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -66,17 +62,9 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String server1 = args[0];
+ String server2 = args[1];
-
- String server1 = "/tmp/hammer1.ref";
- String server2 = "/tmp/hammer2.ref";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- server1 = "C:\\temp\\hammer1.ref";
- server2 = "C:\\temp\\hammer2.ref";
- }
-
try
{
Services serv = new Services(myORB);
@@ -84,16 +72,16 @@
DistributedHammerWorker1.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server1)));
DistributedHammerWorker1.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server2)));
- assertTrue( DistributedHammerWorker1.hammerObject_1.set(START_VALUE_1, null) );
+ TestUtility.assertTrue( DistributedHammerWorker1.hammerObject_1.set(START_VALUE_1, null) );
- assertTrue( DistributedHammerWorker1.hammerObject_2.set(START_VALUE_2, null) );
+ TestUtility.assertTrue( DistributedHammerWorker1.hammerObject_2.set(START_VALUE_2, null) );
DistributedHammerWorker1.get12('m', 0);
DistributedHammerWorker1.get21('m', 0);
}
catch (Exception e)
{
- fail("DistributedHammer1: "+e);
+ TestUtility.fail("DistributedHammer1: "+e);
e.printStackTrace(System.err);
}
@@ -106,12 +94,14 @@
IntHolder value1 = new IntHolder(0);
IntHolder value2 = new IntHolder(0);
- assertTrue( DistributedHammerWorker1.get1(value1) | DistributedHammerWorker1.get2(value2) );
+ TestUtility.assertTrue( DistributedHammerWorker1.get1(value1) | DistributedHammerWorker1.get2(value2) );
- assertEquals(EXPECTED_RESULT, (value1.value + value2.value) );
+ TestUtility.assertEquals(EXPECTED_RESULT, (value1.value + value2.value) );
myOA.destroy();
myORB.shutdown();
+
+ System.out.println("Passed");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -41,9 +41,6 @@
import org.omg.CORBA.IntHolder;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class DistributedHammer2
{
private final static int START_VALUE_1 = 10;
@@ -51,8 +48,7 @@
private final static int EXPECTED_RESULT = START_VALUE_1 + START_VALUE_2;
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -66,16 +62,9 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String server1 = args[0];
+ String server2 = args[1];
- String server1 = "/tmp/hammer1.ref";
- String server2 = "/tmp/hammer2.ref";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- server1 = "C:\\temp\\hammer1.ref";
- server2 = "C:\\temp\\hammer2.ref";
- }
-
try
{
Services serv = new Services(myORB);
@@ -83,16 +72,16 @@
DistributedHammerWorker2.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server1)));
DistributedHammerWorker2.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server2)));
- assertTrue( DistributedHammerWorker2.hammerObject_1.set(START_VALUE_1, null) );
+ TestUtility.assertTrue( DistributedHammerWorker2.hammerObject_1.set(START_VALUE_1, null) );
- assertTrue( DistributedHammerWorker2.hammerObject_2.set(START_VALUE_2, null) );
+ TestUtility.assertTrue( DistributedHammerWorker2.hammerObject_2.set(START_VALUE_2, null) );
DistributedHammerWorker2.get12('m', 0);
DistributedHammerWorker2.get21('m', 0);
}
catch (Exception e)
{
- fail("DistributedHammer2: "+e);
+ TestUtility.fail("DistributedHammer2: "+e);
e.printStackTrace(System.err);
}
@@ -109,7 +98,7 @@
}
catch (InterruptedException e)
{
- fail("DistributedHammer2: "+e);
+ TestUtility.fail("DistributedHammer2: "+e);
e.printStackTrace(System.err);
}
@@ -119,12 +108,14 @@
IntHolder value1 = new IntHolder(0);
IntHolder value2 = new IntHolder(0);
- assertTrue( DistributedHammerWorker2.get1(value1) | DistributedHammerWorker2.get2(value2) );
+ TestUtility.assertTrue( DistributedHammerWorker2.get1(value1) | DistributedHammerWorker2.get2(value2) );
- assertEquals(EXPECTED_RESULT, (value1.value + value2.value) );
+ TestUtility.assertEquals(EXPECTED_RESULT, (value1.value + value2.value) );
myOA.destroy();
myORB.shutdown();
+
+ System.out.println("Passed");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -41,9 +41,6 @@
import org.omg.CORBA.IntHolder;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class DistributedHammer3
{
private final static int START_VALUE_1 = 10;
@@ -51,8 +48,7 @@
private final static int EXPECTED_RESULT = START_VALUE_1 + START_VALUE_2;
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -66,16 +62,9 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String server1 = args[0];
+ String server2 = args[1];
- String server1 = "/tmp/hammer1.ref";
- String server2 = "/tmp/hammer2.ref";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- server1 = "C:\\temp\\hammer1.ref";
- server2 = "C:\\temp\\hammer2.ref";
- }
-
try
{
Services serv = new Services(myORB);
@@ -83,16 +72,16 @@
DistributedHammerWorker3.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server1)));
DistributedHammerWorker3.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server2)));
- assertTrue( DistributedHammerWorker3.hammerObject_1.set(START_VALUE_1, null) );
+ TestUtility.assertTrue( DistributedHammerWorker3.hammerObject_1.set(START_VALUE_1, null) );
- assertTrue( DistributedHammerWorker3.hammerObject_2.set(START_VALUE_2, null) );
+ TestUtility.assertTrue( DistributedHammerWorker3.hammerObject_2.set(START_VALUE_2, null) );
DistributedHammerWorker3.get12(0, 0);
DistributedHammerWorker3.get21(0, 0);
}
catch (Exception e)
{
- fail("DistributedHammer3: "+e);
+ TestUtility.fail("DistributedHammer3: "+e);
e.printStackTrace(System.err);
}
@@ -118,11 +107,13 @@
IntHolder value1 = new IntHolder(0);
IntHolder value2 = new IntHolder(0);
- assertTrue( DistributedHammerWorker3.get1(value1) | DistributedHammerWorker3.get2(value2) );
+ TestUtility.assertTrue( DistributedHammerWorker3.get1(value1) | DistributedHammerWorker3.get2(value2) );
- assertEquals(EXPECTED_RESULT, (value1.value + value2.value));
+ TestUtility.assertEquals(EXPECTED_RESULT, (value1.value + value2.value));
myOA.destroy();
myORB.shutdown();
+
+ System.out.println("Passed");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -40,13 +40,9 @@
import com.hp.mwtests.ts.jts.TestModule.TranGridHelper;
import com.hp.mwtests.ts.jts.resources.TestUtility;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class ImplicitClient
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -60,15 +56,8 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String refFile = args[0];
- String refFile = "/tmp/trangrid.ref";
- String serverName = "ImplGrid";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- refFile = "C:\\temp\\trangrid.ref";
- }
-
CurrentImple current = OTSImpleManager.current();
TranGrid TranGridVar = null; // pointer the grid object that will be used.
@@ -88,9 +77,7 @@
}
catch (Exception e)
{
- fail("Invocation failed: "+e);
-
- e.printStackTrace();
+ TestUtility.fail("Invocation failed: "+e);
}
System.out.println("height is "+h);
@@ -108,7 +95,7 @@
}
catch (Exception sysEx)
{
- fail("Grid set/get failed: "+sysEx);
+ TestUtility.fail("Grid set/get failed: "+sysEx);
sysEx.printStackTrace(System.err);
}
@@ -123,7 +110,7 @@
// oops - we didn't:
current.rollback();
- fail("Result not as expected");
+ TestUtility.fail("Result not as expected");
}
else
{
@@ -132,14 +119,14 @@
}
catch (Exception e)
{
- fail("Caught exception: "+e);
+ TestUtility.fail("Caught exception: "+e);
e.printStackTrace(System.err);
}
myOA.destroy();
myORB.shutdown();
- System.out.println("Test completed.");
+ System.out.println("Passed");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -39,13 +39,9 @@
import com.arjuna.ats.internal.jts.ORBManager;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class ExplicitStackServer
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -59,15 +55,8 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String refFile = args[0];
- String refFile = "/tmp/explicitstack.ref";
- String serverName = "ExplicitStack";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- refFile = "C:\\temp\\explicitstack.ref";
- }
-
ExplicitStackPOATie theObject = new ExplicitStackPOATie (new ExplicitStackImple());
myOA.objectIsReady(theObject);
@@ -78,14 +67,13 @@
{
TestUtility.registerService(refFile, myORB.orb().object_to_string(myOA.corbaReference(theObject)));
- System.out.println("**ExplicitStackServer started**");
- //assertReady();
+ System.out.println("Ready");
myOA.run();
}
catch (Exception e)
{
- fail("ExplicitStackServer caught exception: "+e);
+ e.printStackTrace();
}
myOA.shutdownObject(theObject);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -38,13 +38,9 @@
import com.arjuna.ats.internal.jts.ORBManager;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class GridServer
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -58,15 +54,8 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String gridReference = args[0];
- String gridReference = "/tmp/grid.ref";
- String serverName = "Grid";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- gridReference = "C:\\temp\\grid.ref";
- }
-
grid_i myGrid = new grid_i(100, 100);
Services serv = new Services(myORB);
@@ -74,14 +63,13 @@
{
TestUtility.registerService(gridReference, myORB.orb().object_to_string(myGrid.getReference()));
- System.out.println("**Grid server started**");
- //assertReady();
+ System.out.println("Ready");
myOA.run();
}
catch (Exception e)
{
- fail("**GridServer caught exception: "+e);
+ TestUtility.fail("**GridServer caught exception: "+e);
}
myOA.shutdownObject(myGrid);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -40,13 +40,10 @@
import com.arjuna.ats.internal.jts.ORBManager;
-import org.junit.Test;
-import static org.junit.Assert.*;
public class HammerServer
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -60,29 +57,8 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String refFile = args[0];
- String refFile1 = "/tmp/hammer1.ref";
- String refFile2 = "/tmp/hammer2.ref";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- refFile1 = "C:\\temp\\hammer1.ref";
- refFile2 = "C:\\temp\\hammer2.ref";
- }
-
- String refFile = null;
- int number = 0;
-
- assertFalse( (number != 1) && (number != 2) );
-
- if ( refFile == null )
- {
- if (number == 1)
- refFile = refFile1;
- else
- refFile = refFile2;
- }
-
HammerPOATie theObject = new HammerPOATie(new HammerObject());
myOA.objectIsReady(theObject);
@@ -93,16 +69,16 @@
{
TestUtility.registerService( refFile, myORB.orb().object_to_string(HammerHelper.narrow(myOA.corbaReference(theObject))) );
- System.out.println("**HammerServer started**");
-
System.out.println("\nIOR file: "+refFile);
+ System.out.println("Ready");
+
//assertReady();
myOA.run();
}
catch (Exception e)
{
- fail("HammerServer caught exception: "+e);
+ //fail("HammerServer caught exception: "+e);
e.printStackTrace(System.err);
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -38,55 +38,43 @@
import com.arjuna.ats.internal.jts.ORBManager;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class ImplGridServer
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
- ORB myORB = null;
- RootOA myOA = null;
+ ORB myORB = null;
+ RootOA myOA = null;
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- myORB.initORB(new String[] {}, null);
- myOA.initOA();
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
+ String refFile = args[0];
- String refFile = "/tmp/trangrid.ref";
- String serverName = "ImplGrid";
+ trangrid_i gridI = new trangrid_i((short) 100, (short) 100);
+ Services serv = new Services(myORB);
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- refFile = "C:\\temp\\trangrid.ref";
- }
+ try
+ {
+ TestUtility.registerService(refFile, myORB.orb().object_to_string(gridI.getReference()));
- trangrid_i gridI = new trangrid_i((short) 100, (short) 100);
- Services serv = new Services(myORB);
+ System.out.println("Ready");
- try
- {
- TestUtility.registerService(refFile, myORB.orb().object_to_string(gridI.getReference()));
+ myOA.run();
+ }
+ catch (Exception e)
+ {
+ TestUtility.fail("ImplGrid server caught exception: "+e);
+ }
- System.out.println("**ImplGrid server started**");
+ myOA.shutdownObject(gridI);
- //assertReady();
- myOA.run();
- }
- catch (Exception e)
- {
- fail("ImplGrid server caught exception: "+e);
- }
-
- myOA.shutdownObject(gridI);
-
- System.out.println("**ImplGrid server exiting**");
+ System.out.println("**ImplGrid server exiting**");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -38,13 +38,9 @@
import com.arjuna.ats.internal.jts.ORBManager;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class SetGetServer
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -58,15 +54,8 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String refFile = args[0];
- String serverName = "SetGet";
- String refFile = "/tmp/object.ref";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- refFile = "C:\\temp\\object.ref";
- }
-
setget_i impl = new setget_i();
Services serv = new Services(myORB);
@@ -74,14 +63,12 @@
{
TestUtility.registerService(refFile, myORB.orb().object_to_string(impl.getReference()));
- System.out.println("**SetGet server started**");
-
- //assertReady();
+ System.out.println("Ready");
myOA.run();
}
catch (Exception e)
{
- fail("SetGetServer caught exception: "+e);
+ TestUtility.fail("SetGetServer caught exception: "+e);
}
myOA.shutdownObject(impl);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -40,13 +40,9 @@
import com.arjuna.ats.internal.jts.ORBManager;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class StackServer
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -60,15 +56,8 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
+ String refFile = args[0];
- String refFile = "/tmp/stack.ref";
- String serverName = "Stack";
-
- if (System.getProperty("os.name").startsWith("Windows"))
- {
- refFile = "C:\\temp\\stack.ref";
- }
-
stackPOATie theStack = new stackPOATie (new StackImple());
myOA.objectIsReady(theStack);
@@ -79,13 +68,13 @@
{
TestUtility.registerService(refFile, myORB.orb().object_to_string(stackHelper.narrow(myOA.corbaReference(theStack))));
- System.out.println("**StackServer started**");
- //assertReady();
+ System.out.println("Ready");
+
myOA.run();
}
catch (Exception e)
{
- fail("StackServer caught exception: "+e);
+ TestUtility.fail("StackServer caught exception: "+e);
}
myOA.shutdownObject(theStack);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -44,13 +44,9 @@
import org.omg.CORBA.INVALID_TRANSACTION;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
public class TimeoutClient
{
- @Test
- public void test() throws Exception
+ public static void main(String[] args) throws Exception
{
ORB myORB = null;
RootOA myOA = null;
@@ -68,11 +64,8 @@
CurrentImple current = OTSImpleManager.current();
Control theControl = null;
- String objectReference = "/tmp/object.ref";
- String serverName = "SetGet";
- if (System.getProperty("os.name").startsWith("Windows"))
- objectReference = "C:\\temp\\object.ref";
+ String objectReference = args[0];
SetGet SetGetVar = null;
@@ -91,7 +84,7 @@
}
catch (Exception e)
{
- fail("Bind to object failed: "+e);
+ TestUtility.fail("Bind to object failed: "+e);
e.printStackTrace(System.err);
}
@@ -107,7 +100,7 @@
}
catch (Exception e)
{
- fail("Call to set or get failed: "+e);
+ TestUtility.fail("Call to set or get failed: "+e);
e.printStackTrace(System.err);
}
@@ -126,7 +119,7 @@
try
{
current.commit(true);
- fail();
+ TestUtility.fail("commit worked");
}
catch (TRANSACTION_ROLLEDBACK e1)
{
@@ -142,7 +135,7 @@
try
{
current.commit(true);
- fail();
+ TestUtility.fail("commit worked");
}
catch (TRANSACTION_ROLLEDBACK e2)
{
@@ -154,18 +147,18 @@
}
catch (Exception e)
{
- fail("Caught other exception: "+e);
+ TestUtility.fail("Caught other exception: "+e);
}
}
catch (Exception e)
{
e.printStackTrace(System.err);
- fail();
+ TestUtility.fail(e.toString());
}
- System.out.println("\nTest completed successfully.");
-
myOA.destroy();
myORB.shutdown();
+
+ System.out.println("Passed");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestUtility.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestUtility.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestUtility.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -44,4 +44,22 @@
fout.write(ior.getBytes());
fout.close();
}
+
+ public static void assertTrue(boolean value) {
+ if(!value) {
+ fail("assertionFailed");
+ }
+ }
+
+ public static void assertEquals(int a, int b) {
+ if(a != b) {
+ fail("assertionFailed");
+ }
+ }
+
+ public static void fail(String message) {
+ System.out.println("failing: "+message);
+ System.out.println("Failed");
+ }
+
}
Modified: labs/jbosstm/trunk/qa/TaskImpl.properties
===================================================================
--- labs/jbosstm/trunk/qa/TaskImpl.properties 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/qa/TaskImpl.properties 2010-08-04 10:38:54 UTC (rev 34499)
@@ -24,7 +24,7 @@
#
# The classpath consists (approx) of the JBossTS build (from its original home in 'install' - we no longer copy to
# qa/build/) plus its bundled runtime dependencies, including jacorb, plus the qa tests jar, plus a dir in which the build
-# script places any requied db driver. Note the use of wildcards for this - don't expect it to work on jdk5.
+# script places any required db driver. Note the use of wildcards for this - don't expect it to work on jdk5.
#
# The effective properties file for JBossTS is the one in ../install/etc but note that later in this
# file we use command line override of some properties.
@@ -38,6 +38,7 @@
${path.separator}ext${file.separator}fscontext.jar${path.separator}ext${file.separator}providerutil.jar\
${path.separator}ext${file.separator}jboss-profiler-jvmti.jar${path.separator}ext${file.separator}jboss-logging-spi.jar\
${path.separator}tests${file.separator}build${file.separator}jbossts-jts-qa.jar\
+ ${path.separator}..${file.separator}ArjunaJTS${file.separator}jts${file.separator}build${file.separator}lib${file.separator}jts_tests.jar\
${path.separator}dbdrivers${file.separator}selected_dbdriver${file.separator}*
#
# properties used by the tests or test framework:
Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/qa/run-tests.xml 2010-08-04 10:38:54 UTC (rev 34499)
@@ -42,6 +42,10 @@
<!-- handy utility space where you can copy one or more test groups if you want to run something ad-hoc -->
<target name="scratch">
+ <antcall target="junit-tests">
+ <param name="tests" value="jtsremote"/>
+ </antcall>
+
</target>
<!-- a faster subset of the tests for smoke testing. aim to keep to under one hour total. -->
@@ -103,7 +107,10 @@
<antcall target="junit-tests"><param name="tests" value="jtatests01"/></antcall>
<!-- otsserver : 20 tests, 4 minutes -->
<antcall target="junit-tests"><param name="tests" value="otsserver"/></antcall>
+ <!-- jtsremote : 9 tests, 3 minutes -->
+ <antcall target="junit-tests"><param name="tests" value="jtsremote"/></antcall>
+
<!-- rawresources01_1 : 6 tests, 1 minute -->
<antcall target="junit-tests"><param name="tests" value="rawresources01_1"/></antcall>
<!-- rawresources01_2 : 147 tests, 7 minutes -->
@@ -377,6 +384,9 @@
<include name="*.jar"/>
<include name="*.zip"/>
</fileset>
+ <fileset dir="../ArjunaJTS/jts/build/lib">
+ <include name="jts_tests.jar"/>
+ </fileset>
<pathelement location="../install/etc"/>
</classpath>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2010-08-04 10:38:54 UTC (rev 34499)
@@ -56,6 +56,7 @@
<pathelement path="${org.jboss.jbossts.qa.orb.classpath}"/>
<fileset dir="../../build/extlib" includes="junit.jar"/>
<pathelement location="../ext/jboss-profiler-jvmti.jar"/>
+ <pathelement location="../../ArjunaJTS/jts/build/lib/jts_tests.jar"/>
</path>
<target name="org.jboss.jbossts.qa.init">
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java 2010-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -194,6 +194,7 @@
String[] command = assembleCommand(clazz.getCanonicalName(), params);
+ logCommand(System.out, "performing command: ", command);
logCommand(out, "performing command: ", command);
// cannot restart a task
@@ -314,6 +315,7 @@
{
String[] command = assembleCommand(clazz.getCanonicalName(), params);
+ logCommand(System.out, "starting command: ", command);
logCommand(out, "starting command: ", command);
// cannot restart a task
@@ -617,7 +619,7 @@
/**
* called by the test thread under Task.start() to ensure that a type READY task's process has printed a
- * Ready output line before returning forom the start call.
+ * Ready output line before returning from the start call.
*/
public void blockingWaitForReady() {
synchronized (printedReady) {
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-08-04 10:12:45 UTC (rev 34498)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -48,13 +48,13 @@
// no need to do this here as it gets done in tearDown
// TaskImpl.cleanupTasks();
+ Task emptyObjectStore = createTask("emptyObjectStore", org.jboss.jbossts.qa.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ emptyObjectStore.perform();
+
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()
Added: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jtsremote.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jtsremote.java (rev 0)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jtsremote.java 2010-08-04 10:38:54 UTC (rev 34499)
@@ -0,0 +1,125 @@
+/*
+ * 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.testgroup;
+
+import org.jboss.jbossts.qa.junit.Task;
+import org.jboss.jbossts.qa.junit.TestGroupBase;
+import org.junit.Test;
+
+/**
+ * QA tests for JTS module.
+ */
+public class TestGroup_jtsremote extends TestGroupBase
+{
+ public TestGroup_jtsremote() {
+ isRecoveryManagerNeeded = true;
+ }
+
+ @Test public void JTSRemote_DistributedHammerTest1() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.HammerServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+ Task server2 = createTask("server2", com.hp.mwtests.ts.jts.remote.servers.HammerServer.class, Task.TaskType.EXPECT_READY, 480);
+ server2.start("$(2)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.hammer.DistributedHammer1.class, "$(1)", "$(2)");
+
+ server1.terminate();
+ server2.terminate();
+ }
+
+ @Test public void JTSRemote_DistributedHammerTest2() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.HammerServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+ Task server2 = createTask("server2", com.hp.mwtests.ts.jts.remote.servers.HammerServer.class, Task.TaskType.EXPECT_READY, 480);
+ server2.start("$(2)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.hammer.DistributedHammer2.class, "$(1)", "$(2)");
+
+ server1.terminate();
+ server2.terminate();
+ }
+
+ @Test public void JTSRemote_DistributedHammerTest3() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.HammerServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+ Task server2 = createTask("server2", com.hp.mwtests.ts.jts.remote.servers.HammerServer.class, Task.TaskType.EXPECT_READY, 480);
+ server2.start("$(2)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.hammer.DistributedHammer3.class, "$(1)", "$(2)");
+
+ server1.terminate();
+ server2.terminate();
+ }
+
+ @Test public void JTSRemote_ExplicitPropagationTest() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.ExplicitStackServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.arjuna.ExplicitArjunaClient.class, "$(1)");
+
+ server1.terminate();
+ }
+
+ @Test public void JTSRemote_ImplicitPropagationTest() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.StackServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.arjuna.ImplicitArjunaClient.class, "$(1)");
+
+ server1.terminate();
+ }
+
+ @Test public void JTSRemote_ImplicitGridTest() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.ImplGridServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.implicit.ImplicitClient.class, "$(1)");
+
+ server1.terminate();
+ }
+
+ @Test public void JTSRemote_CurrentTest() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.GridServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.current.CurrentTest.class, "$(1)");
+
+ server1.terminate();
+ }
+
+ @Test public void JTSRemote_ExplicitInterpositionTest() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.SetGetServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.explicitinterposition.ExplicitInterClient.class, "$(1)");
+
+ server1.terminate();
+ }
+
+ @Test public void JTSRemote_TimeoutTest() {
+ Task server1 = createTask("server1", com.hp.mwtests.ts.jts.remote.servers.SetGetServer.class, Task.TaskType.EXPECT_READY, 480);
+ server1.start("$(1)");
+
+ startAndWaitForClient(com.hp.mwtests.ts.jts.remote.timeout.TimeoutClient.class, "$(1)");
+
+ server1.terminate();
+ }
+}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list