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

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

Author: clebert.suconic at jboss.com
Date: 2009-03-03 15:42:19 -0500 (Tue, 03 Mar 2009)
New Revision: 5980

Modified:
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java
Log:
I know JMSTests will be gone, but since I had already changed this.. why not commit it...

Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java	2009-03-03 20:27:57 UTC (rev 5979)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java	2009-03-03 20:42:19 UTC (rev 5980)
@@ -163,8 +163,6 @@
 				Message m = mc.receive();
 	         assertNotNull(m);
 			}
-			
-			Thread.sleep(1000);
 
 			browser = session.createBrowser(queue1);
 			en = browser.getEnumeration();

Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java	2009-03-03 20:27:57 UTC (rev 5979)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java	2009-03-03 20:42:19 UTC (rev 5980)
@@ -103,18 +103,12 @@
          prod.send(tm);
       }
 
-      int count = 0;
-      while (true)
+      for (int i = 0; i < NUM_MESSAGES; i++)
       {
          TextMessage tm = (TextMessage)sub1.receive(500);
-         if (tm == null)
-         {
-            break;
-         }
+         assertNotNull(tm);
          assertEquals("hello", tm.getText());
-         count++;
       }
-      assertEquals(NUM_MESSAGES, count);
 
       Message m = sub2.receive(200);
       
@@ -122,18 +116,12 @@
       
       conn2.start();
       
-      count = 0;
-      while (true)
+      for (int i = 0; i < NUM_MESSAGES; i++)
       {
          TextMessage tm = (TextMessage)sub2.receive(500);
-         if (tm == null)
-         {
-            break;
-         }
+         assertNotNull(tm);
          assertEquals("hello", tm.getText());
-         count++;
       }
-      assertEquals(NUM_MESSAGES, count);
 
       log.debug("all messages received by sub2");