Author: robbie Date: Fri Feb 3 10:32:30 2012 New Revision: 1240065 URL: http://svn.apache.org/viewvc?rev=1240065&view=rev Log: QPID-3781: fix system test MaxDeliveryCountTest.testAsynchronousDupsOkSession by ensuring the queue depth check syncs first
Applied patch from Andrew MacBean <[email protected]> and Oleksandr Rudyy<[email protected]> Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java?rev=1240065&r1=1240064&r2=1240065&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java Fri Feb 3 10:32:30 2012 @@ -298,7 +298,7 @@ public class MaxDeliveryCountTest extend consumer.close(); //check the source queue is now empty - assertEquals("The queue should have 0 msgs left", 0, ((AMQSession<?,?>) clientSession).getQueueDepth(checkQueue)); + assertEquals("The queue should have 0 msgs left", 0, ((AMQSession<?,?>) clientSession).getQueueDepth(checkQueue, true)); //check the DLQ has the required number of rejected-without-requeue messages verifyDLQdepth(redeliverMsgs.size(), clientSession, durableSub); @@ -341,7 +341,7 @@ public class MaxDeliveryCountTest extend } assertEquals("The DLQ should have " + expected + " msgs on it", expected, - ((AMQSession<?,?>) clientSession).getQueueDepth(checkQueueDLQ)); + ((AMQSession<?,?>) clientSession).getQueueDepth(checkQueueDLQ, true)); } private void verifyDLQcontent(Connection clientConnection, List<Integer> redeliverMsgs, String destName, boolean durableSub) throws JMSException --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
