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

[AMQ-6824] remove time dependency in test assertion

This commit is contained in:
gtully 2017-09-28 11:34:03 +01:00
parent e5b7c9fba4
commit 578eacab45
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
View File

@ -48,6 +48,7 @@ import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.broker.region.TopicSubscription; import org.apache.activemq.broker.region.TopicSubscription;
import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.Wait;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -251,7 +252,7 @@ public class JMSConsumerTest extends JmsTestSupport {
final List<Subscription> subscriptions = getDestinationConsumers(broker, destination); final List<Subscription> subscriptions = getDestinationConsumers(broker, destination);
assertTrue("prefetch extension back to 0", assertTrue("prefetch extension..",
subscriptions.stream(). subscriptions.stream().
filter(s -> s instanceof TopicSubscription). filter(s -> s instanceof TopicSubscription).
mapToInt(s -> ((TopicSubscription)s).getPrefetchExtension().get()). mapToInt(s -> ((TopicSubscription)s).getPrefetchExtension().get()).
@ -260,11 +261,15 @@ public class JMSConsumerTest extends JmsTestSupport {
assertNull(consumer.receiveNoWait()); assertNull(consumer.receiveNoWait());
message.acknowledge(); message.acknowledge();
assertTrue("prefetch extension back to 0", assertTrue("prefetch extension back to 0", Wait.waitFor(new Wait.Condition() {
subscriptions.stream(). @Override
public boolean isSatisified() throws Exception {
return subscriptions.stream().
filter(s -> s instanceof TopicSubscription). filter(s -> s instanceof TopicSubscription).
mapToInt(s -> ((TopicSubscription)s).getPrefetchExtension().get()). mapToInt(s -> ((TopicSubscription)s).getPrefetchExtension().get()).
allMatch(e -> e == 0)); allMatch(e -> e == 0);
}
}));
} }
@ -299,11 +304,15 @@ public class JMSConsumerTest extends JmsTestSupport {
assertNull(consumer.receiveNoWait()); assertNull(consumer.receiveNoWait());
message.acknowledge(); message.acknowledge();
assertTrue("prefetch extension back to 0", assertTrue("prefetch extension back to 0", Wait.waitFor(new Wait.Condition() {
subscriptions.stream(). @Override
public boolean isSatisified() throws Exception {
return subscriptions.stream().
filter(s -> s instanceof QueueSubscription). filter(s -> s instanceof QueueSubscription).
mapToInt(s -> ((QueueSubscription)s).getPrefetchExtension().get()). mapToInt(s -> ((QueueSubscription)s).getPrefetchExtension().get()).
allMatch(e -> e == 0)); allMatch(e -> e == 0);
}
}));
} }
public void initCombosForTestDurableConsumerSelectorChange() { public void initCombosForTestDurableConsumerSelectorChange() {