diff options
| -rw-r--r-- | java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java index 8e9d56816c..463946e14a 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java @@ -1,5 +1,8 @@ package org.apache.qpid.test.client; +import org.apache.qpid.AMQException; +import org.apache.qpid.client.AMQDestination; +import org.apache.qpid.client.AMQSession; import org.apache.qpid.test.VMTestCase; import javax.jms.Connection; @@ -69,14 +72,14 @@ public class DupsOkTest extends VMTestCase producerConnection.close(); } - public void testDupsOK() throws NamingException, JMSException, InterruptedException + public void testDupsOK() throws NamingException, JMSException, InterruptedException, AMQException { //Create Client Connection clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); clientConnection.start(); - Session clientSession = clientConnection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE); + final Session clientSession = clientConnection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE); MessageConsumer consumer = clientSession.createConsumer(_queue); @@ -105,13 +108,17 @@ public class DupsOkTest extends VMTestCase { try { - int remainingMessages = getMessageCount(_queue.getQueueName()); + 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. @@ -144,9 +151,9 @@ public class DupsOkTest extends VMTestCase // consumer.close(); + assertEquals("The queue should have 0 msgs left", 0, ((AMQSession) clientSession).getQueueDepth((AMQDestination) _queue)); clientConnection.close(); - assertEquals("The queue should have 0 msgs left", 0, getMessageCount(_queue.getQueueName())); } |