QPID-1524 : Added a catch to print out the message order to help rule out message loss potential in the test.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@725663 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 27 insertions, 10 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
index 42d0d6fe2d..aff7af6952 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.FieldTable;
+import junit.framework.AssertionFailedError;
 
 public class AMQPriorityQueueTest extends SimpleAMQQueueTest
 {
@@ -60,17 +61,33 @@ public class AMQPriorityQueueTest extends SimpleAMQQueueTest
         Thread.sleep(150);
         
         ArrayList<QueueEntry> msgs = _subscription.getMessages();
-        assertEquals(new Long(1L), msgs.get(0).getMessage().getMessageId());
-        assertEquals(new Long(6L), msgs.get(1).getMessage().getMessageId());
-        assertEquals(new Long(8L), msgs.get(2).getMessage().getMessageId());
+        try
+        {
+            assertEquals(new Long(1L), msgs.get(0).getMessage().getMessageId());
+            assertEquals(new Long(6L), msgs.get(1).getMessage().getMessageId());
+            assertEquals(new Long(8L), msgs.get(2).getMessage().getMessageId());
+
+            assertEquals(new Long(2L), msgs.get(3).getMessage().getMessageId());
+            assertEquals(new Long(5L), msgs.get(4).getMessage().getMessageId());
+            assertEquals(new Long(7L), msgs.get(5).getMessage().getMessageId());
+
+            assertEquals(new Long(3L), msgs.get(6).getMessage().getMessageId());
+            assertEquals(new Long(4L), msgs.get(7).getMessage().getMessageId());
+            assertEquals(new Long(9L), msgs.get(8).getMessage().getMessageId());
+        }
+        catch (AssertionFailedError afe)
+        {
+            // Show message order on failure.
+            int index = 1;
+            for (QueueEntry qe : msgs)
+            {
+                System.err.println(index + ":" + qe.getMessage().getMessageId());
+                index++;
+            }
+
+            throw afe;
+        }
 
-        assertEquals(new Long(2L), msgs.get(3).getMessage().getMessageId());
-        assertEquals(new Long(5L), msgs.get(4).getMessage().getMessageId());
-        assertEquals(new Long(7L), msgs.get(5).getMessage().getMessageId());
-        
-        assertEquals(new Long(3L), msgs.get(6).getMessage().getMessageId());
-        assertEquals(new Long(4L), msgs.get(7).getMessage().getMessageId());
-        assertEquals(new Long(9L), msgs.get(8).getMessage().getMessageId());
     }
 
     protected AMQMessage createMessage(Long id, byte i) throws AMQException