From 200bee1a5fe2958997eb73fd116bd069d67b24d2 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Fri, 8 Nov 2019 10:21:27 -0600 Subject: [PATCH] NO-JIRA make a few AMQP tests more robust --- .../integration/amqp/AmqpMessageRoutingTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpMessageRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpMessageRoutingTest.java index 92d1787f4b..774b3a2642 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpMessageRoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpMessageRoutingTest.java @@ -63,8 +63,8 @@ public class AmqpMessageRoutingTest extends JMSClientTestSupport { sendMessages("anycast://" + addressA, 1); - assertEquals(1, server.locateQueue(SimpleString.toSimpleString(queueA)).getMessageCount() + server.locateQueue(SimpleString.toSimpleString(queueB)).getMessageCount()); - assertEquals(0, server.locateQueue(SimpleString.toSimpleString(queueC)).getMessageCount()); + Wait.assertEquals(1, () -> (server.locateQueue(SimpleString.toSimpleString(queueA)).getMessageCount() + server.locateQueue(SimpleString.toSimpleString(queueB)).getMessageCount())); + Wait.assertEquals(0, server.locateQueue(SimpleString.toSimpleString(queueC))::getMessageCount); } @Test(timeout = 60000) @@ -82,8 +82,8 @@ public class AmqpMessageRoutingTest extends JMSClientTestSupport { sendMessages(addressA, 1, RoutingType.ANYCAST); - assertEquals(1, server.locateQueue(SimpleString.toSimpleString(queueA)).getMessageCount() + server.locateQueue(SimpleString.toSimpleString(queueB)).getMessageCount()); - assertEquals(0, server.locateQueue(SimpleString.toSimpleString(queueC)).getMessageCount()); + Wait.assertEquals(1, () -> (server.locateQueue(SimpleString.toSimpleString(queueA)).getMessageCount() + server.locateQueue(SimpleString.toSimpleString(queueB)).getMessageCount())); + Wait.assertEquals(0, server.locateQueue(SimpleString.toSimpleString(queueC))::getMessageCount); } @Test(timeout = 60000) @@ -120,8 +120,8 @@ public class AmqpMessageRoutingTest extends JMSClientTestSupport { sendMessages(addressA, 1, RoutingType.MULTICAST); - assertEquals(0, server.locateQueue(SimpleString.toSimpleString(queueA)).getMessageCount()); - assertEquals(2, server.locateQueue(SimpleString.toSimpleString(queueC)).getMessageCount() + server.locateQueue(SimpleString.toSimpleString(queueB)).getMessageCount()); + Wait.assertEquals(0, server.locateQueue(SimpleString.toSimpleString(queueA))::getMessageCount); + Wait.assertEquals(2, () -> (server.locateQueue(SimpleString.toSimpleString(queueC)).getMessageCount() + server.locateQueue(SimpleString.toSimpleString(queueB)).getMessageCount())); } /**