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

[ritchiem]

Author: ritchiem
Date: Tue May  1 05:28:03 2007
New Revision: 534036

URL: http://svn.apache.org/viewvc?view=rev&rev=534036
Log:
QPID-461 Update to CommitRollbackTest. Ensuring messages received have the 
correct redelivered value, regardless of order. Different test case also was 
problematic.

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=534036&r1=534035&r2=534036
==============================================================================
--- 
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
 Tue May  1 05:28:03 2007
@@ -359,17 +359,37 @@
 
         _logger.info("receiving result");
         Message 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.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.getJMSRedelivered());
+
+
+        if (((TextMessage) result).getText().equals("2"))
+        {
+            assertTrue("Messasge is marked as redelivered", 
!result.getJMSRedelivered());
+
+            result = _consumer.receive(1000);
+            assertEquals("1", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", 
result.getJMSRedelivered());
+        }
+        else
+        {
+            assertEquals("1", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", 
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.getJMSRedelivered());
+        }
 
         result = _consumer.receive(1000);
 
+        if (result != null)
+        {
+            assertEquals("2", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", 
result.getJMSRedelivered());
+            result = _consumer.receive(1000);
+        }
+
         assertNull("test message should be null", result);
     }
 
@@ -411,7 +431,7 @@
         else // or it will be msg 2 arriving the first time due to latency.  
         {
             _logger.info("Message 2 wasn't prefetched so wasn't rejected");
-            assertEquals("2", ((TextMessage) result).getText());            
+            assertEquals("2", ((TextMessage) result).getText());
         }
 
         result = _consumer.receive(1000);