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

This closes #2226

This commit is contained in:
Clebert Suconic 2018-08-08 11:33:31 -04:00
parent 9109fc1604 c1a191c547
commit 7480452bdd
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-junit/src/main/java/org/apache/activemq/artemis/junit/Wait.java
View File

@ -52,7 +52,11 @@ public class Wait {
} }
public static void assertEquals(long size, LongCondition condition, long timeout) throws Exception { public static void assertEquals(long size, LongCondition condition, long timeout) throws Exception {
boolean result = waitFor(() -> condition.getCount() == size, timeout); assertEquals(size, condition, timeout, SLEEP_MILLIS);
}
public static void assertEquals(Long size, LongCondition condition, long timeout, long sleepMillis) throws Exception {
boolean result = waitFor(() -> condition.getCount() == size, timeout, sleepMillis);
if (!result) { if (!result) {
Assert.fail(size + " != " + condition.getCount()); Assert.fail(size + " != " + condition.getCount());

20
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
View File

@ -2632,25 +2632,25 @@ public class QueueControlTest extends ManagementTestBase {
Supplier<Number> durableCount, Supplier<Number> durableSize) throws Exception { Supplier<Number> durableCount, Supplier<Number> durableSize) throws Exception {
//make sure count stat equals message count //make sure count stat equals message count
Assert.assertTrue(Wait.waitFor(() -> count.get().longValue() == messageCount, 3, 100)); Assert.assertTrue(Wait.waitFor(() -> count.get().longValue() == messageCount, 3 * 1000, 100));
if (messageCount > 0) { if (messageCount > 0) {
//verify size stat greater than 0 //verify size stat greater than 0
Assert.assertTrue(Wait.waitFor(() -> size.get().longValue() > 0, 3, 100)); Assert.assertTrue(Wait.waitFor(() -> size.get().longValue() > 0, 3 * 1000, 100));
//If durable then make sure durable count and size are correct //If durable then make sure durable count and size are correct
if (durable) { if (durable) {
Assert.assertTrue(Wait.waitFor(() -> durableCount.get().longValue() == messageCount, 3, 100)); Wait.assertEquals(messageCount, () -> durableCount.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> durableSize.get().longValue() > 0, 3, 100)); Assert.assertTrue(Wait.waitFor(() -> durableSize.get().longValue() > 0, 3 * 1000, 100));
} else { } else {
Assert.assertTrue(Wait.waitFor(() -> durableCount.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> durableCount.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> durableSize.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> durableSize.get().longValue(), 3 * 1000, 100);
} }
} else { } else {
Assert.assertTrue(Wait.waitFor(() -> count.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> count.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> durableCount.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> durableCount.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> size.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> size.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> durableSize.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> durableSize.get().longValue(), 3 * 1000, 100);
} }
} }
} }