[jboss-cvs] JBossAS SVN: r71653 - branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmessaging/test.

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

Author: clebert.suconic at jboss.com
Date: 2008-04-02 19:09:22 -0400 (Wed, 02 Apr 2008)
New Revision: 71653

Modified:
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
Log:
Changes on test to avoid occasional failures

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java	2008-04-02 22:50:40 UTC (rev 71652)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java	2008-04-02 23:09:22 UTC (rev 71653)
@@ -119,17 +119,18 @@
       for (int i = 0; i < iterationCount; i++)
          sender.send(message, persistence, 4, 0);
 
+      Thread.sleep(2000); // to let async sends to complete
       session.close();
 
       session = queueConnection.createQueueSession(false, Session.CLIENT_ACKNOWLEDGE);
       queue = (Queue)context.lookup(TEST_QUEUE);
       QueueReceiver receiver = session.createReceiver(queue);
       queueConnection.start();
-      message = receiver.receive(50);
+      message = receiver.receive(1000);
       int c = 0;
       while (message != null)
       {
-         message = receiver.receive(50);
+         message = receiver.receive(1000);
          c++;
       }
       assertTrue("Should have received all data unacked", c == iterationCount);
@@ -139,6 +140,9 @@
       queueConnection = queueFactory.createQueueConnection();
 
       assertTrue("Queue should be full", drainQueue() == iterationCount);
+      
+      
+      
 
    }
 
@@ -166,6 +170,7 @@
       for (int i = 0; i < iterationCount; i++)
          sender.send(message, persistence, 4, 0);
 
+      Thread.sleep(2000);
       session.close();
 
       QueueSession session1 = queueConnection.createQueueSession(false, Session.CLIENT_ACKNOWLEDGE);
@@ -215,6 +220,8 @@
       }
       finally
       {
+    	  try{session.close();} catch (Throwable ignored){}
+
     	  try
     	  {
     		  session1.close();
@@ -258,7 +265,9 @@
       for (int i = 0; i < iterationCount; i++)
          sender.send(message, persistence, 4, 0);
 
-      session.close();
+      // Non Persistent Messages are Asynchronous on JBM, closing the session too quickly after a send could be a problem
+      // The connection will be closed at the end
+      // session.close();
 
       QueueConnectionFactory queueFactory = (QueueConnectionFactory)context.lookup(QUEUE_FACTORY);
       QueueConnection queueConnection1 = queueFactory.createQueueConnection();
@@ -284,8 +293,8 @@
 	      
 	      do
 	      {
-	    	  messageConsumer1 = receiver1.receive(100);
-	    	  messageConsumer2 = receiver2.receive(100);
+	    	  messageConsumer1 = receiver1.receive(1000);
+	    	  messageConsumer2 = receiver2.receive(1000);
 	    	  if (messageConsumer1 != null)
 	    	  {
 	    		  c1 ++;
@@ -310,6 +319,7 @@
       }
       finally
       {
+    	  try{session.close();} catch (Throwable ignored){}
     	  try{queueConnection1.close();} catch (Throwable ignored){}
     	  try{queueConnection2.close();} catch (Throwable ignored){}
       }
@@ -353,6 +363,10 @@
                   {
                      publisher.publish(message, persistence, 4, 0);
                   }
+                  
+                  
+                  // allow some time for Non Persistent messages
+                  Thread.sleep(2000); 
 
                   session.close();
                }
@@ -694,7 +708,7 @@
       Queue queue = (Queue)context.lookup(TEST_QUEUE);
 
       QueueReceiver receiver = session.createReceiver(queue);
-      receiver.receive();
+      assertNotNull(receiver.receive(10000));
       session.close();
       getLog().debug("Got Synch Message");
    }
@@ -710,6 +724,7 @@
       Message message = session.createMessage();
       sender.send(message);
 
+      Thread.sleep(1000);
       session.close();
       getLog().debug("Sent Synch Message");
    }