svn commit: r530047 - /incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java

[ritchiem]

Author: ritchiem
Date: Wed Apr 18 08:09:28 2007
New Revision: 530047

URL: http://svn.apache.org/viewvc?view=rev&rev=530047
Log:
Fix for intermittent CRT expected <1> but was <2> errors

Modified:
    
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java

Modified: 
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java?view=diff&rev=530047&r1=530046&r2=530047
==============================================================================
--- 
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
 (original)
+++ 
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
 Wed Apr 18 08:09:28 2007
@@ -400,16 +400,29 @@
         _logger.info("receiving result");
         result = _consumer.receive(1000);
         assertNotNull("test message was consumed and rolled back, but is 
gone", result);
-        assertEquals("1", ((TextMessage) result).getText());
-        assertTrue("Messasge is not marked as redelivered" + result, 
result.getJMSRedelivered());
+        if (result.getJMSRedelivered())
+        {
+            assertEquals("1", ((TextMessage) result).getText());
 
-        result = _consumer.receive(1000);
-        assertNotNull("test message was consumed and rolled back, but is 
gone", result);
-        assertEquals("2", ((TextMessage) result).getText());
-        assertTrue("Messasge is not marked as redelivered" + result, 
result.getJMSRedelivered());
+            result = _consumer.receive(1000);
+            assertNotNull("test message was consumed and rolled back, but is 
gone", result);
+            assertEquals("2", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered" + result, 
result.getJMSRedelivered());
+        }
+        else
+        {
+            assertEquals("2", ((TextMessage) result).getText());
+            assertTrue("Messasge is marked as redelivered" + result, 
!result.getJMSRedelivered());
+
+            result = _consumer.receive(1000);
+            assertNotNull("test message was consumed and rolled back, but is 
gone", result);
+            assertEquals("1", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered" + result, 
result.getJMSRedelivered());
 
+        }
         result = _consumer.receive(1000);
         assertNull("test message should be null:" + result, result);
+
     }