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

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2012-01-05 02:26:59 -0500 (Thu, 05 Jan 2012)
New Revision: 37833

Modified:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test01.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test02.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test03.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Impls/RecoveryXAResource.java
Log:
updated to work with the latest changes from branch 4_16

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test01.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test01.java	2012-01-04 18:08:52 UTC (rev 37832)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test01.java	2012-01-05 07:26:59 UTC (rev 37833)
@@ -53,6 +53,8 @@
 		{
 			System.out.println("Failed.");
 		}
+		System.clearProperty("com.arjuna.ats.jta.xaRecoveryNode");
+		System.clearProperty("XAResourceRecovery1");
 	}
 
 }

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test02.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test02.java	2012-01-04 18:08:52 UTC (rev 37832)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test02.java	2012-01-05 07:26:59 UTC (rev 37833)
@@ -45,7 +45,7 @@
 		boolean passed = false;
 		Uid bogusNodeName = new Uid();
 
-		xaRecoveryNodes.add(bogusNodeName.stringForm());
+		xaRecoveryNodes.add("2");
 
 		System.err.println("Bogus XA node name: " + bogusNodeName);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test03.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test03.java	2012-01-04 18:08:52 UTC (rev 37832)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Clients/Test03.java	2012-01-05 07:26:59 UTC (rev 37833)
@@ -82,5 +82,6 @@
 		{
 			System.out.println("Failed.");
 		}
+		System.clearProperty("XAConnectionRecovery1");
 	}
 }

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Impls/RecoveryXAResource.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Impls/RecoveryXAResource.java	2012-01-04 18:08:52 UTC (rev 37832)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery13Impls/RecoveryXAResource.java	2012-01-05 07:26:59 UTC (rev 37833)
@@ -52,12 +52,10 @@
 
 			xids[0] = new XidImple(a);
 
-			byte[] c = com.arjuna.ats.arjuna.coordinator.TxControl.getXANodeName();
+			String c = com.arjuna.ats.arjuna.coordinator.TxControl.getXANodeName();
 
-			byte[] b = new byte[1];
+			String b = "2";
 
-			b[0] = 'c';
-
 			com.arjuna.ats.arjuna.coordinator.TxControl.setXANodeName(b);
 
 			xids[1] = new XidImple(new Uid());