QPID-854

AcknowledgeTest clean up messages that are left on the queue
VMTestCase remove bogus DummyTestCase which causes problems with a lot of tests now that we check for queue cleanliness


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638799 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 21 insertions, 6 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
index db3a23cd59..a0d9f6ef8c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
@@ -160,9 +160,4 @@ public class VMTestCase extends TestCase
         return ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(_virtualhost.substring(1))
                 .getQueueRegistry().getQueue(new AMQShortString(queueName)).getMessageCount();
     }
-
-    public void testDummyinVMTestCase()
-    {
-        // keep maven happy
-    }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
index f83e6e51cb..fd76ea2ec8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
@@ -113,7 +113,7 @@ public class AcknowledgeTest extends VMTestCase
         _consumerB = _consumerSession.createConsumer(_queue);
         sendMessages(NUM_MESSAGES/2);
         int count = 0;
-        Message msg = _consumerB.receive(100);
+        Message msg = _consumerB.receive(1500);
         while (msg != null) 
         {
         	if (mode == Session.CLIENT_ACKNOWLEDGE)
@@ -131,6 +131,26 @@ public class AcknowledgeTest extends VMTestCase
         _consumerB.close();
         _consumerSession.close();
         assertEquals("Wrong number of messages on queue", NUM_MESSAGES - count, getMessageCount(_queue.getQueueName()));
+
+        // Clean up messages that may be left on the queue
+        _consumerSession = _con.createSession(transacted, mode);
+        _consumerA = _consumerSession.createConsumer(_queue);
+        msg = _consumerA.receive(1500);
+        while (msg != null)
+        {
+            if (mode == Session.CLIENT_ACKNOWLEDGE)
+            {
+                msg.acknowledge();
+            }
+            msg = _consumerA.receive(1500);
+        }
+        _consumerA.close();
+        if (transacted)
+        {
+            _consumerSession.commit();
+        }
+        _consumerSession.close();
+        super.tearDown();
     }
     
     public void test2ConsumersAutoAck() throws Exception