You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/08/08 15:31:38 UTC

[5/6] activemq-artemis git commit: NO-JIRA fix flaky test QueueControlTest#testResetMessagesAdded

NO-JIRA fix flaky test QueueControlTest#testResetMessagesAdded

The occasional assertion error is prevented by using Wait.assertEquals
where Assert.assertEquals was used previously.

I did not observe the timing issue on all asserts (only on the first
two), but there is no harm in replacing them all.

    java.lang.AssertionError:
    Expected :2
    Actual   :1


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/23a30b61
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/23a30b61
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/23a30b61

Branch: refs/heads/master
Commit: 23a30b61587a0b78c8bbc210e42bc0a8b18d03d6
Parents: fbb622a
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue Aug 7 17:10:00 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 8 11:31:23 2018 -0400

----------------------------------------------------------------------
 .../tests/integration/management/QueueControlTest.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23a30b61/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index fb0a3e5..46d360e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -2311,17 +2311,17 @@ public class QueueControlTest extends ManagementTestBase {
 
       ClientProducer producer = session.createProducer(address);
       producer.send(session.createMessage(durable));
-      Assert.assertEquals(1, getMessagesAdded(queueControl));
+      Wait.assertEquals(1, () -> getMessagesAdded(queueControl));
       producer.send(session.createMessage(durable));
-      Assert.assertEquals(2, getMessagesAdded(queueControl));
+      Wait.assertEquals(2, () -> getMessagesAdded(queueControl));
 
       consumeMessages(2, session, queue);
 
-      Assert.assertEquals(2, getMessagesAdded(queueControl));
+      Wait.assertEquals(2, () -> getMessagesAdded(queueControl));
 
       queueControl.resetMessagesAdded();
 
-      Assert.assertEquals(0, getMessagesAdded(queueControl));
+      Wait.assertEquals(0, () -> getMessagesAdded(queueControl));
 
       session.deleteQueue(queue);
    }