Author: aidan
Date: Mon May 12 04:14:45 2008
New Revision: 655470
URL: http://svn.apache.org/viewvc?rev=655470&view=rev
Log:
QPID-839 fix test to avoid potential race condition and general incorrectness
Modified:
incubator/qpid/branches/M2.1.x/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
Modified:
incubator/qpid/branches/M2.1.x/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.x/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java?rev=655470&r1=655469&r2=655470&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.x/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
(original)
+++
incubator/qpid/branches/M2.1.x/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
Mon May 12 04:14:45 2008
@@ -106,24 +106,9 @@
if (message.getIntProperty("count") == MSG_COUNT)
{
- try
- {
- long remainingMessages = ((AMQSession)
clientSession).getQueueDepth((AMQDestination) _queue);
- if(remainingMessages != 0)
- {
-
- assertEquals("The queue should have 0 msgs
left, seen " + _msgCount + " messages.", 0,
getMessageCount(_queue.getQueueName()));
- }
- }
- catch (AMQException e)
- {
- assertNull("Got AMQException", e);
- }
- finally
- {
- //This is the last message so release test.
- _awaitCompletion.countDown();
- }
+ assertEquals("Should have recieved all messages
now", _msgCount, MSG_COUNT);
+ //This is the last message so release test.
+ _awaitCompletion.countDown();
}
}
