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

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

Author: clebert.suconic at jboss.com
Date: 2007-07-09 17:24:59 -0400 (Mon, 09 Jul 2007)
New Revision: 2861

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/manual/ManualPagingSoakTest.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-265 - Manual soak tests

Modified: trunk/tests/src/org/jboss/test/messaging/jms/manual/ManualPagingSoakTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/manual/ManualPagingSoakTest.java	2007-07-09 21:23:49 UTC (rev 2860)
+++ trunk/tests/src/org/jboss/test/messaging/jms/manual/ManualPagingSoakTest.java	2007-07-09 21:24:59 UTC (rev 2861)
@@ -32,6 +32,7 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
+import javax.jms.JMSException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
@@ -60,7 +61,7 @@
       Properties props1 = new Properties();
       
       props1.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
-      props1.put(Context.PROVIDER_URL, "jnp://localhost:1199");
+      props1.put(Context.PROVIDER_URL, "jnp://localhost:1099");
       props1.put(Context.URL_PKG_PREFIXES, "org.jnp.interfaces");
       
       ic1 = new InitialContext(props1);
@@ -87,14 +88,24 @@
       try
       {
          conn = cf.createConnection();
+
+         Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
          
-         Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-              
+         conn.start();
+         MessageConsumer cons = sess.createConsumer(queue);
+         receiveMessages(cons);
+         cons.close();
+         cons = null;
+
+         conn.stop();
+
+
+
          MessageProducer prod = sess.createProducer(queue);
          
          prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
          
-         final int NUM_MESSAGES = 1000000;
+         final int NUM_MESSAGES = 150000;
          
          byte[] bytes = new byte[2048];
          
@@ -114,26 +125,43 @@
          
          log.info("Receiving");
          
-         MessageConsumer cons = sess.createConsumer(queue);
+         cons = sess.createConsumer(queue);
          
          conn.start();
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = (TextMessage)cons.receive(2000);
-            
-            assertNotNull(tm);
-            
-            if (i % 1000 == 0)
-            {
-               log.info("Received " + i);
-            }
-         }
-                  
+
+         int numberOfMessages = receiveMessages(cons);
+
+
+         log.info("Received " + numberOfMessages + " messages");
+
+         assertEquals(NUM_MESSAGES, numberOfMessages);   
+
+
+
       }
       finally
       {      
          if (conn != null) conn.close();
       }
-   }       
+   }
+
+   private int receiveMessages(MessageConsumer cons)
+      throws JMSException
+   {
+      TextMessage msg = null;
+
+      int numberOfMessages=0;
+      do
+         {
+            msg = (TextMessage)cons.receive(20000);
+
+         if (msg!=null) numberOfMessages++;
+
+         if (numberOfMessages % 1000 == 0)
+         {
+            log.info("Received " + numberOfMessages);
+         }
+      } while (msg!=null);
+      return numberOfMessages;
+   }
 }