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

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

Author: timfox
Date: 2007-08-07 11:57:21 -0400 (Tue, 07 Aug 2007)
New Revision: 2970

Modified:
   trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java
Log:
tests speedup


Modified: trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java	2007-08-07 15:27:56 UTC (rev 2969)
+++ trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java	2007-08-07 15:57:21 UTC (rev 2970)
@@ -132,7 +132,13 @@
    	
       Integer messageCount = (Integer)ServerManagement.getAttribute(destObjectName, "MessageCount");
        
-      assertEquals(0, messageCount.intValue());      
+      if (messageCount.intValue() != 0)
+      {
+      	//Delete before failing - so as not to make all other tests fail
+      	removeAllMessages(queue.getQueueName(), true, 0);
+      	
+      	fail("Message count for queue " + queue.getQueueName() + " on server is " + messageCount);
+      }    
    }
    
    protected void checkEmpty(Queue queue, int server) throws Exception
@@ -143,6 +149,9 @@
       
       if (messageCount.intValue() != 0)
       {
+      	//Delete before failing - so as not to make all other tests fail
+      	removeAllMessages(queue.getQueueName(), true, 0);
+      	
       	fail("Message count for queue " + queue.getQueueName() + " on server " + server + " is " + messageCount);
       }
    }
@@ -153,7 +162,13 @@
    	
       Integer messageCount = (Integer)ServerManagement.getAttribute(destObjectName, "AllMessageCount"); 
       
-      assertEquals(0, messageCount.intValue());      
+      if (messageCount.intValue() != 0)
+      {
+      	//Delete before failing - so as not to make all other tests fail
+      	removeAllMessages(topic.getTopicName(), true, 0);
+      	
+      	fail("Message count for queue " + topic.getTopicName() + " is " + messageCount);
+      }     
    }
          
    protected void checkNoSubscriptions(Topic topic) throws Exception