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

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

Author: clebert.suconic at jboss.com
Date: 2007-02-27 17:53:55 -0500 (Tue, 27 Feb 2007)
New Revision: 2477

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
Log:
Simplifying test

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2007-02-27 21:38:43 UTC (rev 2476)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2007-02-27 22:53:55 UTC (rev 2477)
@@ -52,8 +52,6 @@
       Connection conn0 = null;
       Connection conn1 = null;
 
-      int numberOfMessagesReceived = 0;
-
       try
       {
 
@@ -81,19 +79,13 @@
 
          TextMessage msg;
 
-         do
+         for (int i = 0; i < 5; i++)
          {
             msg = (TextMessage)consumer0.receive(5000);
-            if (msg!=null)
-            {
-               log.info("msg = " + msg.getText());
-               numberOfMessagesReceived++;
-            }
-            if (numberOfMessagesReceived==5)
-            {
-               break;
-            }
-         } while (msg!=null);
+            assertNotNull(msg);
+            log.info("msg = " + msg.getText());
+            assertEquals("message " + i, msg.getText());
+         }
 
          session0.commit();
          consumer0.close();
@@ -112,7 +104,7 @@
 
          producer1.setDeliveryMode(DeliveryMode.PERSISTENT);
 
-         for (int i=10; i<20; i++)
+         for (int i = 10; i < 20; i++)
          {
             producer1.send(session0.createTextMessage("message " + i));
          }
@@ -120,19 +112,18 @@
          ServerManagement.killAndWait(1);
 
          consumer0 = session0.createConsumer(queue[0]);
-         do
+
+         for (int i=5;i<20;i++)
          {
             msg = (TextMessage)consumer0.receive(5000);
-            if (msg!=null)
-            {
-               log.info("msg = " + msg.getText());
-               numberOfMessagesReceived++;
-            }
-         } while (msg!=null);
+            assertNotNull(msg);
+            log.info("msg = " + msg.getText());
+            assertEquals("message " + i,msg.getText());
+         }
 
-         session0.commit();
+         assertNull(consumer0.receive(5000));
 
-         assertEquals(20, numberOfMessagesReceived);
+         session0.commit();
       }
       finally
       {
@@ -182,19 +173,13 @@
 
          TextMessage msg;
 
-         do
+         for (int i = 0; i < 5; i++)
          {
             msg = (TextMessage)consumer0.receive(5000);
-            if (msg!=null)
-            {
-               log.info("msg = " + msg.getText());
-               numberOfMessagesReceived++;
-            }
-            if (numberOfMessagesReceived==5)
-            {
-               break;
-            }
-         } while (msg!=null);
+            assertNotNull(msg);
+            log.info("msg = " + msg.getText());
+            assertEquals("message " + i, msg.getText());
+         }
 
          session0.commit();
          consumer0.close();
@@ -220,30 +205,24 @@
 
          session1.commit();
 
-         MessageConsumer consumer1 = session1.createConsumer(queue[0]);
+         // creates another consumer... before killing the server
+         MessageConsumer consumer1 = session1.createConsumer(queue[1]);
 
          ServerManagement.killAndWait(1);
+         waitForFailoverComplete(1, conn1);
 
-         TextMessage msgAfterKill = (TextMessage)consumer1.receive(1000);
-         assertNotNull(msgAfterKill);
-         session1.commit();
-
-         consumer1.close();
-
          consumer0 = session0.createConsumer(queue[0]);
-         do
+         for (int i = 5; i < 20; i++)
          {
             msg = (TextMessage)consumer0.receive(5000);
-            if (msg!=null)
-            {
-               log.info("msg = " + msg.getText());
-               numberOfMessagesReceived++;
-            }
-         } while (msg!=null);
+            assertNotNull(msg);
+            log.info("msg = " + msg.getText());
+            assertEquals("message " + i, msg.getText());
+         }
 
-         session0.commit();
+         assertNull(consumer0.receive(5000));
 
-         assertEquals(19, numberOfMessagesReceived);
+         session0.commit();
       }
       finally
       {