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

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

Author: clebert.suconic at jboss.com
Date: 2009-04-27 23:02:03 -0400 (Mon, 27 Apr 2009)
New Revision: 6590

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerWindowSizeTest.java
Log:
Fixing a race on test

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerWindowSizeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerWindowSizeTest.java	2009-04-27 21:56:54 UTC (rev 6589)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerWindowSizeTest.java	2009-04-28 03:02:03 UTC (rev 6590)
@@ -31,6 +31,7 @@
 import org.jboss.messaging.core.client.ClientSessionFactory;
 import org.jboss.messaging.core.client.MessageHandler;
 import org.jboss.messaging.core.client.impl.ClientConsumerInternal;
+import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.server.MessagingServer;
 import org.jboss.messaging.tests.util.ServiceTestBase;
 import org.jboss.messaging.utils.SimpleString;
@@ -46,7 +47,13 @@
    private final SimpleString queueA = new SimpleString("queueA");
 
    private final int TIMEOUT = 5;
+   
+   private static final Logger log = Logger.getLogger(ConsumerWindowSizeTest.class);
+   
+   private static final boolean isTrace = log.isTraceEnabled();
 
+
+
    /*
    * tests send window size. we do this by having 2 receivers on the q. since we roundrobin the consumer for delivery we
    * know if consumer 1 has received n messages then consumer 2 must have also have received n messages or at least up
@@ -299,6 +306,7 @@
       internalTestSlowConsumerNoBuffer2(false);
    }
 
+   
    public void testSlowConsumerNoBuffer2LargeMessages() throws Exception
    {
       internalTestSlowConsumerNoBuffer2(true);
@@ -698,9 +706,11 @@
                try
                {
                   String str = getTextMessage(message);
+                  if (isTrace)
+                  {
+                     log.trace("Received message " + str);
+                  }
 
-                  System.out.println("Received " + str + " on consumer");
-
                   failed = failed || !str.equals("Msg" + count);
 
                   message.acknowledge();
@@ -709,14 +719,10 @@
 
                   if (count++ == 1)
                   {
-                     System.out.println("Waiting on Consumer");
                      // it will hold here for a while
                      if (!latchDone.await(TIMEOUT, TimeUnit.SECONDS))
                      {
-                        new Exception("ClientConsuemrWindowSizeTest Handler couldn't receive signal in less than 5 seconds").printStackTrace(); // hudson
-                        // or
-                        // junit
-                        // report
+                        new Exception("ClientConsuemrWindowSizeTest Handler couldn't receive signal in less than 5 seconds").printStackTrace();
                         failed = true;
                      }
                   }
@@ -746,6 +752,15 @@
          consReceiveOneAndHold.setMessageHandler(handler);
 
          assertTrue(latchReceived.await(TIMEOUT, TimeUnit.SECONDS));
+         
+         
+         long timeout = System.currentTimeMillis() + 1000 * TIMEOUT;
+         while (consReceiveOneAndHold.getBufferSize() == 0 && System.currentTimeMillis() < timeout)
+         {
+            Thread.sleep(10);
+         }
+         
+         assertEquals(1, consReceiveOneAndHold.getBufferSize());
 
          ClientConsumer cons1 = session.createConsumer(ADDRESS);
 
@@ -754,7 +769,6 @@
             ClientMessage msg = cons1.receive(1000);
             assertNotNull("expected message at i = " + i, msg);
             String text = getTextMessage(msg);
-            System.out.println("Received message " + text);
             assertEquals("Msg" + i, text);
             msg.acknowledge();
          }
@@ -789,6 +803,7 @@
          }
          catch (Exception ignored)
          {
+            ignored.printStackTrace();
          }
 
          if (server.isStarted())