[jboss-svn-commits] JBL Code SVN: r27692 - in labs/jbosstm/trunk: ArjunaCore/arjuna and 27 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 7 07:00:16 EDT 2009
Author: jhalliday
Date: 2009-07-07 07:00:15 -0400 (Tue, 07 Jul 2009)
New Revision: 27692
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
labs/jbosstm/trunk/ArjunaCore/tsmx/tests/com/arjuna/mwtests/ts/tsmx/performancembean/TestPerformanceMBean.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC3Test.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/utils/JNDISetup.java
labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAAbort.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAOrder.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest2.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/NullResource.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/SuspendResume.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common/RecoveryXAResource.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common/Synchronization.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/hammer/JTAHammer.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/lastresource/LastResourceAllowedTestCase.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/lastresource/LastResourceDisallowTestCase.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/nested/SimpleNestedTest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/CrashRecovery.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/DummyXARecoveryResource.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryManagerTest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryTest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/subordinate/SubordinateTestCase.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/RollbackTest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/SimpleTest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase/SimpleTest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/client/ImplicitClient.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/server/ImplicitServer.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/JTSTestCase.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTAAbort.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTAOrder.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATransactionCommitTest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/NullResource.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/Performance.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/SuspendResume.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/ThreadedCommit.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/common/Synchronization.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/hammer/JTAHammer.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/lastresource/LastResourceAllowedTestCase.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/lastresource/LastResourceDisallowTestCase.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/nested/SimpleNestedTest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/subordinate/SubordinateTestCase.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/RollbackTest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/SimpleTest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/twophase/SimpleTest.java
labs/jbosstm/trunk/sharedbuild.xml
Log:
Updates to unit tests. JBTM-576
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2009-07-07 11:00:15 UTC (rev 27692)
@@ -24,8 +24,6 @@
<property name="global.ext.test.libs" value="junit-4.6.jar"/>
- <!--<property name="global.ext.test.libs" value="junit.jar,TestingFramework.jar"/>-->
-
<import file="../../sharedbuild.xml"/>
<target name="init" depends="sharedbuild.init">
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2009-07-07 11:00:15 UTC (rev 27692)
@@ -22,6 +22,8 @@
<property name="modulename" value="tsmx"/>
+ <property name="global.ext.test.libs" value="junit-4.6.jar"/>
+
<import file="../../sharedbuild.xml"/>
<target name="init" depends="sharedbuild.init">
@@ -117,4 +119,16 @@
</target>
+ <target name="run.tests">
+
+ <run.tests.macro>
+ <tests>
+ <fileset dir="tests" includes="**/*.java">
+ <exclude name="**/TestPerformanceMBean.java"/>
+ </fileset>
+ </tests>
+ </run.tests.macro>
+
+ </target>
+
</project>
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/tests/com/arjuna/mwtests/ts/tsmx/performancembean/TestPerformanceMBean.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/tests/com/arjuna/mwtests/ts/tsmx/performancembean/TestPerformanceMBean.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/tests/com/arjuna/mwtests/ts/tsmx/performancembean/TestPerformanceMBean.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -34,14 +34,16 @@
import javax.management.ObjectName;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class TestPerformanceMBean
{
- public static void main(String[] args)
+ @Test
+ public void test() throws Exception
{
TransactionServiceMX tsmx = TransactionServiceMX.getTransactionServiceMX();
- try
- {
String objectName = TransactionServiceMX.getTransactionServiceMX().getObjectName("performancestatistics");
System.out.println("Retrieving attribute 'NumberOfTransactions' from '"+objectName+"'");
@@ -63,14 +65,8 @@
System.out.println("Retrieving attribute 'NumberOfAbortedTransactions' from '"+objectName+"'");
Object numberOfAbortedTransactions = TransactionServiceMX.getTransactionServiceMX().getAgentInterface().getAgent().getAttribute(new ObjectName(objectName), "NumberOfAbortedTransactions");
System.out.println("Attribute 'NumberOfAbortedTransactions' = "+numberOfAbortedTransactions);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- boolean success = tsmx.unregisterMBeans();
+ assertTrue( tsmx.unregisterMBeans() );
- System.out.println("Unregistering mbeans: "+ (success ? "successful" : "failed") );
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml 2009-07-07 11:00:15 UTC (rev 27692)
@@ -26,7 +26,7 @@
<property name="excluded.test.classes" value="**/Oracle*.java"/>
<property name="global.ext.libs" value="jta-1_1-classes.zip"/>
- <property name="global.ext.test.libs" value="TestingFramework.jar"/>
+ <property name="global.ext.test.libs" value="junit-4.6.jar"/>
<import file="../../sharedbuild.xml"/>
@@ -54,4 +54,20 @@
</generateresourcebundle.macro>
</target>
+ <target name="run.tests">
+ <run.tests.macro>
+ <tests>
+ <fileset dir="tests/classes" includes="**/*.java">
+ <exclude name="**/utils/plugins/**"/>
+ <exclude name="**/DBPlugin.java"/>
+
+
+ <exclude name="**/JDBC2Test.java"/>
+ <exclude name="**/JDBC3Test.java"/>
+ <exclude name="**/*JNDISetup.java"/>
+ </fileset>
+ </tests>
+ </run.tests.macro>
+ </target>
+
</project>
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -36,9 +36,11 @@
import java.util.Properties;
import java.sql.*;
-import org.jboss.dtf.testframework.unittest.*;
+import org.junit.Test;
+import org.junit.Before;
+import static org.junit.Assert.*;
-public class JDBC2Test extends Test
+public class JDBC2Test
{
public static final int CLOUDSCAPE = 0;
public static final int ORACLE = 1;
@@ -53,7 +55,8 @@
protected Properties dbProperties = null;
protected String url = null;
- protected void setup(String[] args)
+ @Before
+ public void setup() throws Exception
{
int dbType = JNDI;
String user = null;//"test";
@@ -61,7 +64,7 @@
String dynamicClass = null; //"com.arjuna.ats.internal.jdbc.drivers.jndi";
String host = null;
String port = null;
-
+/*
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-oracle") == 0)
@@ -76,13 +79,7 @@
dbType = JNDI;
dynamicClass = "com.arjuna.ats.internal.jdbc.drivers.jndi";
}
- if (args[i].compareTo("-sequelink") == 0)
- {
- dbType = SEQUELINK;
- user = "tester";
- password = "tester";
- dynamicClass = "com.arjuna.ats.internal.jdbc.drivers.sequelink_5_1";
- }
+
if (args[i].compareTo("-host") == 0)
host = args[i + 1];
if (args[i].compareTo("-port") == 0)
@@ -107,22 +104,11 @@
System.exit(0);
}
}
-
+*/
if (url == null)
{
switch (dbType)
{
- case CLOUDSCAPE:
- url = "jdbc:arjuna:cloudscape:mysql;create=true";
- break;
- case SEQUELINK:
- {
- url = "jdbc:arjuna:sequelink://" + host;
-
- if (port != null)
- url = url + ":" + port;
- }
- break;
case ORACLE:
{
if (port == null)
@@ -132,8 +118,7 @@
}
break;
case JNDI:
- System.err.println("JNDI URL not specified");
- assertFailure();
+ fail("JNDI URL not specified");
break;
default:
// noop
@@ -145,9 +130,6 @@
switch (dbType)
{
- case CLOUDSCAPE:
- p.put("jdbc.drivers", "COM.cloudscape.core.JDBCDriver");
- break;
case ORACLE:
p.put("jdbc.drivers", "oracle.jdbc.driver.OracleDriver");
break;
@@ -158,15 +140,7 @@
System.setProperties(p);
- try
- {
DriverManager.registerDriver(new TransactionalDriver());
- }
- catch (Exception e)
- {
- e.printStackTrace();
- assertFailure();
- }
dbProperties = new Properties();
@@ -181,20 +155,13 @@
if ( dynamicClass != null )
dbProperties.put(TransactionalDriver.dynamicClass, dynamicClass);
- try
- {
conn = DriverManager.getConnection(url, dbProperties);
conn2 = DriverManager.getConnection(url, dbProperties);
- } catch(SQLException e) {
- e.printStackTrace();
- assertFailure();
- }
}
- public void run(String[] args)
+ @Test
+ public void test() throws Exception
{
- setup(args);
-
Statement stmt = null; // non-tx statement
Statement stmtx = null; // will be a tx-statement
@@ -202,8 +169,6 @@
return;
}
- try
- {
stmt = conn.createStatement(); // non-tx statement
try
@@ -218,12 +183,6 @@
stmt.executeUpdate("CREATE TABLE test_table (a INTEGER,b INTEGER)");
stmt.executeUpdate("CREATE TABLE test_table2 (a INTEGER,b INTEGER)");
- }
- catch (SQLException e)
- {
- e.printStackTrace();
- assertFailure();
- }
javax.transaction.UserTransaction tx = com.arjuna.ats.jta.UserTransaction.userTransaction();
@@ -253,18 +212,8 @@
System.out.println("\nInspecting table 1.");
- try
- {
res1 = stmtx.executeQuery("SELECT * FROM test_table");
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
- try
- {
int rowCount = 0;
while (res1.next())
@@ -279,32 +228,16 @@
{
throw new Exception("Number of rows = "+rowCount+", test was expecting 1");
}
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
System.out.println("\nAdding entries to table 2.");
stmtx.executeUpdate("INSERT INTO test_table2 (a, b) VALUES (3,4)");
- try
- {
res1 = stmtx.executeQuery("SELECT * FROM test_table2");
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
System.out.println("\nInspecting table 2.");
- try
- {
- int rowCount = 0;
+ rowCount = 0;
while (res1.next())
{
@@ -317,12 +250,6 @@
{
throw new Exception("Row count = "+rowCount+", test was expecting 1");
}
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
}
catch (SQLException e)
{
@@ -341,7 +268,7 @@
{
}
- assertFailure();
+ fail();
}
catch (Exception e)
{
@@ -360,7 +287,7 @@
{
}
- assertFailure();
+ fail();
}
System.out.print("\nNow attempting to ");
@@ -393,18 +320,8 @@
ResultSet res2 = null;
- try
- {
res2 = stmtx.executeQuery("SELECT * FROM test_table");
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
- try
- {
int rowCount = 0;
while (res2.next())
{
@@ -428,14 +345,6 @@
}
}
- assertSuccess();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
-
tx.commit();
tx.begin();
@@ -449,19 +358,9 @@
stmtx = conn.createStatement();
- try
- {
res2 = stmtx.executeQuery("SELECT * FROM test_table2");
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
- try
- {
- int rowCount = 0;
+ rowCount = 0;
while (res2.next())
{
@@ -484,12 +383,6 @@
throw new Exception("Rolledback row count = "+rowCount+", test expected 0");
}
}
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
tx.commit();
}
@@ -503,7 +396,7 @@
{
}
- assertFailure();
+ fail();
}
try
@@ -513,14 +406,5 @@
catch (Exception e)
{
}
-
- System.out.println("Test completed successfully.");
}
-
- public static void main(String[] args)
- {
- JDBC2Test test = new JDBC2Test();
- test.initialise(null,null,args,new LocalHarness());
- test.runTest();
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC3Test.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC3Test.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC3Test.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -23,8 +23,8 @@
package com.hp.mwtests.ts.jdbc.basic;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
-import org.jboss.dtf.testframework.unittest.Test;
+import org.junit.Test;
+import static org.junit.Assert.*;
import java.sql.*;
@@ -36,55 +36,40 @@
*/
public class JDBC3Test extends JDBC2Test
{
- private void testHoldability()
+ @Test
+ public void testHoldability() throws Exception
{
System.out.println("testHoldability...");
- try
- {
conn.setHoldability(ResultSet.HOLD_CURSORS_OVER_COMMIT);
if(!(conn.getHoldability() == ResultSet.HOLD_CURSORS_OVER_COMMIT))
{
- System.err.println("holdability incorrect, set "+ResultSet.HOLD_CURSORS_OVER_COMMIT+" but read back "+conn.getHoldability());
- assertFailure();
+ fail("holdability incorrect, set "+ResultSet.HOLD_CURSORS_OVER_COMMIT+" but read back "+conn.getHoldability());
}
conn.setHoldability(ResultSet.CLOSE_CURSORS_AT_COMMIT);
if(!(conn.getHoldability() == ResultSet.CLOSE_CURSORS_AT_COMMIT))
{
- System.err.println("holdability incorrect, set "+ResultSet.CLOSE_CURSORS_AT_COMMIT+" but read back "+conn.getHoldability());
- assertFailure();
+ fail("holdability incorrect, set "+ResultSet.CLOSE_CURSORS_AT_COMMIT+" but read back "+conn.getHoldability());
}
- }
- catch (SQLException e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
}
- private void testSavepointNoTx()
+ @Test
+ public void testSavepointNoTx() throws Exception
{
System.out.println("testSavepointNoTx...");
// savepoint methods should work if we don't have an XA tx
- try
- {
conn.setAutoCommit(false);
Savepoint savepoint = conn.setSavepoint();
Savepoint mySavepoint = conn.setSavepoint("mySavepoint");
conn.rollback(mySavepoint);
conn.releaseSavepoint(savepoint);
- }
- catch (SQLException e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
}
- private void testSavepointTx()
+ @Test
+ public void testSavepointTx() throws Exception
{
System.out.println("testSavepointTx...");
@@ -92,22 +77,13 @@
javax.transaction.UserTransaction tx = com.arjuna.ats.jta.UserTransaction.userTransaction();
- try
- {
tx.begin();
- }
- catch(Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
boolean gotExpectedException = false;
Savepoint savepoint = null;
Savepoint mySavepoint = null;
- try
- {
+ try {
savepoint = conn.setSavepoint();
}
catch(SQLException e) {
@@ -115,8 +91,7 @@
}
if(!gotExpectedException) {
- System.err.println("Failed to get expected exception from setSavepoint inside tx");
- assertFailure();
+ fail("Failed to get expected exception from setSavepoint inside tx");
}
gotExpectedException = false;
@@ -130,8 +105,7 @@
}
if(!gotExpectedException) {
- System.err.println("Failed to get expected exception from setSavepoint(String) inside tx");
- assertFailure();
+ fail("Failed to get expected exception from setSavepoint(String) inside tx");
}
gotExpectedException = false;
@@ -145,8 +119,7 @@
}
if(!gotExpectedException) {
- System.err.println("Failed to get expected exception from rollback(String) inside tx");
- assertFailure();
+ fail("Failed to get expected exception from rollback(String) inside tx");
}
try
@@ -159,8 +132,7 @@
}
if(!gotExpectedException) {
- System.err.println("Failed to get expected exception from releaseSavepoint(String) inside tx");
- assertFailure();
+ fail("Failed to get expected exception from releaseSavepoint(String) inside tx");
}
try
@@ -170,11 +142,12 @@
catch(Exception e)
{
e.printStackTrace(System.err);
- assertFailure();
+ fail();
}
}
- private void testStatements()
+ @Test
+ public void testStatements()
{
System.out.println("testStatements...");
@@ -189,7 +162,7 @@
catch(Exception e)
{
e.printStackTrace(System.err);
- assertFailure();
+ fail();
}
try
@@ -219,7 +192,7 @@
catch (SQLException e)
{
e.printStackTrace(System.err);
- assertFailure();
+ fail();
}
try
@@ -229,29 +202,7 @@
catch(Exception e)
{
e.printStackTrace(System.err);
- assertFailure();
+ fail();
}
}
-
-
- public void run(String[] args) {
- setup(args);
-
- testHoldability();
- testSavepointNoTx();
- testSavepointTx();
- testStatements();
-
- if(getTestResult() == Test.UNCERTAIN) {
- assertSuccess();
- }
- }
-
- // java com.hp.mwtests.ts.jdbc.basic.JDBC3Test -oracle -url jdbc:arjuna:oracle:thin:@localhost:1521:orcl -user test -password testpass
- public static void main(String[] args)
- {
- JDBC3Test test = new JDBC3Test();
- test.initialise(null,null,args,new LocalHarness());
- test.runTest();
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/utils/JNDISetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/utils/JNDISetup.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/utils/JNDISetup.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -31,67 +31,28 @@
* $Id: JNDISetup.java 2342 2006-03-30 13:06:17Z $
*/
-import org.jboss.dtf.testframework.unittest.*;
-
import javax.sql.*;
import javax.naming.*;
-public class JNDISetup extends Test
+import org.junit.Test;
+import org.junit.Before;
+import static org.junit.Assert.*;
+
+public class JNDISetup
{
- public void run(String[] args)
+ @Test
+ public void test() throws Exception
{
- DataSource ds = null;
- DBPlugin plugin = null;
+ DBPlugin plugin = (DBPlugin)Thread.currentThread().getContextClassLoader().loadClass("TODO").newInstance();
+
String jndiName = "jdbc/DB";
+ DataSource ds = plugin.getDataSource(new String[] {"TODO"});
- for (int count=0;count<args.length;count++)
- {
- if ( args[count].equalsIgnoreCase("-db") )
- {
- try
- {
- plugin = (DBPlugin)Thread.currentThread().getContextClassLoader().loadClass(args[count + 1]).newInstance();
- ds = plugin.getDataSource(args);
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- }
- }
- else
- if ( args[count].equalsIgnoreCase("-jndiname") )
- {
- jndiName = args[count + 1];
- }
- }
+ assertNotNull(ds);
- if ( ds == null )
- {
- System.err.println("Datasource not defined");
- assertFailure();
- }
- else
- {
- try
- {
- System.out.println("Binding datasource to '"+jndiName+"'");
- InitialContext ctx = new InitialContext();
- ctx.rebind(jndiName, ds);
+ System.out.println("Binding datasource to '"+jndiName+"'");
+ InitialContext ctx = new InitialContext();
+ ctx.rebind(jndiName, ds);
- assertSuccess();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
- }
}
-
- public static void main(String[] args)
- {
- JNDISetup setup = new JNDISetup();
- setup.initialise(null, null, args, new LocalHarness());
- setup.runTest();
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/build.xml 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/build.xml 2009-07-07 11:00:15 UTC (rev 27692)
@@ -23,7 +23,7 @@
<property name="modulename" value="jta"/>
<property name="global.ext.libs" value="jta-1_1-classes.zip,connector-api.jar"/>
- <property name="global.ext.test.libs" value="junit.jar,TestingFramework.jar"/>
+ <property name="global.ext.test.libs" value="junit-4.6.jar"/>
<import file="../../sharedbuild.xml"/>
@@ -50,17 +50,16 @@
<target name="run.tests">
<run.tests.macro>
- <tests><fileset dir="tests/classes" includes="**/SubordinateTestCase.java"/></tests>
+ <tests>
+ <fileset dir="tests/classes" includes="**/*.java">
+ <exclude name="**/common/**"/>
+ <exclude name="**/LastOnePhaseResource.java"/>
+ <exclude name="**/DummyXARecoveryResource.java"/>
+ <exclude name="**/TestSynchronization.java"/>
+ <exclude name="**/TestXAResource.java"/>
+ </fileset>
+ </tests>
</run.tests.macro>
- <run.tests.macro>
- <tests><fileset dir="tests/classes" includes="**/LastResourceDisallowTestCase.java"/></tests>
- </run.tests.macro>
- <!-- this fails because the two last resource objects enlsited in the transaction both pass the equals
- test which means the second one fails to be inserted.
- <run.tests.macro>
- <tests><fileset dir="tests/classes" includes="**/LastResourceAllowedTestCase.java"/></tests>
- </run.tests.macro>
- -->
</target>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAAbort.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAAbort.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAAbort.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -31,95 +31,40 @@
package com.hp.mwtests.ts.jta.basic;
-import com.hp.mwtests.ts.jta.common.*;
-
-import com.arjuna.ats.jta.*;
import com.arjuna.ats.jta.utils.*;
-import com.arjuna.ats.arjuna.common.*;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
-
import javax.transaction.*;
-import javax.transaction.xa.*;
-import java.lang.IllegalAccessException;
+import org.junit.Test;
+import static org.junit.Assert.*;
-public class JTAAbort extends Test
+public class JTAAbort
{
- public void run(String[] args)
- {
- boolean passed = false;
+ @Test
+ public void test() throws Exception
+ {
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- try
- {
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ tm.begin();
- if (tm != null)
- {
- System.out.println("Starting top-level transaction.");
+ javax.transaction.Transaction theTransaction = tm.getTransaction();
- tm.begin();
+ assertEquals(Status.STATUS_ACTIVE, theTransaction.getStatus());
- javax.transaction.Transaction theTransaction = tm.getTransaction();
+ theTransaction.rollback();
- if (theTransaction != null)
- {
- System.out.println("\nRolling back transaction.");
+ assertEquals(Status.STATUS_ROLLEDBACK, theTransaction.getStatus());
- theTransaction.rollback();
+ assertEquals(Status.STATUS_ROLLEDBACK, tm.getStatus());
- System.out.println("\nTransaction now: " + theTransaction);
+ theTransaction = tm.suspend();
- System.out.println("\nThread associated: " + JTAHelper.stringForm(tm.getStatus()));
+ assertEquals(Status.STATUS_NO_TRANSACTION, tm.getStatus());
- theTransaction = tm.suspend();
+ tm.resume(theTransaction);
- System.out.println("\nSuspended: " + theTransaction);
+ assertEquals(Status.STATUS_ROLLEDBACK, tm.getStatus());
- try
- {
- tm.resume(theTransaction);
-
- System.out.println("\nResumed: " + tm.getTransaction());
- passed = true;
- }
- catch (InvalidTransactionException ite)
- {
- System.out.println("\nCould not resume a dead transaction.");
- }
- }
- else
- {
- System.err.println("Error - could not get transaction!");
- tm.rollback();
- }
- }
- else
- System.err.println("Error - could not get transaction manager!");
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- if (passed)
- {
- System.out.println("\nTest completed successfully.");
- assertSuccess();
- }
- else
- {
- System.out.println("\nTest did not complete successfully.");
- assertFailure();
- }
- }
-
- public static void main(String[] args)
- {
- JTAAbort test = new JTAAbort();
- test.initialise(null, null, args, new LocalHarness());
- test.runTest();
- }
-
+ tm.suspend();
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAOrder.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAOrder.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAOrder.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -34,37 +34,36 @@
import com.hp.mwtests.ts.jta.common.*;
import javax.transaction.xa.*;
+import javax.transaction.Status;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class JTAOrder
{
+ @Test
+ public void test() throws Exception
+ {
+ XAResource theResource = new TestResource();
+ FirstXAResource first = new FirstXAResource();
+ LastXAResource last = new LastXAResource();
- public static void main (String[] args)
- {
- try
- {
- XAResource theResource = new TestResource();
- FirstXAResource first = new FirstXAResource();
- LastXAResource last = new LastXAResource();
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ System.out.println("Starting top-level transaction.");
- System.out.println("Starting top-level transaction.");
+ tm.begin();
- tm.begin();
+ javax.transaction.Transaction theTransaction = tm.getTransaction();
- javax.transaction.Transaction theTransaction = tm.getTransaction();
+ theTransaction.enlistResource(theResource);
+ theTransaction.enlistResource(last);
+ theTransaction.enlistResource(first);
- theTransaction.enlistResource(theResource);
- theTransaction.enlistResource(last);
- theTransaction.enlistResource(first);
+ System.err.println("Committing transaction.");
- System.err.println("Committing transaction.");
+ tm.commit();
- tm.commit();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
+ assertEquals(Status.STATUS_COMMITTED, theTransaction.getStatus());
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -33,162 +33,71 @@
import com.hp.mwtests.ts.jta.common.*;
-import com.arjuna.ats.jta.*;
-
-import com.arjuna.ats.arjuna.common.*;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
-
-import javax.transaction.*;
import javax.transaction.xa.*;
-import java.lang.IllegalAccessException;
+import org.junit.Test;
+import static org.junit.Assert.*;
-public class JTATest extends Test
+public class JTATest
{
- public void run(String[] args)
- {
- String xaResource = "com.hp.mwtests.ts.jta.common.DummyCreator";
- String connectionString = null;
- boolean tmCommit = true;
+ @Test
+ public void test() throws Exception
+ {
+ String xaResource = "com.hp.mwtests.ts.jta.common.DummyCreator";
+ String connectionString = null;
+ boolean tmCommit = true;
- for (int i = 0; i < args.length; i++)
- {
- if (args[i].compareTo("-connect") == 0)
- connectionString = args[i + 1];
- if (args[i].compareTo("-creator") == 0)
- xaResource = args[i + 1];
- if (args[i].equals("-txcommit"))
- tmCommit = false;
- if (args[i].compareTo("-help") == 0)
- {
- System.out.println("Usage: JTATest -creator <name> [-connect <string>] [-txcommit] [-help]");
- assertFailure();
- }
- }
+ XACreator creator = (XACreator) Thread.currentThread().getContextClassLoader().loadClass(xaResource).newInstance();
+ XAResource theResource = creator.create(connectionString, true);
- if (xaResource == null)
- {
- System.err.println("Error - no resource creator specified.");
- assertFailure();
- }
+ assertNotNull(xaResource);
- /*
- * We should have a reference to a factory object (see JTA
- * specification). However, for simplicity we will ignore this.
- */
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- try
- {
- XACreator creator = (XACreator) Thread.currentThread().getContextClassLoader().loadClass(xaResource).newInstance();
- XAResource theResource = creator.create(connectionString, true);
+ tm.begin();
- if (theResource == null)
- {
- System.err.println("Error - creator " + xaResource + " returned null resource.");
- assertFailure();
- }
+ javax.transaction.Transaction theTransaction = tm.getTransaction();
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ assertTrue( theTransaction.enlistResource(theResource) );
- if (tm != null)
- {
- System.out.println("Starting top-level transaction.");
+ /*
+ * XA does not support subtransactions.
+ * By default we ignore any attempts to create such
+ * transactions. Appropriate settings can be made which
+ * will cause currently running transactions to also
+ * rollback, if required.
+ */
- tm.begin();
+ System.out.println("\nTrying to start another transaction - should fail!");
- javax.transaction.Transaction theTransaction = tm.getTransaction();
+ try
+ {
+ tm.begin();
- if (theTransaction != null)
- {
- System.out.println("\nTrying to register resource with transaction.");
+ fail("Error - transaction started!");
+ }
+ catch (Exception e)
+ {
+ System.out.println("Transaction did not begin: " + e);
+ }
- if (!theTransaction.enlistResource(theResource))
- {
- System.err.println("Error - could not enlist resource in transaction!");
- tm.rollback();
+ /*
+ * Do some work and decide whether to commit or rollback.
+ * (Assume commit for example.)
+ */
- assertFailure();
- }
- else
- System.out.println("\nResource enlisted successfully.");
- /*
- * XA does not support subtransactions.
- * By default we ignore any attempts to create such
- * transactions. Appropriate settings can be made which
- * will cause currently running transactions to also
- * rollback, if required.
- */
+ com.hp.mwtests.ts.jta.common.Synchronization s = new com.hp.mwtests.ts.jta.common.Synchronization();
- System.out.println("\nTrying to start another transaction - should fail!");
+ tm.getTransaction().registerSynchronization(s);
- try
- {
- tm.begin();
+ System.out.println("\nCommitting transaction.");
- System.err.println("Error - transaction started!");
- assertFailure();
- }
- catch (Exception e)
- {
- System.out.println("Transaction did not begin: " + e);
- }
+ if (tmCommit)
+ tm.commit();
+ else
+ tm.getTransaction().commit();
- /*
- * Do some work and decide whether to commit or rollback.
- * (Assume commit for example.)
- */
+ assertEquals(com.hp.mwtests.ts.jta.common.Synchronization.AFTER_COMPLETION_STATUS, s.getCurrentStatus());
- com.hp.mwtests.ts.jta.common.Synchronization s = new com.hp.mwtests.ts.jta.common.Synchronization();
-
- tm.getTransaction().registerSynchronization(s);
-
- System.out.println("\nCommitting transaction.");
-
- if (tmCommit)
- System.out.println("Using transaction manager.\n");
- else
- System.out.println("Using transaction.\n");
-
- if (tmCommit)
- tm.commit();
- else
- tm.getTransaction().commit();
-
- if ( s.getCurrentStatus() != com.hp.mwtests.ts.jta.common.Synchronization.AFTER_COMPLETION_STATUS )
- {
- System.err.println("Unexpected synchronization status: " + s.getCurrentStatus());
- assertFailure();
- }
- }
- else
- {
- System.err.println("Error - could not get transaction!");
- tm.rollback();
- assertFailure();
- }
-
- System.out.println("\nTest completed successfully.");
- assertSuccess();
- }
- else
- {
- System.err.println("Error - could not get transaction manager!");
- assertFailure();
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- assertFailure();
- }
- }
-
- public static void main(String[] args)
- {
- JTATest test = new JTATest();
- test.initialise(null, null, args, new LocalHarness());
- test.runTest();
- }
-
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -20,8 +20,8 @@
*/
package com.hp.mwtests.ts.jta.basic;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
+import org.junit.Test;
+import static org.junit.Assert.*;
import javax.transaction.TransactionManager;
import javax.transaction.Transaction;
@@ -37,42 +37,22 @@
* $Id: JTATransactionCommitTest.java 2342 2006-03-30 13:06:17Z $
*/
-public class JTATransactionCommitTest extends Test
+public class JTATransactionCommitTest
{
- public void run(String[] args)
+ @Test
+ public void test() throws Exception
{
- try
- {
- TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- System.out.println("Beginning new transaction");
- tm.begin();
+ tm.begin();
- Transaction tx = tm.suspend();
+ Transaction tx = tm.suspend();
- System.out.println("Beginning second transaction");
- tm.begin();
+ tm.begin();
- System.out.println("Committing original transaction (via Transaction interface)");
- tx.commit();
+ tx.commit();
- System.out.println("Committing second transaction (via TransactionManager interface)");
- tm.commit();
-
- assertSuccess();
- }
- catch (Exception e)
- {
- System.out.println("Unexpected exception: "+e);
- e.printStackTrace(System.err);
- assertFailure();
- }
+ tm.commit();
}
- public static void main(String[] args)
- {
- JTATransactionCommitTest test = new JTATransactionCommitTest();
- test.initialise(null, null, args, new LocalHarness());
- test.runTest();
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest2.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest2.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -20,15 +20,14 @@
*/
package com.hp.mwtests.ts.jta.basic;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
-import com.arjuna.ats.jta.utils.JTAHelper;
-
import javax.transaction.TransactionManager;
import javax.transaction.Transaction;
import javax.transaction.Status;
import javax.transaction.NotSupportedException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
/*
* Copyright (C) 2001, 2002, 2003
*
@@ -40,57 +39,29 @@
* $Id: JTATransactionCommitTest2.java 2342 2006-03-30 13:06:17Z $
*/
-public class JTATransactionCommitTest2 extends Test
+public class JTATransactionCommitTest2
{
- public void run(String[] args)
+ @Test
+ public void test() throws Exception
{
- try
- {
- TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- System.out.println("Starting transaction");
- tm.begin();
+ tm.begin();
- Transaction tx = tm.getTransaction();
+ Transaction tx = tm.getTransaction();
- System.out.println("Committing transaction via transaction handle");
- tx.commit();
+ tx.commit();
- if ( tm.getStatus() != Status.STATUS_COMMITTED )
- {
- System.out.println("Status is not STATUS_COMMITTED it is "+JTAHelper.stringForm(tm.getStatus()));
- assertFailure();
- }
- else
- {
- System.out.println("Status is STATUS_COMMITTED");
+ assertEquals(Status.STATUS_COMMITTED, tm.getStatus());
- try
- {
- tm.begin();
+ try {
+ tm.begin();
- System.out.println("Begin call completed successfully - this shouldn't have happened");
- assertFailure();
- }
- catch (NotSupportedException e)
- {
- System.out.println("NotSupportedException \""+e.getMessage()+"\" occurred this is expected and correct");
- assertSuccess();
- }
- }
+ fail("Begin call completed successfully - this shouldn't have happened");
}
- catch (Exception e)
+ catch (NotSupportedException e)
{
- System.out.println("Unexpected exception: "+e);
- e.printStackTrace(System.err);
- assertFailure();
+ System.out.println("NotSupportedException \""+e.getMessage()+"\" occurred this is expected and correct");
}
}
-
- public static void main(String[] args)
- {
- JTATransactionCommitTest2 test = new JTATransactionCommitTest2();
- test.initialise(null, null, args, new LocalHarness());
- test.runTest();
- }
-}
+}
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/NullResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/NullResource.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/NullResource.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -31,63 +31,23 @@
package com.hp.mwtests.ts.jta.basic;
-import com.hp.mwtests.ts.jta.common.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
-import com.arjuna.ats.jta.*;
-import com.arjuna.ats.jta.utils.*;
-
-import com.arjuna.ats.arjuna.common.*;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
-
-import javax.transaction.*;
-import javax.transaction.xa.*;
-
-import java.lang.IllegalAccessException;
-
-public class NullResource extends Test
+public class NullResource
{
- public void run(String[] args)
- {
- boolean passed = false;
+ @Test
+ public void test() throws Exception
+ {
+ for (int i = 0; i < 1000; i++)
+ {
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- try
- {
- for (int i = 0; i < 1000; i++)
- {
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ tm.begin();
- tm.begin();
+ tm.getTransaction().rollback();
- tm.getTransaction().rollback();
-
- tm.suspend();
- }
-
- passed = true;
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- if (passed)
- {
- System.out.println("\nTest completed successfully.");
- assertSuccess();
- }
- else
- {
- System.out.println("\nTest did not complete successfully.");
- assertFailure();
- }
- }
-
- public static void main (String[] args)
- {
- NullResource test = new NullResource();
- test.initialise(null, null, args, new LocalHarness());
- test.runTest();
+ tm.suspend();
+ }
}
-
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/SuspendResume.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/SuspendResume.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/SuspendResume.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -31,71 +31,23 @@
package com.hp.mwtests.ts.jta.basic;
-import com.hp.mwtests.ts.jta.common.*;
-import com.arjuna.ats.jta.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
-import com.arjuna.ats.arjuna.common.*;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
-
-import javax.transaction.*;
-import javax.transaction.xa.*;
-
-import java.lang.IllegalAccessException;
-
-public class SuspendResume extends Test
+public class SuspendResume
{
- public void run (String[] args)
+ @Test
+ public void test() throws Exception
{
- try
- {
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager
- .transactionManager();
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- if (tm != null)
- {
- System.out.println("Starting top-level transaction.");
+ tm.begin();
- tm.begin();
+ javax.transaction.Transaction theTransaction = tm.getTransaction();
- javax.transaction.Transaction theTransaction = tm.getTransaction();
+ tm.commit();
- if (theTransaction != null)
- {
- tm.commit();
-
- tm.resume(theTransaction);
- }
- else
- {
- System.err.println("Error - could not get transaction!");
- tm.rollback();
- assertFailure();
- }
-
- System.out.println("\nTest completed successfully.");
- assertSuccess();
- }
- else
- {
- System.err
- .println("Error - could not get transaction manager!");
- assertFailure();
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- assertFailure();
- }
+ tm.resume(theTransaction);
}
-
- public static void main (String[] args)
- {
- SuspendResume test = new SuspendResume();
- test.initialise(null, null, args, new LocalHarness());
- test.runTest();
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common/RecoveryXAResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common/RecoveryXAResource.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common/RecoveryXAResource.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -34,12 +34,9 @@
import com.arjuna.ats.arjuna.AtomicAction;
import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.ats.internal.jta.utils.*;
-
import com.arjuna.ats.jta.xa.*;
import javax.transaction.xa.*;
-import java.io.*;
public class RecoveryXAResource implements XAResource
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common/Synchronization.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common/Synchronization.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common/Synchronization.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -33,8 +33,6 @@
import com.arjuna.ats.jta.utils.JTAHelper;
-import javax.transaction.xa.*;
-
public class Synchronization implements javax.transaction.Synchronization
{
public final static int ERROR_STATUS = 0;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/hammer/JTAHammer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/hammer/JTAHammer.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/hammer/JTAHammer.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -33,16 +33,12 @@
import com.hp.mwtests.ts.jta.common.*;
-import com.arjuna.ats.jta.*;
-
-import com.arjuna.ats.arjuna.common.*;
-
-import javax.transaction.*;
import javax.transaction.xa.*;
import java.util.*;
-import java.lang.IllegalAccessException;
+import org.junit.Test;
+import static org.junit.Assert.*;
class Worker extends Thread
{
@@ -125,77 +121,21 @@
public class JTAHammer
{
-
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
String xaResource = "com.hp.mwtests.ts.jta.common.DummyCreator";
String connectionString = null;
int threads = 10;
int work = 100;
-
- for (int i = 0; i < args.length; i++)
- {
- if (args[i].compareTo("-connect") == 0)
- connectionString = args[i+1];
- if (args[i].compareTo("-creator") == 0)
- xaResource = args[i+1];
- if (args[i].compareTo("-threads") == 0)
- {
- try
- {
- Integer v = new Integer(args[i+1]);
-
- threads = v.intValue();
- }
- catch (Exception e)
- {
- System.err.println(e);
- }
- }
- if (args[i].compareTo("-work") == 0)
- {
- try
- {
- Integer v = new Integer(args[i+1]);
-
- work = v.intValue();
- }
- catch (Exception e)
- {
- System.err.println(e);
- }
- }
- if (args[i].compareTo("-help") == 0)
- {
- System.out.println("Usage: JTAHammer -creator <name> [-connect <string>] [-help] [-threads <number>] [-work <number>]");
- System.exit(0);
- }
- }
- if (xaResource == null)
- {
- System.err.println("Error - no resource creator specified.");
- System.exit(0);
- }
-
/*
* We should have a reference to a factory object (see JTA
* specification). However, for simplicity we will ignore this.
*/
- XACreator creator = null;
+ XACreator creator = (XACreator) Thread.currentThread().getContextClassLoader().loadClass(xaResource).newInstance();
- try
- {
- creator = (XACreator) Thread.currentThread().getContextClassLoader().loadClass(xaResource).newInstance();
- }
- catch (Exception e)
- {
- System.err.println(e);
-
- System.exit(0);
- }
-
number = threads;
int numberOfTransactions = threads * work;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/lastresource/LastResourceAllowedTestCase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/lastresource/LastResourceAllowedTestCase.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/lastresource/LastResourceAllowedTestCase.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -26,18 +26,22 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.Before;
+import static org.junit.Assert.*;
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
import com.arjuna.ats.arjuna.common.Environment;
-public class LastResourceAllowedTestCase extends TestCase
+public class LastResourceAllowedTestCase
{
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
System.setProperty(Environment.ALLOW_MULTIPLE_LAST_RESOURCES, "true") ;
}
+ @Test
public void testAllowed()
throws SystemException, NotSupportedException, RollbackException
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/lastresource/LastResourceDisallowTestCase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/lastresource/LastResourceDisallowTestCase.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/lastresource/LastResourceDisallowTestCase.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -26,12 +26,14 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-public class LastResourceDisallowTestCase extends TestCase
+public class LastResourceDisallowTestCase
{
+ @Test
public void testDisallowed()
throws SystemException, NotSupportedException, RollbackException
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/nested/SimpleNestedTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/nested/SimpleNestedTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/nested/SimpleNestedTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -36,46 +36,34 @@
import javax.transaction.Transaction;
import javax.transaction.xa.XAResource;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class SimpleNestedTest
{
+ @Test
+ public void test() throws Exception
+ {
+ com.arjuna.ats.jta.common.jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.SUPPORT_SUBTRANSACTIONS, "YES");
- public SimpleNestedTest ()
- {
- try
- {
- com.arjuna.ats.jta.common.jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.SUPPORT_SUBTRANSACTIONS, "YES");
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ transactionManager.begin();
- transactionManager.begin();
+ transactionManager.begin();
- transactionManager.begin();
+ Transaction currentTrans = transactionManager.getTransaction();
+ TestResource res1, res2;
+ currentTrans.enlistResource(res1 = new TestResource());
+ currentTrans.enlistResource(res2 = new TestResource());
- Transaction currentTrans = transactionManager.getTransaction();
- TestResource res1, res2;
- currentTrans.enlistResource(res1 = new TestResource());
- currentTrans.enlistResource(res2 = new TestResource());
+ currentTrans.delistResource(res2, XAResource.TMSUCCESS);
+ currentTrans.delistResource(res1, XAResource.TMSUCCESS);
- currentTrans.delistResource(res2, XAResource.TMSUCCESS);
- currentTrans.delistResource(res1, XAResource.TMSUCCESS);
+ transactionManager.commit();
- transactionManager.commit();
+ transactionManager.commit();
- transactionManager.commit();
-
- System.err.println("Passed.");
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- System.err.println("ERROR - " + e);
-
- System.err.println("\nFailed.");
- }
- }
-
- public static void main (String[] args)
- {
- new SimpleNestedTest();
- }
+ System.err.println("Passed.");
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/CrashRecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/CrashRecovery.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/CrashRecovery.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -33,55 +33,28 @@
import com.hp.mwtests.ts.jta.common.*;
-import com.arjuna.ats.jta.*;
-
-import com.arjuna.ats.arjuna.common.*;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
-
-import javax.transaction.*;
import javax.transaction.xa.*;
-import java.lang.IllegalAccessException;
+import org.junit.Test;
+import static org.junit.Assert.*;
public class CrashRecovery
{
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
- try
- {
- XAResource firstResource = new CrashXAResource();
- XAResource secondResource = new CrashXAResource();
+ XAResource firstResource = new CrashXAResource();
+ XAResource secondResource = new CrashXAResource();
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- if (tm != null)
- {
- System.out.println("Starting top-level transaction.");
+ tm.begin();
- tm.begin();
+ javax.transaction.Transaction theTransaction = tm.getTransaction();
- javax.transaction.Transaction theTransaction = tm.getTransaction();
+ theTransaction.enlistResource(firstResource);
+ theTransaction.enlistResource(secondResource);
- if (theTransaction != null)
- {
- System.out.println("\nTrying to register resource with transaction.");
-
- theTransaction.enlistResource(firstResource);
- theTransaction.enlistResource(secondResource);
-
- tm.commit();
- }
- else
- {
- System.err.println("Error - could not get transaction manager!");
- }
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ tm.commit();
}
-
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/DummyXARecoveryResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/DummyXARecoveryResource.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/DummyXARecoveryResource.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -31,21 +31,12 @@
package com.hp.mwtests.ts.jta.recovery;
-import com.arjuna.ats.arjuna.common.Uid;
-
import com.arjuna.ats.jta.recovery.*;
-import com.arjuna.ats.jta.xa.*;
-import com.arjuna.ats.internal.jta.utils.*;
-
import com.hp.mwtests.ts.jta.common.*;
-import java.util.Vector;
-
import java.sql.*;
-import javax.sql.*;
-import javax.transaction.*;
import javax.transaction.xa.*;
public class DummyXARecoveryResource implements XAResourceRecovery
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryManagerTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryManagerTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryManagerTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -31,28 +31,22 @@
package com.hp.mwtests.ts.jta.recovery;
-import com.arjuna.ats.arjuna.AtomicAction;
-import com.arjuna.ats.arjuna.coordinator.*;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.recovery.RecoveryManager;
-import com.arjuna.ats.jta.xa.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
-import com.arjuna.ats.internal.jta.utils.*;
-
-import java.util.Vector;
-
public class RecoveryManagerTest
{
- public static void main (String[] args)
+ @Test
+ public void test()
{
- System.setProperty("com.arjuna.ats.jta.xaRecoveryNode", "1");
- System.setProperty("XAResourceRecovery1", "com.hp.mwtests.ts.jta.recovery.DummyXARecoveryResource");
+ System.setProperty("com.arjuna.ats.jta.xaRecoveryNode", "1");
+ System.setProperty("XAResourceRecovery1", "com.hp.mwtests.ts.jta.recovery.DummyXARecoveryResource");
- RecoveryManager manager = RecoveryManager.manager(RecoveryManager.DIRECT_MANAGEMENT);
+ RecoveryManager manager = RecoveryManager.manager(RecoveryManager.DIRECT_MANAGEMENT);
- manager.scan();
- manager.scan();
+ manager.scan();
+ manager.scan();
}
-
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -39,33 +39,30 @@
import java.util.Vector;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class RecoveryTest
{
- public static void main (String[] args)
+ @Test
+ public void test()
{
- Vector xaRecoveryNodes = new Vector();
- boolean passed = false;
- Uid bogusNodeName = new Uid();
-
- xaRecoveryNodes.add(bogusNodeName.stringForm());
+ Vector xaRecoveryNodes = new Vector();
+ Uid bogusNodeName = new Uid();
- System.err.println("Bogus XA node name: "+bogusNodeName);
-
- XidImple xid = new XidImple(new Uid());
- String nodeName = XAUtils.getXANodeName(xid);
+ xaRecoveryNodes.add(bogusNodeName.stringForm());
- // should fail.
+ System.err.println("Bogus XA node name: "+bogusNodeName);
- System.err.println("XA node name: "+nodeName);
- System.err.println("Xid to recover: "+xid);
-
- if (!xaRecoveryNodes.contains(nodeName))
- passed = true;
+ XidImple xid = new XidImple(new Uid());
+ String nodeName = XAUtils.getXANodeName(xid);
- if (passed)
- System.err.println("Passed.");
- else
- System.err.println("Failed.");
+ // should fail.
+
+ System.err.println("XA node name: "+nodeName);
+ System.err.println("Xid to recover: "+xid);
+
+ assertFalse( xaRecoveryNodes.contains(nodeName) );
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/subordinate/SubordinateTestCase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/subordinate/SubordinateTestCase.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/subordinate/SubordinateTestCase.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -20,7 +20,8 @@
*/
package com.hp.mwtests.ts.jta.subordinate;
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
import com.arjuna.ats.arjuna.coordinator.ActionManager;
import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome;
@@ -33,13 +34,12 @@
import javax.transaction.RollbackException;
import javax.transaction.Transaction;
-import javax.transaction.Status;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import javax.transaction.xa.XAException;
import javax.resource.spi.XATerminator;
-public class SubordinateTestCase extends TestCase
+public class SubordinateTestCase
{
// This test class is subclassed by the JTAX version of the tests, so we isolate
// the module specific tx creation code to this function, which then gets overridden.
@@ -47,6 +47,7 @@
return new TransactionImple(0); // implicit begin
}
+ @Test
public void testCleanupCommit () throws Exception
{
for (int i = 0; i < 1000; i++)
@@ -60,6 +61,7 @@
assertEquals(ActionManager.manager().inflightTransactions().size(), 0);
}
+ @Test
public void testCleanupRollback () throws Exception
{
for (int i = 0; i < 1000; i++)
@@ -72,6 +74,7 @@
assertEquals(ActionManager.manager().inflightTransactions().size(), 0);
}
+ @Test
public void testCleanupSecondPhaseRollback () throws Exception
{
for (int i = 0; i < 1000; i++)
@@ -85,6 +88,7 @@
assertEquals(ActionManager.manager().inflightTransactions().size(), 0);
}
+ @Test
public void testCleanupOnePhaseCommit () throws Exception
{
for (int i = 0; i < 1000; i++)
@@ -99,6 +103,7 @@
/////////////
+ @Test
public void testOnePhaseCommitSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -110,6 +115,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, tm.getStatus());
}
+ @Test
public void testOnePhaseCommitSyncViaXATerminator() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -123,6 +129,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, t.getStatus());
}
+ @Test
public void testOnePhaseCommitSyncWithRollbackOnly() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -140,6 +147,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, tm.getStatus());
}
+ @Test
public void testOnePhaseCommitSyncWithRollbackOnlyViaXATerminator() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -162,6 +170,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, t.getStatus());
}
+ @Test
public void testRollbackSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -173,6 +182,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, tm.getStatus());
}
+ @Test
public void testRollbackSyncViaXATerminator() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -186,6 +196,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, t.getStatus());
}
+ @Test
public void testTwoPhaseCommitSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -198,6 +209,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, tm.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncViaXATerminator() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -212,6 +224,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, t.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncWithXAOK() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -227,6 +240,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, tm.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncWithXAOKViaXATerminator() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -244,6 +258,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, t.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncWithRollbackOnly() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -257,6 +272,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, tm.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncWithRollbackOnlyViaXATerminator() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -280,6 +296,7 @@
/////////////
+ @Test
public void testOnePhaseCommitSyncWithSeparateSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -292,6 +309,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, tm.getStatus());
}
+ @Test
public void testOnePhaseCommitSyncViaXATerminatorWithSeparateSync() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -307,6 +325,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, t.getStatus());
}
+ @Test
public void testOnePhaseCommitSyncWithRollbackOnlyWithSeparateSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -325,6 +344,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, tm.getStatus());
}
+ @Test
public void testOnePhaseCommitSyncWithRollbackOnlyViaXATerminatorWithSeparateSync() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -349,6 +369,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, t.getStatus());
}
+ @Test
public void testRollbackSyncWithSeparateSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -361,6 +382,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, tm.getStatus());
}
+ @Test
public void testRollbackSyncViaXATerminatorWithSeparateSync() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -376,7 +398,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, t.getStatus());
}
-
+ @Test
public void testTwoPhaseCommitSyncWithSeparateSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -390,6 +412,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, tm.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncViaXATerminatorWithSeparateSync() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -406,6 +429,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, t.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncWithXAOKWithSeparateSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -422,6 +446,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, tm.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncWithXAOKViaXATerminatorWithSeparateSync() throws Exception
{
final Xid xid = new XidImple(new Uid());
@@ -441,6 +466,7 @@
assertEquals(javax.transaction.Status.STATUS_COMMITTED, t.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncWithRollbackOnlyWithSeparateSync() throws Exception
{
final SubordinateTransaction tm = createTransaction();
@@ -455,6 +481,7 @@
assertEquals(javax.transaction.Status.STATUS_ROLLEDBACK, tm.getStatus());
}
+ @Test
public void testTwoPhaseCommitSyncWithRollbackOnlyViaXATerminatorWithSeparateSync() throws Exception
{
final Xid xid = new XidImple(new Uid());
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/RollbackTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/RollbackTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/RollbackTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -31,62 +31,22 @@
package com.hp.mwtests.ts.jta.timeout;
-import com.hp.mwtests.ts.jta.common.TestResource;
+import org.junit.Test;
+import static org.junit.Assert.*;
-import javax.transaction.Transaction;
-import javax.transaction.xa.XAResource;
-
public class RollbackTest
{
- public RollbackTest ()
+ @Test
+ public void test() throws Exception
{
- try
- {
- javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- boolean passed = false;
-
- transactionManager.setTransactionTimeout(3);
-
- transactionManager.begin();
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- try
- {
- Thread.currentThread().sleep(4000);
- }
- catch (Exception ex)
- {
- }
+ transactionManager.setTransactionTimeout(3);
- try
- {
- transactionManager.rollback();
-
- passed = true;
- }
- catch (IllegalStateException ex)
- {
- passed = false;
- }
- catch (Exception ex)
- {
- passed = false;
- }
+ transactionManager.begin();
- if (passed)
- System.err.println("Passed.");
- else
- System.err.println("Failed.");
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- System.err.println("ERROR - "+e);
- }
- }
+ Thread.currentThread().sleep(4000);
- public static void main(String[] args)
- {
- new RollbackTest();
+ transactionManager.rollback();
}
-
-}
+}
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/SimpleTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/SimpleTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/SimpleTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -31,59 +31,29 @@
package com.hp.mwtests.ts.jta.timeout;
-import com.hp.mwtests.ts.jta.common.TestResource;
+import org.junit.Test;
+import static org.junit.Assert.*;
-import javax.transaction.Transaction;
-import javax.transaction.xa.XAResource;
-
public class SimpleTest
{
- public SimpleTest ()
+ @Test
+ public void test() throws Exception
{
- try
- {
- javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- boolean passed = false;
-
- transactionManager.setTransactionTimeout(3);
-
- transactionManager.begin();
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- try
- {
- Thread.currentThread().sleep(4000);
- }
- catch (Exception ex)
- {
- }
+ transactionManager.setTransactionTimeout(3);
- try
- {
- transactionManager.commit();
- }
- catch (final javax.transaction.RollbackException ex)
- {
- passed = true;
- }
- catch (Exception ex)
- {
- }
+ transactionManager.begin();
- if (passed)
- System.err.println("Passed.");
- else
- System.err.println("Failed.");
+ Thread.currentThread().sleep(4000);
+
+ try
+ {
+ transactionManager.commit();
}
- catch (Exception e)
+ catch (final javax.transaction.RollbackException ex)
{
- e.printStackTrace(System.err);
- System.err.println("ERROR - "+e);
+ // expected
}
}
-
- public static void main(String[] args)
- {
- new SimpleTest();
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase/SimpleTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase/SimpleTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase/SimpleTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -36,37 +36,27 @@
import javax.transaction.Transaction;
import javax.transaction.xa.XAResource;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class SimpleTest
{
- public SimpleTest ()
+ @Test
+ public void test() throws Exception
{
- try
- {
- javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- transactionManager.begin();
+ transactionManager.begin();
- Transaction currentTrans = transactionManager.getTransaction();
+ Transaction currentTrans = transactionManager.getTransaction();
- TestResource res1, res2;
- currentTrans.enlistResource( res1 = new TestResource() );
- currentTrans.enlistResource( res2 = new TestResource() );
+ TestResource res1, res2;
+ currentTrans.enlistResource( res1 = new TestResource() );
+ currentTrans.enlistResource( res2 = new TestResource() );
- currentTrans.delistResource( res2, XAResource.TMSUCCESS );
- currentTrans.delistResource( res1, XAResource.TMSUCCESS );
+ currentTrans.delistResource( res2, XAResource.TMSUCCESS );
+ currentTrans.delistResource( res1, XAResource.TMSUCCESS );
- transactionManager.commit();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- System.err.println("ERROR - "+e);
- }
+ transactionManager.commit();
}
-
- public static void main(String[] args)
- {
- new SimpleTest();
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2009-07-07 11:00:15 UTC (rev 27692)
@@ -23,7 +23,7 @@
<property name="modulename" value="jtax"/>
<property name="global.ext.libs" value="jta-1_1-classes.zip,connector-api.jar"/>
- <property name="global.ext.test.libs" value="junit.jar,TestingFramework.jar"/>
+ <property name="global.ext.test.libs" value="junit-4.6.jar"/>
<import file="../sharedbuild.xml"/>
@@ -70,20 +70,20 @@
<additional.classpath>
<path refid="jacorb.classpath"/>
</additional.classpath>
- <tests><fileset dir="tests/classes" includes="**/SubordinateTestCase.java"/></tests>
+ <tests>
+ <fileset dir="tests/classes">
+ <exclude name="**/common/**"/>
+ <exclude name="**/ExampleXAResource.java"/>
+ <exclude name="**/JTSTestCase.java"/>
+ <exclude name="**/LastOnePhaseResource.java"/>
+
+
+ <exclude name="**/implicit**"/>
+ <exclude name="**/SimpleNestedTest.java"/>
+
+ </fileset>
+ </tests>
</run.tests.macro>
- <run.tests.macro>
- <additional.classpath>
- <path refid="jacorb.classpath"/>
- </additional.classpath>
- <tests><fileset dir="tests/classes" includes="**/LastResourceDisallowTestCase.java"/></tests>
- </run.tests.macro>
- <run.tests.macro>
- <additional.classpath>
- <path refid="jacorb.classpath"/>
- </additional.classpath>
- <tests><fileset dir="tests/classes" includes="**/LastResourceAllowedTestCase.java"/></tests>
- </run.tests.macro>
</target>
</project>
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/client/ImplicitClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/client/ImplicitClient.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/client/ImplicitClient.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -36,58 +36,34 @@
import com.arjuna.ats.jta.common.*;
import com.arjuna.ats.jta.*;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
+import org.junit.Test;
+import static org.junit.Assert.*;
-public class ImplicitClient extends Test
+public class ImplicitClient
{
- public void run(String[] args)
+ @Test
+ public void test() throws Exception
{
- if (args.length == 0)
- {
- System.err.println("No name provided for server");
- assertFailure();
- }
- else
- {
- try
- {
- jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_TM_IMPLEMENTATION, com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple.class.getName());
- jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_UT_IMPLEMENTATION, com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple.class.getName());
+ jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_TM_IMPLEMENTATION, com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple.class.getName());
+ jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_UT_IMPLEMENTATION, com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple.class.getName());
- ORB orb = ORB.getInstance("implicitserver-orb");
- OA oa = OA.getRootOA(orb);
+ ORB orb = ORB.getInstance("implicitserver-orb");
+ OA oa = OA.getRootOA(orb);
- orb.initORB(args, null);
- oa.initPOA(args);
+ orb.initORB(new String[] {}, null);
+ oa.initPOA(new String[] {});
- org.omg.CORBA.Object obj = orb.orb().string_to_object(getService(args[0]));
+ org.omg.CORBA.Object obj = null; // TODO orb.orb().string_to_object(getService("TODO"));
- Example.test test = Example.testHelper.narrow(obj);
+ Example.test test = Example.testHelper.narrow(obj);
- TransactionManager.transactionManager().begin();
+ TransactionManager.transactionManager().begin();
- test.invoke();
+ test.invoke();
- TransactionManager.transactionManager().commit();
+ TransactionManager.transactionManager().commit();
- assertSuccess();
-
- oa.destroy();
- orb.destroy();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
- }
+ oa.destroy();
+ orb.destroy();
}
-
- public static void main(String[] args)
- {
- ImplicitClient client = new ImplicitClient();
- client.initialise(null, null, args, new LocalHarness());
- client.runTest();
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/server/ImplicitServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/server/ImplicitServer.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/server/ImplicitServer.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -37,56 +37,31 @@
import com.arjuna.ats.jta.common.jtaPropertyManager;
import com.arjuna.ats.jta.common.Environment;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
+import org.junit.Test;
+import static org.junit.Assert.*;
-public class ImplicitServer extends Test
+public class ImplicitServer
{
- public void run(String[] args)
+ @Test
+ public void test() throws Exception
{
- if (args.length == 0)
- {
- System.err.println("No name provided for server");
- assertFailure();
- }
- else
- {
- jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_TM_IMPLEMENTATION, com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple.class.getName());
- jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_UT_IMPLEMENTATION, com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple.class.getName());
+ jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_TM_IMPLEMENTATION, com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple.class.getName());
+ jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_UT_IMPLEMENTATION, com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple.class.getName());
- try
- {
- ORB orb = ORB.getInstance("implicitserver-orb");
- OA oa = OA.getRootOA(orb);
+ ORB orb = ORB.getInstance("implicitserver-orb");
+ OA oa = OA.getRootOA(orb);
- orb.initORB(args, null);
- oa.initPOA(args);
+ orb.initORB(new String[] {}, null);
+ oa.initPOA(new String[] {});
- RemoteImpl impl = new RemoteImpl();
+ RemoteImpl impl = new RemoteImpl();
- oa.objectIsReady(impl);
+ oa.objectIsReady(impl);
- org.omg.CORBA.Object obj = oa.corbaReference(impl);
+ org.omg.CORBA.Object obj = oa.corbaReference(impl);
- registerService(args[0], orb.orb().object_to_string(obj));
+ // TODO registerService(args[0], orb.orb().object_to_string(obj));
- assertReady();
-
- orb.orb().run();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
- }
+ orb.orb().run();
}
-
- public static void main(String[] args)
- {
- ImplicitServer test = new ImplicitServer();
- test.initialise(null, null, args, new LocalHarness());
-
- test.runTest();
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/JTSTestCase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/JTSTestCase.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/JTSTestCase.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -20,21 +20,28 @@
*/
package com.hp.mwtests.ts.jta.jts;
-import junit.framework.TestCase;
-
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.orbportability.OA;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.RootOA;
-public class JTSTestCase extends TestCase
+import org.junit.Test;
+import org.junit.Before;
+import org.junit.After;
+import static org.junit.Assert.*;
+
+
+public class JTSTestCase
{
private ORB orb ;
private RootOA oa ;
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
+ System.out.println("Before...");
+
orb = ORB.getInstance("test");
oa = OA.getRootOA(orb);
@@ -45,9 +52,12 @@
ORBManager.setPOA(oa);
}
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
+ System.out.println("After...");
+
if (oa != null)
{
oa.destroy();
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTAAbort.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTAAbort.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTAAbort.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -40,97 +40,52 @@
import javax.transaction.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class JTAAbort
{
-
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
- ORB myORB = null;
- RootOA myOA = null;
+ ORB myORB = null;
+ RootOA myOA = null;
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
-
- myORB.initORB(args, null);
- myOA.initOA();
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- System.exit(0);
- }
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- boolean passed = false;
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
-
- try
- {
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- if (tm != null)
- {
- System.out.println("Starting top-level transaction.");
-
- tm.begin();
-
- javax.transaction.Transaction theTransaction = tm.getTransaction();
+ System.out.println("Starting top-level transaction.");
- if (theTransaction != null)
- {
- System.out.println("\nRolling back transaction.");
-
- theTransaction.rollback();
-
- System.out.println("\nTransaction now: "+theTransaction);
+ tm.begin();
- System.out.println("\nThread associated: "+JTAHelper.stringForm(tm.getStatus()));
-
- theTransaction = tm.suspend();
-
- System.out.println("\nSuspended: "+theTransaction);
+ javax.transaction.Transaction theTransaction = tm.getTransaction();
- try
- {
- tm.resume(theTransaction);
-
- System.out.println("\nResumed: "+tm.getTransaction());
- }
- catch (InvalidTransactionException ite)
- {
- System.out.println("\nCould not resume a dead transaction.");
+ System.out.println("\nRolling back transaction.");
- passed = true;
- }
- }
- else
- {
- System.err.println("Error - could not get transaction!");
- tm.rollback();
- }
- }
- else
- System.err.println("Error - could not get transaction manager!");
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ theTransaction.rollback();
- if (passed)
- System.out.println("\nTest completed successfully.");
- else
- System.out.println("\nTest did not complete successfully.");
+ System.out.println("\nTransaction now: "+theTransaction);
- myOA.destroy();
- myORB.shutdown();
- }
+ System.out.println("\nThread associated: "+JTAHelper.stringForm(tm.getStatus()));
+ theTransaction = tm.suspend();
+
+ System.out.println("\nSuspended: "+theTransaction);
+
+ tm.resume(theTransaction);
+
+ myOA.destroy();
+ myORB.shutdown();
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTAOrder.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTAOrder.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTAOrder.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -41,66 +41,59 @@
import javax.transaction.xa.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class JTAOrder
{
-
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
- ORB myORB = null;
- RootOA myOA = null;
+ ORB myORB = null;
+ RootOA myOA = null;
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
-
- myORB.initORB(args, null);
- myOA.initOA();
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- System.exit(0);
- }
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- boolean passed = false;
+ boolean passed = false;
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
-
- try
- {
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
- XAResource theResource = new TestResource();
- FirstXAResource first = new FirstXAResource();
- LastXAResource last = new LastXAResource();
-
- System.out.println("Starting top-level transaction.");
+ try
+ {
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- tm.begin();
+ XAResource theResource = new TestResource();
+ FirstXAResource first = new FirstXAResource();
+ LastXAResource last = new LastXAResource();
- javax.transaction.Transaction theTransaction = tm.getTransaction();
+ System.out.println("Starting top-level transaction.");
- theTransaction.enlistResource(theResource);
- theTransaction.enlistResource(last);
- theTransaction.enlistResource(first);
+ tm.begin();
- System.err.println("Committing transaction.");
-
- tm.commit();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ javax.transaction.Transaction theTransaction = tm.getTransaction();
- myOA.destroy();
- myORB.shutdown();
- }
+ theTransaction.enlistResource(theResource);
+ theTransaction.enlistResource(last);
+ theTransaction.enlistResource(first);
+ System.err.println("Committing transaction.");
+
+ tm.commit();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ myOA.destroy();
+ myORB.shutdown();
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -41,57 +41,30 @@
import javax.transaction.xa.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class JTATest
{
-
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
ORB myORB = null;
RootOA myOA = null;
- try
- {
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
- myORB.initORB(args, null);
+ myORB.initORB(new String[] {}, null);
myOA.initOA();
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
- System.exit(0);
- }
-
String xaResource = "com.hp.mwtests.ts.jta.common.DummyCreator";
String connectionString = null;
boolean tmCommit = true;
-
- for (int i = 0; i < args.length; i++)
- {
- if (args[i].compareTo("-connect") == 0)
- connectionString = args[i+1];
- if (args[i].compareTo("-creator") == 0)
- xaResource = args[i+1];
- if (args[i].equals("-txcommit"))
- tmCommit = false;
- if (args[i].compareTo("-help") == 0)
- {
- System.out.println("Usage: JTATest -creator <name> [-connect <string>] [-txcommit] [-help]");
- System.exit(0);
- }
- }
- if (xaResource == null)
- {
- System.err.println("Error - no resource creator specified.");
- System.exit(0);
- }
-
jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
@@ -107,8 +80,7 @@
if (theResource == null)
{
- System.err.println("Error - creator "+xaResource+" returned null resource.");
- System.exit(0);
+ fail("Error - creator "+xaResource+" returned null resource.");
}
javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
@@ -127,10 +99,8 @@
if (!theTransaction.enlistResource(theResource))
{
- System.err.println("Error - could not enlist resource in transaction!");
tm.rollback();
-
- System.exit(0);
+ fail("Error - could not enlist resource in transaction!");
}
else
System.out.println("\nResource enlisted successfully.");
@@ -148,8 +118,7 @@
{
tm.begin();
- System.err.println("Error - transaction started!");
- System.exit(0);
+ fail("Error - transaction started!");
}
catch (Exception e)
{
@@ -179,9 +148,8 @@
}
else
{
- System.err.println("Error - could not get transaction!");
tm.rollback();
- System.exit(0);
+ fail("Error - could not get transaction!");
}
System.out.println("\nTest completed successfully.");
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATransactionCommitTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATransactionCommitTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATransactionCommitTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -20,17 +20,19 @@
*/
package com.hp.mwtests.ts.jta.jts.basic;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
import com.arjuna.ats.jta.common.jtaPropertyManager;
import com.arjuna.ats.jta.common.Environment;
import com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple;
+import com.hp.mwtests.ts.jta.jts.JTSTestCase;
import javax.transaction.TransactionManager;
import javax.transaction.Transaction;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
/*
* Copyright (C) 2001, 2002, 2003
*
@@ -42,24 +44,11 @@
* $Id: JTATransactionCommitTest.java 2342 2006-03-30 13:06:17Z $
*/
-public class JTATransactionCommitTest extends Test
+public class JTATransactionCommitTest extends JTSTestCase
{
- public void run(String[] args)
+ @Test
+ public void test() throws Exception
{
- ORB orb = ORB.getInstance("test-orb");
- OA oa = OA.getRootOA(orb);
-
- try
- {
- orb.initORB(args, null);
- oa.initPOA(args);
- }
- catch (Exception e)
- {
- System.out.println("Failed to setup and initiate ORB: "+e);
- assertFailure();
- }
-
/** Ensure underlying JTA implementation is JTS **/
jtaPropertyManager.getPropertyManager().setProperty(Environment.JTA_TM_IMPLEMENTATION, TransactionManagerImple.class.getName());
@@ -80,33 +69,11 @@
System.out.println("Committing second transaction (via TransactionManager interface)");
tm.commit();
-
- assertSuccess();
}
catch (Exception e)
{
- System.out.println("Unexpected exception: "+e);
e.printStackTrace(System.err);
- assertFailure();
+ fail("Unexpected exception: "+e);
}
-
- try
- {
- oa.destroy();
- orb.shutdown();
- }
- catch (Exception e)
- {
- System.out.println("Failed to shutdown and destroy the ORB/OA: "+e);
- e.printStackTrace(System.err);
- assertFailure();
- }
}
-
- public static void main(String[] args)
- {
- JTATransactionCommitTest test = new JTATransactionCommitTest();
- test.initialise(null, null, args, new LocalHarness());
- test.runTest();
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/NullResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/NullResource.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/NullResource.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -37,73 +37,56 @@
import com.arjuna.orbportability.*;
-import org.jboss.dtf.testframework.unittest.Test;
+import org.junit.Test;
+import static org.junit.Assert.*;
-public class NullResource extends Test
+public class NullResource
{
-
- public void run(String[] args)
+ @Test
+ public void test() throws Exception
{
- ORB myORB = null;
- RootOA myOA = null;
+ ORB myORB = null;
+ RootOA myOA = null;
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- myORB.initORB(args, null);
- myOA.initOA();
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.out.println("Initialisation failed: "+e);
- e.printStackTrace(System.err);
- assertFailure();
- }
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
- boolean passed = false;
+ boolean passed = false;
- try
- {
- for (int i = 0; i < 1000; i++)
- {
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ try
+ {
+ for (int i = 0; i < 1000; i++)
+ {
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- tm.begin();
+ tm.begin();
- tm.getTransaction().rollback();
+ tm.getTransaction().rollback();
- tm.suspend();
- }
+ tm.suspend();
+ }
- passed = true;
- }
- catch (Exception e)
- {
- e.printStackTrace();
- assertFailure();
- }
-
- if (passed)
- {
- System.out.println("\nTest completed successfully.");
- assertSuccess();
+ passed = true;
}
- else
+ catch (Exception e)
{
- System.out.println("\nTest did not complete successfully.");
- assertFailure();
+ e.printStackTrace();
+ fail();
}
- myOA.destroy();
- myORB.shutdown();
+ assertTrue(passed);
+
+ myOA.destroy();
+ myORB.shutdown();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/Performance.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/Performance.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/Performance.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -37,71 +37,52 @@
import com.arjuna.orbportability.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class Performance
{
-
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
- ORB myORB = null;
- RootOA myOA = null;
+ ORB myORB = null;
+ RootOA myOA = null;
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
-
- myORB.initORB(args, null);
- myOA.initOA();
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- System.exit(0);
- }
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
- /*
- * We should have a reference to a factory object (see JTA
- * specification). However, for simplicity we will ignore this.
- */
+ /*
+ * We should have a reference to a factory object (see JTA
+ * specification). However, for simplicity we will ignore this.
+ */
- long stime = System.currentTimeMillis();
-
- try
- {
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ long stime = System.currentTimeMillis();
- if (tm != null)
- {
- for (int i = 0; i < 1000; i++)
- {
- tm.begin();
-
- tm.commit();
- }
- }
- else
- System.err.println("Error - could not get transaction manager!");
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- long ftime = System.currentTimeMillis();
- double elapsedTime = (ftime - stime)/1000.0;
- double tps = 1000.0/elapsedTime;
-
- System.err.println("TPS: "+tps);
-
- myOA.destroy();
- myORB.shutdown();
- }
+ for (int i = 0; i < 1000; i++)
+ {
+ tm.begin();
+ tm.commit();
+ }
+
+ long ftime = System.currentTimeMillis();
+ double elapsedTime = (ftime - stime)/1000.0;
+ double tps = 1000.0/elapsedTime;
+
+ System.err.println("TPS: "+tps);
+
+ myOA.destroy();
+ myORB.shutdown();
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/SuspendResume.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/SuspendResume.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/SuspendResume.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -37,77 +37,57 @@
import com.arjuna.orbportability.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class SuspendResume
{
-
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
ORB myORB = null;
RootOA myOA = null;
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- myORB.initORB(args, null);
- myOA.initOA();
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: " + e);
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- System.exit(0);
- }
+ jtaPropertyManager.getPropertyManager().setProperty(
+ com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION,
+ "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
+ jtaPropertyManager.getPropertyManager().setProperty(
+ com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION,
+ "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
- jtaPropertyManager.getPropertyManager()
- .setProperty(
- com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION,
- "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
- jtaPropertyManager.getPropertyManager()
- .setProperty(
- com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION,
- "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
-
try
{
javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager
.transactionManager();
- if (tm != null)
- {
- System.out.println("Starting top-level transaction.");
+ System.out.println("Starting top-level transaction.");
- tm.begin();
+ tm.begin();
- javax.transaction.Transaction theTransaction = tm
- .getTransaction();
+ javax.transaction.Transaction theTransaction = tm
+ .getTransaction();
- if (theTransaction != null)
- {
- tm.commit();
+ if (theTransaction != null)
+ {
+ tm.commit();
- tm.resume(theTransaction);
- }
- else
- {
- System.err.println("Error - could not get transaction!");
- tm.rollback();
- System.exit(0);
- }
-
- System.out.println("\nTest completed successfully.");
- System.exit(0);
+ tm.resume(theTransaction);
}
else
{
- System.err
- .println("Error - could not get transaction manager!");
- System.exit(0);
+ tm.rollback();
+ fail("Error - could not get transaction!");
}
+
}
catch (Exception e)
{
@@ -117,5 +97,4 @@
myOA.destroy();
myORB.shutdown();
}
-
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/ThreadedCommit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/ThreadedCommit.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/ThreadedCommit.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -41,6 +41,9 @@
import com.arjuna.orbportability.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
class TWorker extends Thread
{
public TWorker (javax.transaction.Transaction tx, boolean first)
@@ -49,11 +52,11 @@
_success = true;
_first = first;
}
-
+
public void run ()
- {
+ {
TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
-
+
try
{
tm.resume(_tx);
@@ -67,26 +70,26 @@
Thread.sleep(1000);
}
catch (final Exception ex)
- {
+ {
}
}
}
-
+
tm.commit();
}
catch (final Exception ex)
{
ex.printStackTrace();
-
+
_success = false;
}
}
-
+
public final boolean success ()
{
return _success;
}
-
+
private Transaction _tx;
private boolean _success;
private boolean _first;
@@ -94,30 +97,21 @@
public class ThreadedCommit
{
-
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
ORB myORB = null;
RootOA myOA = null;
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- myORB.initORB(args, null);
- myOA.initOA();
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (final Exception e)
- {
- System.err.println("Initialisation failed: " + e);
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- System.exit(0);
- }
-
jtaPropertyManager.getPropertyManager()
.setProperty(
com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION,
@@ -127,48 +121,33 @@
com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION,
"com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
- try
+ javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager
+ .transactionManager();
+
+ if (tm != null)
{
- javax.transaction.TransactionManager tm = com.arjuna.ats.jta.TransactionManager
- .transactionManager();
+ System.out.println("Starting top-level transaction.");
- if (tm != null)
- {
- System.out.println("Starting top-level transaction.");
+ tm.begin();
- tm.begin();
+ javax.transaction.Transaction theTransaction = tm
+ .getTransaction();
- javax.transaction.Transaction theTransaction = tm
- .getTransaction();
+ TWorker worker1 = new TWorker(theTransaction, true);
+ TWorker worker2 = new TWorker(theTransaction, false);
- TWorker worker1 = new TWorker(theTransaction, true);
- TWorker worker2 = new TWorker(theTransaction, false);
-
- worker1.start();
- worker2.start();
-
- worker1.join();
- worker2.join();
-
- if (worker1.success() && worker2.success())
- {
- System.out.println("\nTest completed successfully.");
- }
- else
- System.out.println("\nTest unsuccessful.");
-
- System.exit(0);
- }
- else
- {
- System.err
- .println("Error - could not get transaction manager!");
- System.exit(0);
- }
+ worker1.start();
+ worker2.start();
+
+ worker1.join();
+ worker2.join();
+
+ assertTrue( worker1.success() );
+ assertTrue( worker2.success() );
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ fail("Error - could not get transaction manager!");
}
myOA.destroy();
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/common/Synchronization.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/common/Synchronization.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/common/Synchronization.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -33,8 +33,6 @@
import com.arjuna.ats.jta.utils.JTAHelper;
-import javax.transaction.xa.*;
-
public class Synchronization implements javax.transaction.Synchronization
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/hammer/JTAHammer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/hammer/JTAHammer.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/hammer/JTAHammer.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -43,6 +43,9 @@
import java.util.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
class Worker extends Thread
{
@@ -124,80 +127,26 @@
public class JTAHammer
{
-
- public static void main (String[] args)
+ @Test
+ public void test() throws Exception
{
ORB myORB = null;
RootOA myOA = null;
- try
- {
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
- myORB.initORB(args, null);
+ myORB.initORB(new String[] {}, null);
myOA.initOA();
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
- System.exit(0);
- }
-
- String xaResource = "com.hp.mwtests.ts.jta.common.DummyCreator";
+ String xaResource = "com.hp.mwtests.ts.jta.jts.common.DummyCreator";
String connectionString = null;
int threads = 10;
int work = 100;
-
- for (int i = 0; i < args.length; i++)
- {
- if (args[i].compareTo("-connect") == 0)
- connectionString = args[i+1];
- if (args[i].compareTo("-creator") == 0)
- xaResource = args[i+1];
- if (args[i].compareTo("-threads") == 0)
- {
- try
- {
- Integer v = new Integer(args[i+1]);
-
- threads = v.intValue();
- }
- catch (Exception e)
- {
- System.err.println(e);
- }
- }
- if (args[i].compareTo("-work") == 0)
- {
- try
- {
- Integer v = new Integer(args[i+1]);
-
- work = v.intValue();
- }
- catch (Exception e)
- {
- System.err.println(e);
- }
- }
- if (args[i].compareTo("-help") == 0)
- {
- System.out.println("Usage: JTAHammer -creator <name> [-connect <string>] [-help] [-threads <number>] [-work <number>]");
- System.exit(0);
- }
- }
- if (xaResource == null)
- {
- System.err.println("Error - no resource creator specified.");
- System.exit(0);
- }
-
jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
@@ -206,19 +155,8 @@
* specification). However, for simplicity we will ignore this.
*/
- XACreator creator = null;
+ XACreator creator = (XACreator) Thread.currentThread().getContextClassLoader().loadClass(xaResource).newInstance();
- try
- {
- creator = (XACreator) Thread.currentThread().getContextClassLoader().loadClass(xaResource).newInstance();
- }
- catch (Exception e)
- {
- System.err.println(e);
-
- System.exit(0);
- }
-
number = threads;
int numberOfTransactions = threads * work;
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/lastresource/LastResourceAllowedTestCase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/lastresource/LastResourceAllowedTestCase.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/lastresource/LastResourceAllowedTestCase.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -30,14 +30,20 @@
import com.arjuna.ats.arjuna.common.Environment;
import com.hp.mwtests.ts.jta.jts.JTSTestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.Before;
+
public class LastResourceAllowedTestCase extends JTSTestCase
{
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
System.setProperty(Environment.ALLOW_MULTIPLE_LAST_RESOURCES, "true") ;
super.setUp() ;
}
+ @Test
public void testAllowed()
throws SystemException, NotSupportedException, RollbackException
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/lastresource/LastResourceDisallowTestCase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/lastresource/LastResourceDisallowTestCase.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/lastresource/LastResourceDisallowTestCase.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -29,8 +29,12 @@
import com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple;
import com.hp.mwtests.ts.jta.jts.JTSTestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class LastResourceDisallowTestCase extends JTSTestCase
{
+ @Test
public void testDisallowed()
throws SystemException, NotSupportedException, RollbackException
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/nested/SimpleNestedTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/nested/SimpleNestedTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/nested/SimpleNestedTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -42,68 +42,52 @@
import javax.transaction.Transaction;
import javax.transaction.xa.XAResource;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class SimpleNestedTest
{
- public SimpleNestedTest ()
+ @Test
+ public void test() throws Exception
{
- try
- {
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.SUPPORT_SUBTRANSACTIONS,"YES");
+ ORB myORB = null;
+ RootOA myOA = null;
- javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- transactionManager.begin();
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- transactionManager.begin();
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- Transaction currentTrans = transactionManager.getTransaction();
- TestResource res1, res2;
- currentTrans.enlistResource( res1 = new TestResource() );
- currentTrans.enlistResource( res2 = new TestResource() );
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
- currentTrans.delistResource( res2, XAResource.TMSUCCESS );
- currentTrans.delistResource( res1, XAResource.TMSUCCESS );
- transactionManager.commit();
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.SUPPORT_SUBTRANSACTIONS,"YES");
- transactionManager.commit();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- System.err.println("ERROR - "+e);
- }
- }
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- public static void main(String[] args)
- {
- ORB myORB = null;
- RootOA myOA = null;
+ transactionManager.begin();
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
-
- myORB.initORB(args, null);
- myOA.initOA();
+ transactionManager.begin();
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
+ Transaction currentTrans = transactionManager.getTransaction();
+ TestResource res1, res2;
+ currentTrans.enlistResource( res1 = new TestResource() );
+ currentTrans.enlistResource( res2 = new TestResource() );
- System.exit(0);
- }
+ currentTrans.delistResource( res2, XAResource.TMSUCCESS );
+ currentTrans.delistResource( res1, XAResource.TMSUCCESS );
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
+ transactionManager.commit();
- new SimpleNestedTest();
+ transactionManager.commit();
- myOA.destroy();
- myORB.shutdown();
+ myOA.destroy();
+ myORB.shutdown();
+
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/subordinate/SubordinateTestCase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/subordinate/SubordinateTestCase.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/subordinate/SubordinateTestCase.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -26,6 +26,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinateTransaction;
import com.arjuna.ats.internal.jta.transaction.jts.subordinate.jca.TransactionImple;
+import org.junit.Before;
+import org.junit.After;
/**
* JTAX version of the Subordinate transaction tests.
@@ -37,8 +39,9 @@
private ORB orb ;
private RootOA oa ;
-
- protected void setUp()
+
+ @Before
+ public void setUp()
throws Exception
{
System.setProperty("com.arjuna.ats.jta.jtaTMImplementation", "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
@@ -54,7 +57,8 @@
ORBManager.setPOA(oa);
}
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
if (oa != null)
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/RollbackTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/RollbackTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/RollbackTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -33,88 +33,59 @@
import com.arjuna.ats.internal.jts.ORBManager;
-import com.hp.mwtests.ts.jta.jts.common.*;
-
-import com.arjuna.ats.jta.common.*;
-import com.arjuna.ats.jta.*;
-import com.arjuna.ats.jta.utils.*;
-
-import com.arjuna.ats.arjuna.common.*;
-
import com.arjuna.orbportability.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class RollbackTest
{
- public RollbackTest ()
+ @Test
+ public void test() throws Exception
{
- try
- {
- javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- boolean passed = false;
-
- transactionManager.setTransactionTimeout(3);
-
- transactionManager.begin();
+ ORB myORB = null;
+ RootOA myOA = null;
- try
- {
- Thread.currentThread().sleep(4000);
- }
- catch (Exception ex)
- {
- }
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- try
- {
- transactionManager.rollback();
-
- passed = true;
- }
- catch (IllegalStateException ex)
- {
- passed = false;
- }
- catch (Exception ex)
- {
- passed = false;
- }
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- if (passed)
- System.err.println("Passed.");
- else
- System.err.println("Failed.");
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
+
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ boolean passed = false;
+
+ transactionManager.setTransactionTimeout(3);
+
+ transactionManager.begin();
+
+ try
+ {
+ Thread.currentThread().sleep(4000);
}
- catch (Exception e)
+ catch (Exception ex)
{
- e.printStackTrace(System.err);
- System.err.println("ERROR - "+e);
}
- }
- public static void main(String[] args)
- {
- ORB myORB = null;
- RootOA myOA = null;
+ try
+ {
+ transactionManager.rollback();
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
-
- myORB.initORB(args, null);
- myOA.initOA();
+ passed = true;
+ }
+ catch (IllegalStateException ex)
+ {
+ passed = false;
+ }
+ catch (Exception ex)
+ {
+ passed = false;
+ }
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
+ assertTrue(passed);
- System.exit(0);
- }
-
- new RollbackTest();
}
-
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/SimpleTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/SimpleTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/SimpleTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -33,85 +33,46 @@
import com.arjuna.ats.internal.jts.ORBManager;
-import com.hp.mwtests.ts.jta.jts.common.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
-import com.arjuna.ats.jta.common.*;
-import com.arjuna.ats.jta.*;
-import com.arjuna.ats.jta.utils.*;
-
-import com.arjuna.ats.arjuna.common.*;
-
import com.arjuna.orbportability.*;
public class SimpleTest
{
- public SimpleTest ()
+ @Test
+ public void test() throws Exception
{
- try
- {
- javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- boolean passed = false;
-
- transactionManager.setTransactionTimeout(3);
-
- transactionManager.begin();
+ ORB myORB = null;
+ RootOA myOA = null;
- try
- {
- Thread.currentThread().sleep(4000);
- }
- catch (Exception ex)
- {
- }
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- try
- {
- transactionManager.commit();
- }
- catch (final javax.transaction.RollbackException ex)
- {
- passed = true;
- }
- catch (Exception ex)
- {
- }
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- if (passed)
- System.err.println("Passed.");
- else
- System.err.println("Failed.");
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- System.err.println("ERROR - "+e);
- }
- }
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- public static void main(String[] args)
- {
- ORB myORB = null;
- RootOA myOA = null;
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
-
- myORB.initORB(args, null);
- myOA.initOA();
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ boolean passed = false;
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
+ transactionManager.setTransactionTimeout(3);
- System.exit(0);
- }
+ transactionManager.begin();
- new SimpleTest();
- }
+ Thread.currentThread().sleep(4000);
+ try {
+ transactionManager.commit();
+ }
+ catch (final javax.transaction.RollbackException ex)
+ {
+ passed = true;
+ }
+
+ assertTrue(passed);
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/twophase/SimpleTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/twophase/SimpleTest.java 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/twophase/SimpleTest.java 2009-07-07 11:00:15 UTC (rev 27692)
@@ -42,64 +42,46 @@
import javax.transaction.Transaction;
import javax.transaction.xa.XAResource;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
public class SimpleTest
{
- public SimpleTest ()
+ @Test
+ public void test() throws Exception
{
- try
- {
- javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ ORB myORB = null;
+ RootOA myOA = null;
- transactionManager.begin();
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
- Transaction currentTrans = transactionManager.getTransaction();
+ myORB.initORB(new String[] {}, null);
+ myOA.initOA();
- TestResource res1, res2;
- currentTrans.enlistResource( res1 = new TestResource() );
- currentTrans.enlistResource( res2 = new TestResource() );
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
- currentTrans.delistResource( res2, XAResource.TMSUCCESS );
- currentTrans.delistResource( res1, XAResource.TMSUCCESS );
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
+ jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
- transactionManager.commit();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- System.err.println("ERROR - "+e);
- }
- }
- public static void main(String[] args)
- {
- ORB myORB = null;
- RootOA myOA = null;
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
- try
- {
- myORB = ORB.getInstance("test");
- myOA = OA.getRootOA(myORB);
-
- myORB.initORB(args, null);
- myOA.initOA();
+ transactionManager.begin();
- ORBManager.setORB(myORB);
- ORBManager.setPOA(myOA);
- }
- catch (Exception e)
- {
- System.err.println("Initialisation failed: "+e);
+ Transaction currentTrans = transactionManager.getTransaction();
- System.exit(0);
- }
+ TestResource res1, res2;
+ currentTrans.enlistResource( res1 = new TestResource() );
+ currentTrans.enlistResource( res2 = new TestResource() );
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_TM_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple");
- jtaPropertyManager.getPropertyManager().setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
+ currentTrans.delistResource( res2, XAResource.TMSUCCESS );
+ currentTrans.delistResource( res1, XAResource.TMSUCCESS );
- new SimpleTest();
+ transactionManager.commit();
- myOA.destroy();
- myORB.shutdown();
+ myOA.destroy();
+ myORB.shutdown();
}
-
}
Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml 2009-07-07 10:57:02 UTC (rev 27691)
+++ labs/jbosstm/trunk/sharedbuild.xml 2009-07-07 11:00:15 UTC (rev 27692)
@@ -376,6 +376,8 @@
<echo file="${build.dir}/tests/jbossts-properties.xml"
message="<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties/>"/>
+ <copy file="${sharedbuild.base.dir}/ArjunaCore/arjuna/etc/log4j.properties" todir="${build.dir}/classes"/>
+
<mkdir dir="${build.dir}/testresults"/>
<junit printsummary="yes" fork="yes" dir="${build.dir}">
<formatter type="plain"/>
More information about the jboss-svn-commits
mailing list