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

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

Author: clebert.suconic at jboss.com
Date: 2010-01-26 19:38:25 -0500 (Tue, 26 Jan 2010)
New Revision: 99968

Modified:
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
Log:
changes

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-27 00:33:06 UTC (rev 99967)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-27 00:38:25 UTC (rev 99968)
@@ -89,37 +89,8 @@
    protected void tearDown() throws Exception
    {
 	   super.tearDown();
-	   //drainQueue();
 	   disconnect();
-	   
    }
-   
-   // Emptys out all the messages in a queue
-   protected void drainQueue() throws Exception
-   {
-	   
-	  if (queueConnection == null)
-	  {
-		  return;
-	  }
-      Session session = queueConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-      Queue queue = (Queue) context.lookup(TEST_QUEUE);
-
-      MessageConsumer receiver = session.createConsumer(queue);
-      Message message = receiver.receive(50);
-      int c = 0;
-      while (message != null)
-      {
-         message = receiver.receive(50);
-         c++;
-      }
-
-      if (c != 0)
-         getLog().debug("  Drained " + c + " messages from the queue");
-
-      session.close();
-   }
-
    protected void connect() throws Exception
    {
       if (context == null)
@@ -174,8 +145,6 @@
 
       queueConnection.start();
 
-      drainQueue();
-
       Session session = queueConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       Queue queue = (Queue) context.lookup(TEST_QUEUE);
       MessageProducer sender = session.createProducer(queue);
@@ -492,7 +461,6 @@
 
       connect();
       queueConnection.start();
-      drainQueue();
       final CountDown counter1 = new CountDown(3);
 
       Session session = queueConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -578,7 +546,6 @@
       //sender.send(queue, message, DeliveryMode.PERSISTENT, 9, 0);
 
       sender.close();
-      drainQueue();
       disconnect();
       getLog().debug("MessageListener test passed");
    }
@@ -1044,7 +1011,6 @@
       try
       {
          queueConnection.start();
-         drainQueue();
          queueConnection.stop();
 
          Session session = queueConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -1085,7 +1051,6 @@
       try
       {
          queueConnection.start();
-         drainQueue();
 
          Session session = queueConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
          Queue queue = (Queue) context.lookup(TEST_QUEUE);
@@ -1182,7 +1147,6 @@
       try
       {
          queueConnection.start();
-         drainQueue();
          queueConnection.stop();
 
          Session session = queueConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);