diff options
Diffstat (limited to 'java/client/test/src')
| -rw-r--r-- | java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java | 13 | ||||
| -rw-r--r-- | java/client/test/src/org/apache/qpid/ack/RecoverTest.java | 9 |
2 files changed, 15 insertions, 7 deletions
diff --git a/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java b/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java index ae057c0e82..68460682ec 100644 --- a/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java +++ b/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java @@ -22,6 +22,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.xml.DOMConfigurator; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.store.TestableMemoryMessageStore; @@ -68,9 +69,11 @@ public class DisconnectAndRedeliverTest TestableMemoryMessageStore store = (TestableMemoryMessageStore) ApplicationRegistry.getInstance().getMessageStore(); - Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); + Session consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE); AMQQueue queue = new AMQQueue("someQ", "someQ", false, false); MessageConsumer consumer = consumerSession.createConsumer(queue); + //force synch to ensure the consumer has resulted in a bound queue + ((AMQSession) consumerSession).declareExchangeSynch("amq.direct", "direct"); Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "/test"); Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE); @@ -103,15 +106,15 @@ public class DisconnectAndRedeliverTest con.start(); tm = (TextMessage) consumer.receive(3000); - Assert.assertEquals(tm.getText(), "msg2"); + Assert.assertEquals("msg2", tm.getText()); tm = (TextMessage) consumer.receive(3000); - Assert.assertEquals(tm.getText(), "msg3"); + Assert.assertEquals("msg3", tm.getText()); tm = (TextMessage) consumer.receive(3000); - Assert.assertEquals(tm.getText(), "msg4"); + Assert.assertEquals("msg4", tm.getText()); _logger.info("Received redelivery of three messages. Acknowledging last message"); tm.acknowledge(); @@ -157,6 +160,8 @@ public class DisconnectAndRedeliverTest Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); Queue queue = new AMQQueue("someQ", "someQ", false, true); MessageConsumer consumer = consumerSession.createConsumer(queue); + //force synch to ensure the consumer has resulted in a bound queue + ((AMQSession) consumerSession).declareExchangeSynch("amq.direct", "direct"); Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "/test"); Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE); diff --git a/java/client/test/src/org/apache/qpid/ack/RecoverTest.java b/java/client/test/src/org/apache/qpid/ack/RecoverTest.java index cd7c43d4a1..22b7b41140 100644 --- a/java/client/test/src/org/apache/qpid/ack/RecoverTest.java +++ b/java/client/test/src/org/apache/qpid/ack/RecoverTest.java @@ -20,6 +20,7 @@ package org.apache.qpid.ack; import junit.framework.JUnit4TestAdapter; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.vmbroker.AMQVMBrokerCreationException; import org.apache.log4j.Logger; @@ -55,6 +56,8 @@ public class RecoverTest Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); Queue queue = new AMQQueue("someQ", "someQ", false, true); MessageConsumer consumer = consumerSession.createConsumer(queue); + //force synch to ensure the consumer has resulted in a bound queue + ((AMQSession) consumerSession).declareExchangeSynch("amq.direct", "direct"); Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "/test"); Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE); @@ -80,13 +83,13 @@ public class RecoverTest // no ack for last three messages so when I call recover I expect to get three messages back consumerSession.recover(); tm = (TextMessage) consumer.receive(3000); - Assert.assertEquals(tm.getText(), "msg2"); + Assert.assertEquals("msg2", tm.getText()); tm = (TextMessage) consumer.receive(3000); - Assert.assertEquals(tm.getText(), "msg3"); + Assert.assertEquals("msg3", tm.getText()); tm = (TextMessage) consumer.receive(3000); - Assert.assertEquals(tm.getText(), "msg4"); + Assert.assertEquals("msg4", tm.getText()); _logger.info("Received redelivery of three messages. Acknowledging last message"); tm.acknowledge(); |