[jboss-cvs] JBoss Messaging SVN: r4375 - trunk/tests/jms-tests/src/org/jboss/test/messaging/jms.

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

Author: jmesnil
Date: 2008-06-02 08:19:23 -0400 (Mon, 02 Jun 2008)
New Revision: 4375

Modified:
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
Log:
- in testRedelMessageListener2(), display the message order if the listener has failed
- replaced Latch by Java 5 CountdownLatch


Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java	2008-06-01 17:24:58 UTC (rev 4374)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java	2008-06-02 12:19:23 UTC (rev 4375)
@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -3727,7 +3728,8 @@
 	
 	      listener.waitForMessages();
 	
-	      assertFalse(listener.failed);
+	      log.debug(listener.messageOrder);
+	      assertFalse(listener.messageOrder, listener.failed);
 	
 	      conn.close();
 	      
@@ -4069,8 +4071,9 @@
       private int count;
 
       private boolean failed;
+      private String messageOrder = "message sequence is: ";
 
-      private Latch latch = new Latch();
+      private CountDownLatch latch = new CountDownLatch(1);
 
       private boolean transacted;
 
@@ -4082,7 +4085,7 @@
       /** Blocks the calling thread until at least a message is received */
       public void waitForMessages() throws InterruptedException
       {
-         latch.acquire();
+         latch.await();
       }
 
       public void onMessage(Message m)
@@ -4093,22 +4096,25 @@
 
             log.trace("Got message:" + tm.getText() + " count is " + count);
 
+            messageOrder += tm.getText() + " ";
             if (count == 0)
             {
                if (!("a".equals(tm.getText())))
                {
                   log.trace("Should be a but was " + tm.getText());
                   failed = true;
-                  latch.release();
+                  latch.countDown();
                }
                if (transacted)
                {
                   sess.rollback();
+                  messageOrder += "RB ";
                   log.trace("rollback() called");
                }
                else
                {
                   log.trace("Calling recover");
+                  messageOrder += "RC ";
                   sess.recover();
                   log.trace("recover() called");
                }
@@ -4120,12 +4126,12 @@
                {
                   log.trace("Should be a but was " + tm.getText());
                   failed = true;
-                  latch.release();
+                  latch.countDown();
                }
                if (!tm.getJMSRedelivered())
                {
                   failed = true;
-                  latch.release();
+                  latch.countDown();
                }
             }
             if (count == 2)
@@ -4134,7 +4140,7 @@
                {
                   log.trace("Should be b but was " + tm.getText());
                   failed = true;
-                  latch.release();
+                  latch.countDown();
                }
             }
             if (count == 3)
@@ -4143,7 +4149,7 @@
                {
                   log.trace("Should be c but was " + tm.getText());
                   failed = true;
-                  latch.release();
+                  latch.countDown();
                }
                if (transacted)
                {
@@ -4154,7 +4160,7 @@
                   log.trace("Acknowledging session");
                   tm.acknowledge();
                }
-               latch.release();
+               latch.countDown();
             }
             count++;
          }
@@ -4162,7 +4168,7 @@
          {
             log.trace("Caught JMSException", e);
             failed = true;
-            latch.release();
+            latch.countDown();
          }
       }
    }