You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2008/03/19 12:49:02 UTC
svn commit: r638799 - in
/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test:
VMTestCase.java unit/ack/AcknowledgeTest.java
Author: aidan
Date: Wed Mar 19 04:48:56 2008
New Revision: 638799
URL: http://svn.apache.org/viewvc?rev=638799&view=rev
Log:
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
Modified:
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java?rev=638799&r1=638798&r2=638799&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java (original)
+++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java Wed Mar 19 04:48:56 2008
@@ -160,9 +160,4 @@
return ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(_virtualhost.substring(1))
.getQueueRegistry().getQueue(new AMQShortString(queueName)).getMessageCount();
}
-
- public void testDummyinVMTestCase()
- {
- // keep maven happy
- }
}
Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java?rev=638799&r1=638798&r2=638799&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java (original)
+++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java Wed Mar 19 04:48:56 2008
@@ -113,7 +113,7 @@
_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 @@
_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