[activemq-artemis] branch main updated: NO-JIRA fixing intermittent test failure

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new f03b775ac5 NO-JIRA fixing intermittent test failure
f03b775ac5 is described below

commit f03b775ac5ab4a85c8fd1d950683914fef96a2e3
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Wed Jun 7 18:04:11 2023 -0400

    NO-JIRA fixing intermittent test failure
---
 .../tests/integration/addressing/MulticastTest.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/MulticastTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/MulticastTest.java
index afe1900a61..1213e8c809 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/MulticastTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/MulticastTest.java
@@ -31,6 +31,7 @@ import org.apache.activemq.artemis.core.server.Queue;
 import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.tests.util.Wait;
 import org.apache.activemq.artemis.utils.TimeUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -89,12 +90,14 @@ public class MulticastTest extends ActiveMQTestBase {
          m.getBodyBuffer().writeString("AnyCast" + i);
          producer.send(m);
       }
-      assertNull(consumer1.receive(200));
-      assertNull(consumer2.receive(200));
+      assertNull(consumer1.receiveImmediate());
+      assertNull(consumer2.receiveImmediate());
+
       session.commit();
 
-      assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num == 
q1.getMessageCount()));
-      assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num == 
q2.getMessageCount()));
+      Wait.assertEquals(num, q1::getMessageCount, 5000);
+      Wait.assertEquals(num, q2::getMessageCount, 5000);
+
 
       ClientConsumer[] consumers = new ClientConsumer[] {consumer1, consumer2};
       for (int i = 0; i < consumers.length; i++) {
@@ -105,10 +108,10 @@ public class MulticastTest extends ActiveMQTestBase {
             logger.debug("consumer{} received: {}", i, 
m.getBodyBuffer().readString());
          }
 
-         assertNull(consumers[i].receive(200));
+         assertNull(consumers[i].receiveImmediate());
          session.commit();
 
-         assertNull(consumers[i].receive(200));
+         assertNull(consumers[i].receiveImmediate());
       }
 
       q1.deleteQueue();