[jboss-cvs] JBoss Messaging SVN: r6645 - trunk/tests/src/org/jboss/messaging/tests/integration/client.

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

Author: clebert.suconic at jboss.com
Date: 2009-05-01 11:56:58 -0400 (Fri, 01 May 2009)
New Revision: 6645

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java
Log:
just a small tweak to fix the test

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java	2009-05-01 15:53:10 UTC (rev 6644)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java	2009-05-01 15:56:58 UTC (rev 6645)
@@ -890,7 +890,7 @@
             }
          }
 
-         assertEquals(0l, server.getPostOffice().getPagingManager().getGlobalSize());
+         assertGlobalSize(server);
          assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getDeliveringCount());
          assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getMessageCount());
 
@@ -993,7 +993,7 @@
             consumer.close();
          }
 
-         assertEquals(0l, server.getPostOffice().getPagingManager().getGlobalSize());
+         assertGlobalSize(server);
          assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getDeliveringCount());
          assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getMessageCount());
 
@@ -1070,14 +1070,7 @@
 
          session.commit();
          
-         // addGlobalSize on LargeMessage is only done after the delivery, and the addSize could be asynchronous
-         long timeout = System.currentTimeMillis() + 5000;
-         while (timeout > System.currentTimeMillis() && server.getPostOffice().getPagingManager().getGlobalSize() != 0)
-         {
-            Thread.sleep(100);
-         }
-
-         assertEquals(0l, server.getPostOffice().getPagingManager().getGlobalSize());
+         assertGlobalSize(server);
          assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getDeliveringCount());
          assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getMessageCount());
 
@@ -1161,7 +1154,7 @@
 
          session.commit();
 
-         assertEquals(0l, server.getPostOffice().getPagingManager().getGlobalSize());
+         assertGlobalSize(server);
          assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getDeliveringCount());
          assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getMessageCount());
 
@@ -1339,6 +1332,19 @@
 
    // Private -------------------------------------------------------
 
+   private void assertGlobalSize(MessagingServer server) throws InterruptedException
+   {
+      // addGlobalSize on LargeMessage is only done after the delivery, and the addSize could be asynchronous
+      long timeout = System.currentTimeMillis() + 5000;
+      while (timeout > System.currentTimeMillis() && server.getPostOffice().getPagingManager().getGlobalSize() != 0)
+      {
+         Thread.sleep(100);
+      }
+
+      assertEquals(0l, server.getPostOffice().getPagingManager().getGlobalSize());
+   }
+
+
    // Inner classes -------------------------------------------------
 
 }