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

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

Author: timfox
Date: 2007-08-10 03:23:35 -0400 (Fri, 10 Aug 2007)
New Revision: 3000

Modified:
   trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java
Log:
Don't removeAllMessages


Modified: trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java	2007-08-09 18:57:47 UTC (rev 2999)
+++ trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java	2007-08-10 07:23:35 UTC (rev 3000)
@@ -147,13 +147,7 @@
    	
       Integer messageCount = (Integer)ServerManagement.getServer(server).getAttribute(destObjectName, "MessageCount");
       
-      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);
-      }
+      assertEquals(0, messageCount.intValue());
    }
    
    protected void checkEmpty(Topic topic) throws Exception
@@ -162,13 +156,7 @@
    	
       Integer messageCount = (Integer)ServerManagement.getAttribute(destObjectName, "AllMessageCount"); 
       
-      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);
-      }     
+      assertEquals(0, messageCount.intValue());    
    }
          
    protected void checkNoSubscriptions(Topic topic) throws Exception