Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test needs more wait time on redelivery check since the initial 

redelivery delay is 4 seconds and the sleep was only 3s + 500ms receive.
This commit is contained in:
Timothy Bish 2015-06-10 18:21:31 -04:00
parent 789eb9abf9
commit ce16735bb0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java
View File

@ -17,13 +17,14 @@
package org.apache.activemq.broker; package org.apache.activemq.broker;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.jms.Message; import javax.jms.Message;
import javax.jms.MessageConsumer; import javax.jms.MessageConsumer;
import javax.jms.MessageProducer; import javax.jms.MessageProducer;
import javax.jms.Session; import javax.jms.Session;
import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQPrefetchPolicy;
import org.apache.activemq.RedeliveryPolicy; import org.apache.activemq.RedeliveryPolicy;
import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap; import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap;
import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy; import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy;
@ -71,13 +72,13 @@ public class BrokerRedeliveryTest extends org.apache.activemq.TestSupport {
LOG.info("got: " + message); LOG.info("got: " + message);
consumerSession.rollback(); consumerSession.rollback();
for (int i=0;i<maxBrokerRedeliveriesToValidate;i++) { for (int i = 0; i < maxBrokerRedeliveriesToValidate; i++) {
Message shouldBeNull = consumer.receive(500); Message shouldBeNull = consumer.receive(500);
assertNull("did not get message after redelivery count exceeded: " + shouldBeNull, shouldBeNull); assertNull("did not get message after redelivery count exceeded: " + shouldBeNull, shouldBeNull);
TimeUnit.SECONDS.sleep(3); TimeUnit.SECONDS.sleep(4);
Message brokerRedeliveryMessage = consumer.receive(500); Message brokerRedeliveryMessage = consumer.receive(1500);
LOG.info("got: " + brokerRedeliveryMessage); LOG.info("got: " + brokerRedeliveryMessage);
assertNotNull("got message via broker redelivery after delay", brokerRedeliveryMessage); assertNotNull("got message via broker redelivery after delay", brokerRedeliveryMessage);
assertEquals("message matches", message.getStringProperty("data"), brokerRedeliveryMessage.getStringProperty("data")); assertEquals("message matches", message.getStringProperty("data"), brokerRedeliveryMessage.getStringProperty("data"));
@ -144,9 +145,9 @@ public class BrokerRedeliveryTest extends org.apache.activemq.TestSupport {
private void startBroker(boolean deleteMessages) throws Exception { private void startBroker(boolean deleteMessages) throws Exception {
broker = new BrokerService(); broker = new BrokerService();
broker.setPersistent(false);
broker.setSchedulerSupport(true); broker.setSchedulerSupport(true);
RedeliveryPlugin redeliveryPlugin = new RedeliveryPlugin(); RedeliveryPlugin redeliveryPlugin = new RedeliveryPlugin();
RedeliveryPolicy brokerRedeliveryPolicy = new RedeliveryPolicy(); RedeliveryPolicy brokerRedeliveryPolicy = new RedeliveryPolicy();
@ -166,13 +167,14 @@ public class BrokerRedeliveryTest extends org.apache.activemq.TestSupport {
broker.start(); broker.start();
} }
private void stopBroker() throws Exception { private void stopBroker() throws Exception {
if (broker != null) if (broker != null) {
broker.stop(); broker.stop();
broker = null; broker = null;
} }
}
@Override
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQConnectionFactory("vm://localhost"); return new ActiveMQConnectionFactory("vm://localhost");
} }