Repository: qpid-jms Updated Branches: refs/heads/master 0e3128c10 -> feb6792ae
QPIDJMS-98: use a listener rather than a sleep to ensure messages arrive, use more conservative receive timeouts to avoid issues on slower shared CI services Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/feb6792a Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/feb6792a Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/feb6792a Branch: refs/heads/master Commit: feb6792aea230a753eaadb0241ae6c65cd220253 Parents: 0e3128c Author: Robert Gemmell <[email protected]> Authored: Thu Aug 27 17:10:42 2015 +0100 Committer: Robert Gemmell <[email protected]> Committed: Thu Aug 27 17:11:00 2015 +0100 ---------------------------------------------------------------------- .../jms/integration/SessionIntegrationTest.java | 4 +- .../qpid/jms/JmsMessageIntegrityTest.java | 12 ++-- .../qpid/jms/consumer/JmsAutoAckTest.java | 2 +- .../qpid/jms/consumer/JmsClientAckTest.java | 20 +++---- .../jms/consumer/JmsMessageConsumerTest.java | 4 +- .../qpid/jms/consumer/JmsMessageGroupTest.java | 4 +- .../qpid/jms/consumer/JmsZeroPrefetchTest.java | 2 +- .../transactions/JmsTransactedConsumerTest.java | 60 +++++++++++++++----- .../transactions/JmsTransactedSessionTest.java | 2 +- .../JmsTransactionRedeliveryPolicyTest.java | 6 +- 10 files changed, 73 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java index 9881bf2..cc61286 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java @@ -885,7 +885,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { MessageConsumer messageConsumer = session.createConsumer(queue); for (int i = 1; i <= consumeCount; i++) { - Message receivedMessage = messageConsumer.receive(1000); + Message receivedMessage = messageConsumer.receive(3000); assertNotNull(receivedMessage); assertTrue(receivedMessage instanceof TextMessage); @@ -1039,7 +1039,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { MessageConsumer messageConsumer = session.createConsumer(queue); for (int i = 1; i <= consumeCount; i++) { - Message receivedMessage = messageConsumer.receive(1000); + Message receivedMessage = messageConsumer.receive(3000); assertNotNull(receivedMessage); assertTrue(receivedMessage instanceof TextMessage); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java index 300f339..7844537 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java @@ -68,7 +68,7 @@ public class JmsMessageIntegrityTest extends AmqpTestSupport { producer.send(message); } { - TextMessage message = (TextMessage)consumer.receive(1000); + TextMessage message = (TextMessage)consumer.receive(3000); assertNotNull(message); assertEquals("Hi", message.getText()); } @@ -93,7 +93,7 @@ public class JmsMessageIntegrityTest extends AmqpTestSupport { producer.send(message); } { - BytesMessage message = (BytesMessage)consumer.receive(1000); + BytesMessage message = (BytesMessage)consumer.receive(3000); assertNotNull(message); assertEquals(16, message.getBodyLength()); } @@ -117,7 +117,7 @@ public class JmsMessageIntegrityTest extends AmqpTestSupport { producer.send(message); } { - ObjectMessage message = (ObjectMessage)consumer.receive(1000); + ObjectMessage message = (ObjectMessage)consumer.receive(3000); assertNotNull(message); assertEquals(payload, message.getObject()); } @@ -138,7 +138,7 @@ public class JmsMessageIntegrityTest extends AmqpTestSupport { producer.send(message); } { - BytesMessage message = (BytesMessage)consumer.receive(1000); + BytesMessage message = (BytesMessage)consumer.receive(3000); assertNotNull(message); assertTrue(message.readBoolean()); @@ -165,7 +165,7 @@ public class JmsMessageIntegrityTest extends AmqpTestSupport { producer.send(message); } { - StreamMessage message = (StreamMessage)consumer.receive(1000); + StreamMessage message = (StreamMessage)consumer.receive(3000); assertNotNull(message); // Invalid conversion should throw exception and not move the stream position. @@ -201,7 +201,7 @@ public class JmsMessageIntegrityTest extends AmqpTestSupport { producer.send(message); } { - MapMessage message = (MapMessage)consumer.receive(1000); + MapMessage message = (MapMessage)consumer.receive(3000); assertNotNull(message); assertTrue(message.getBoolean("boolKey")); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java index 73f61bf..a82edb0 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java @@ -60,7 +60,7 @@ public class JmsAutoAckTest extends AmqpTestSupport { final QueueViewMBean proxy = getProxyToQueue(name.getMethodName()); assertEquals(1, proxy.getQueueSize()); - assertNotNull("Failed to receive any message.", consumer.receive(2000)); + assertNotNull("Failed to receive any message.", consumer.receive(3000)); assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java index d6b2a42..ca33b1b 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java @@ -67,7 +67,7 @@ public class JmsClientAckTest extends AmqpTestSupport { // Consume the message... MessageConsumer consumer = session.createConsumer(queue); - Message msg = consumer.receive(1000); + Message msg = consumer.receive(3000); assertNotNull(msg); msg.acknowledge(); @@ -98,11 +98,11 @@ public class JmsClientAckTest extends AmqpTestSupport { // Consume the message... MessageConsumer consumer = session.createConsumer(queue); - Message msg = consumer.receive(1000); + Message msg = consumer.receive(3000); assertNotNull(msg); - msg = consumer.receive(1000); + msg = consumer.receive(3000); assertNotNull(msg); - msg = consumer.receive(1000); + msg = consumer.receive(3000); assertNotNull(msg); msg.acknowledge(); @@ -129,7 +129,7 @@ public class JmsClientAckTest extends AmqpTestSupport { // Consume the message...but don't ack it. MessageConsumer consumer = session.createConsumer(queue); - Message msg = consumer.receive(1000); + Message msg = consumer.receive(3000); assertNotNull(msg); session.close(); @@ -138,7 +138,7 @@ public class JmsClientAckTest extends AmqpTestSupport { // Consume the message...and this time we ack it. session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); consumer = session.createConsumer(queue); - msg = consumer.receive(2000); + msg = consumer.receive(3000); assertNotNull(msg); msg.acknowledge(); @@ -216,7 +216,7 @@ public class JmsClientAckTest extends AmqpTestSupport { // Now we consume and ack the Message. session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); consumer = session.createConsumer(queue); - Message msg = consumer.receive(2000); + Message msg = consumer.receive(3000); assertNotNull(msg); msg.acknowledge(); @@ -339,7 +339,7 @@ public class JmsClientAckTest extends AmqpTestSupport { MessageConsumer consumer = session.createConsumer(queue); for(int i = 1; i <= consumeBeforeRecover; i++) { - Message message = consumer.receive(1000); + Message message = consumer.receive(3000); assertNotNull(message); assertEquals("Unexpected message number", i, message.getIntProperty(QpidJmsTestSupport.MESSAGE_NUMBER)); } @@ -352,7 +352,7 @@ public class JmsClientAckTest extends AmqpTestSupport { // again after the recover and then the remainder should follow List<Integer> messageNumbers = new ArrayList<Integer>(); for (int i = 1; i <= totalCount; i++) { - Message message = consumer.receive(1000); + Message message = consumer.receive(3000); assertNotNull("Failed to receive message: " + i, message); int msgNum = message.getIntProperty(QpidJmsTestSupport.MESSAGE_NUMBER); messageNumbers.add(msgNum); @@ -517,7 +517,7 @@ public class JmsClientAckTest extends AmqpTestSupport { session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); MessageConsumer consumer = session.createConsumer(queue); for (int i = 0; i < MESSAGE_COUNT; ++i) { - Message msg = consumer.receive(2000); + Message msg = consumer.receive(3000); assertNotNull(msg); msg.acknowledge(); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java index 0038f9e..da57789 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java @@ -92,7 +92,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport { final QueueViewMBean proxy = getProxyToQueue(name.getMethodName()); assertEquals(1, proxy.getQueueSize()); - assertNotNull("Failed to receive any message.", consumer.receive(2000)); + assertNotNull("Failed to receive any message.", consumer.receive(3000)); assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @@ -118,7 +118,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport { final TopicViewMBean proxy = getProxyToTopic(name.getMethodName()); assertEquals(1, proxy.getEnqueueCount()); - assertNotNull("Failed to receive any message.", consumer.receive(2000)); + assertNotNull("Failed to receive any message.", consumer.receive(3000)); assertTrue("Published message not consumed.", Wait.waitFor(new Wait.Condition() { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageGroupTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageGroupTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageGroupTest.java index 6138631..96b74db 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageGroupTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageGroupTest.java @@ -58,7 +58,7 @@ public class JmsMessageGroupTest extends AmqpTestSupport { // All the messages should have been sent down connection 1.. just get // the first 3 for (int i = 0; i < 3; i++) { - TextMessage m1 = (TextMessage) consumer1.receive(500); + TextMessage m1 = (TextMessage) consumer1.receive(3000); assertNotNull("m1 is null for index: " + i, m1); assertEquals(m1.getIntProperty("JMSXGroupSeq"), i + 1); } @@ -74,7 +74,7 @@ public class JmsMessageGroupTest extends AmqpTestSupport { // The last messages should now go the the second consumer. for (int i = 0; i < 1; i++) { - TextMessage m1 = (TextMessage) consumer2.receive(500); + TextMessage m1 = (TextMessage) consumer2.receive(3000); assertNotNull("m1 is null for index: " + i, m1); assertEquals(m1.getIntProperty("JMSXGroupSeq"), 4 + i); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java index a6c98e4..28f5e67 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java @@ -292,7 +292,7 @@ public class JmsZeroPrefetchTest extends AmqpTestSupport { // consume and rollback - increase redelivery counter on message session = connection.createSession(true, Session.SESSION_TRANSACTED); MessageConsumer consumer = session.createConsumer(queue); - Message message = consumer.receive(2000); + Message message = consumer.receive(3000); assertNotNull(message); session.rollback(); session.close(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java index 797b765..2657a23 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java @@ -20,8 +20,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.net.URI; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -34,6 +37,8 @@ import javax.jms.TextMessage; import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.qpid.jms.JmsConnection; +import org.apache.qpid.jms.JmsConnectionListener; +import org.apache.qpid.jms.message.JmsInboundMessageDispatch; import org.apache.qpid.jms.support.AmqpTestSupport; import org.apache.qpid.jms.support.QpidJmsTestSupport; import org.junit.Test; @@ -97,7 +102,7 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { MessageConsumer consumer = session.createConsumer(queue); - Message msg = consumer.receive(2000); + Message msg = consumer.receive(3000); assertNotNull(msg); session.rollback(); @@ -119,14 +124,14 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { Queue queue = session.createQueue(name.getMethodName()); MessageConsumer consumer = session.createConsumer(queue); - Message message = consumer.receive(1000); + Message message = consumer.receive(3000); assertNotNull(message); session.commit(); assertEquals(1, proxy.getQueueSize()); // rollback so we can get that last message again. - message = consumer.receive(1000); + message = consumer.receive(3000); assertNotNull(message); session.rollback(); @@ -154,9 +159,9 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { Queue queue = session.createQueue(name.getMethodName()); MessageConsumer consumer = session.createConsumer(queue); - Message message = consumer.receive(1000); + Message message = consumer.receive(3000); assertNotNull(message); - message = consumer.receive(1000); + message = consumer.receive(3000); assertNotNull(message); session.rollback(); @@ -186,9 +191,9 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { Queue queue = session.createQueue(name.getMethodName()); MessageConsumer consumer = session.createConsumer(queue); - Message message = consumer.receive(1000); + Message message = consumer.receive(3000); assertNotNull(message); - message = consumer.receive(1000); + message = consumer.receive(3000); assertNotNull(message); session.rollback(); @@ -222,7 +227,7 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { MessageConsumer consumer = session.createConsumer(queue); for(int i = 1; i <= consumeBeforeRollback; i++) { - Message message = consumer.receive(1000); + Message message = consumer.receive(3000); assertNotNull(message); assertEquals("Unexpected message number", i, message.getIntProperty(QpidJmsTestSupport.MESSAGE_NUMBER)); } @@ -235,7 +240,7 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { // again after the rollback and then the remainder should follow List<Integer> messageNumbers = new ArrayList<Integer>(); for(int i = 1; i <= totalCount; i++) { - Message message = consumer.receive(1000); + Message message = consumer.receive(3000); assertNotNull("Failed to receive message: " + i, message); int msgNum = message.getIntProperty(QpidJmsTestSupport.MESSAGE_NUMBER); messageNumbers.add(msgNum); @@ -275,7 +280,7 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { // Create a new consumer consumer = session.createConsumer(queue); - message = (TextMessage) consumer.receive(1000); + message = (TextMessage) consumer.receive(3000); session.commit(); assertEquals(0, proxy.getQueueSize()); @@ -329,6 +334,31 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { connection.start(); + final CountDownLatch messagesArrived = new CountDownLatch(4); + ((JmsConnection) connection).addConnectionListener(new JmsConnectionListener() { + + @Override + public void onInboundMessage(JmsInboundMessageDispatch envelope) { + messagesArrived.countDown(); + } + + @Override + public void onConnectionRestored(URI remoteURI) { + } + + @Override + public void onConnectionInterrupted(URI remoteURI) { + } + + @Override + public void onConnectionFailure(Throwable error) { + } + + @Override + public void onConnectionEstablished(URI remoteURI) { + } + }); + MessageProducer pr = session.createProducer(queue); for (int i = 1; i <= 2; i++) { Message m = session.createTextMessage("TestMessage" + i); @@ -352,21 +382,21 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { } session.commit(); - // Wait for them to arrive at the consumer - Thread.sleep(3000); + // Wait for them all to arrive at the consumer + assertTrue("Messages didnt all arrive in given time.", messagesArrived.await(5, TimeUnit.SECONDS)); // Receive the other messages. Expect higher priority messages first. - msg = consumer.receive(50); + msg = consumer.receive(3000); assertNotNull(msg); assertEquals(3, msg.getIntProperty(MSG_NUM)); assertEquals(5, msg.getJMSPriority()); - msg = consumer.receive(50); + msg = consumer.receive(3000); assertNotNull(msg); assertEquals(4, msg.getIntProperty(MSG_NUM)); assertEquals(5, msg.getJMSPriority()); - msg = consumer.receive(50); + msg = consumer.receive(3000); assertNotNull(msg); assertEquals(2, msg.getIntProperty(MSG_NUM)); assertEquals(Message.DEFAULT_PRIORITY, msg.getJMSPriority()); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedSessionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedSessionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedSessionTest.java index b8a5eb3..ab6e563 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedSessionTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedSessionTest.java @@ -155,7 +155,7 @@ public class JmsTransactedSessionTest extends AmqpTestSupport { // consume all messages for (int i = 1; i <= messageCount; i++) { - msg = (TextMessage) consumer.receive(2000); + msg = (TextMessage) consumer.receive(3000); if (msg == null) { fail("receive() returned null, message " + i + " was not received"); } else if (!msg.getText().equals("Message " + i)) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/feb6792a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java index d647d12..e79f410 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java @@ -66,7 +66,7 @@ public class JmsTransactionRedeliveryPolicyTest extends AmqpTestSupport { // Consume the message for the first time. Message incoming = null; for (int i = 0; i < MSG_COUNT; ++i) { - incoming = consumer.receive(2000); + incoming = consumer.receive(3000); assertNotNull(incoming); assertFalse(incoming.getJMSRedelivered()); assertTrue(incoming instanceof TextMessage); @@ -78,7 +78,7 @@ public class JmsTransactionRedeliveryPolicyTest extends AmqpTestSupport { assertEquals(MSG_COUNT, queueView.getQueueSize()); for (int j = 0; j < MSG_COUNT; ++j) { - incoming = consumer.receive(2000); + incoming = consumer.receive(3000); assertNotNull(incoming); assertTrue(incoming.getJMSRedelivered()); assertTrue(incoming instanceof TextMessage); @@ -124,7 +124,7 @@ public class JmsTransactionRedeliveryPolicyTest extends AmqpTestSupport { // Consume the message for the first time. Message incoming = null; for (int i = 0; i < MSG_COUNT; ++i) { - incoming = consumer.receive(2000); + incoming = consumer.receive(3000); assertNotNull(incoming); assertFalse(incoming.getJMSRedelivered()); assertTrue(incoming instanceof TextMessage); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
