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

Fix timing dependent assertion. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195988 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2011-11-01 13:26:26 +00:00
parent 419fde4457
commit 4ab5e910cb
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1853Test.java
View File

@ -42,6 +42,8 @@ import org.apache.activemq.ActiveMQSession;
import org.apache.activemq.RedeliveryPolicy; import org.apache.activemq.RedeliveryPolicy;
import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.util.Wait;
import org.apache.activemq.util.Wait.Condition;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -75,6 +77,7 @@ public class AMQ1853Test {
public void setUp() throws Exception { public void setUp() throws Exception {
broker = BrokerFactory.createBroker(new URI("broker:()/localhost?persistent=false")); broker = BrokerFactory.createBroker(new URI("broker:()/localhost?persistent=false"));
broker.setUseJmx(false); broker.setUseJmx(false);
broker.setDeleteAllMessagesOnStartup(true);
broker.start(); broker.start();
broker.waitUntilStarted(); broker.waitUntilStarted();
} }
@ -115,10 +118,16 @@ public class AMQ1853Test {
producerAllFail.getLatch().await(); producerAllFail.getLatch().await();
LOG.info("producer successful, count = " + producerAllFail.getLatch().getCount()); LOG.info("producer successful, count = " + producerAllFail.getLatch().getCount());
assertTrue("message list size = " + messageList.size(), totalNumberMessages == messageList.size());
LOG.info("final message list size = " + messageList.size()); LOG.info("final message list size = " + messageList.size());
assertTrue("message list size = " + messageList.size() + " exptected:" + totalNumberMessages,
Wait.waitFor(new Condition() {
@Override
public boolean isSatisified() throws Exception {
return totalNumberMessages == messageList.size();
}
}));
consumerAllFail.getLatch().await(); consumerAllFail.getLatch().await();
LOG.info("consumerAllFail successful, count = " + consumerAllFail.getLatch().getCount()); LOG.info("consumerAllFail successful, count = " + consumerAllFail.getLatch().getCount());
@ -126,8 +135,8 @@ public class AMQ1853Test {
Iterator<String> keys = messageList.keySet().iterator(); Iterator<String> keys = messageList.keySet().iterator();
for (AtomicInteger counter : messageList.values()) { for (AtomicInteger counter : messageList.values()) {
String message = keys.next(); String message = keys.next();
assertTrue("for message " + message + " counter = " + counter.get(), counter.get() == maxRedeliveries + 1);
LOG.info("final count for message " + message + " counter = " + counter.get()); LOG.info("final count for message " + message + " counter = " + counter.get());
assertTrue("for message " + message + " counter = " + counter.get(), counter.get() == maxRedeliveries + 1);
} }
assertFalse(consumerAllFail.messageReceiptIsOrdered()); assertFalse(consumerAllFail.messageReceiptIsOrdered());