[jboss-svn-commits] JBL Code SVN: r37801 - labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed.

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

Author: tomjenkinson
Date: 2011-12-14 16:31:20 -0500 (Wed, 14 Dec 2011)
New Revision: 37801

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
Log:
JBTM-895 simplified the test

Modified: labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java	2011-12-14 21:28:34 UTC (rev 37800)
+++ labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java	2011-12-14 21:31:20 UTC (rev 37801)
@@ -134,7 +134,9 @@
 		tearDown();
 		setup();
 		assertTrue(completionCounter.getCommitCount("2000") == 0);
+		assertTrue(completionCounter.getRollbackCount("2000") == 0);
 		assertTrue(completionCounter.getCommitCount("1000") == 0);
+		assertTrue(completionCounter.getRollbackCount("1000") == 0);
 		final Phase2CommitAborted phase2CommitAborted = new Phase2CommitAborted();
 		{
 			Thread thread = new Thread(new Runnable() {
@@ -241,23 +243,14 @@
 		reboot("2000");
 		reboot("3000");
 		
-		assertTrue(completionCounter.getCommitCount("2000") == 0);
-		assertTrue(completionCounter.getRollbackCount("2000") == 0);
-		assertTrue(completionCounter.getCommitCount("1000") == 0);
-		assertTrue(completionCounter.getRollbackCount("1000") == 0);
 		getLocalServer("2000").doRecoveryManagerScan(true);
-		assertTrue(completionCounter.getCommitCount("1000") == 0);
-		assertTrue("Rollbacks at 1000: " + completionCounter.getRollbackCount("1000"), completionCounter.getRollbackCount("1000") == 2);
-		assertTrue(completionCounter.getCommitCount("2000") == 0);
-		assertTrue(completionCounter.getRollbackCount("2000") == 1);
 
-		System.out.println("RECOVERING SECOND SERVER");
-		
 		getLocalServer("1000").doRecoveryManagerScan(true);
+		
 		assertTrue(completionCounter.getCommitCount("1000") == 0);
 		assertTrue(completionCounter.getRollbackCount("1000") == 3);
 		assertTrue(completionCounter.getCommitCount("2000") == 0);
-		assertTrue("Server 2000 rollback count: " + completionCounter.getRollbackCount("2000"), completionCounter.getRollbackCount("2000") == 3);
+		assertTrue(completionCounter.getRollbackCount("2000") == 3);
 
 	}