You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/02/10 16:50:38 UTC

[activemq-artemis] branch master updated: NO-JIRA some Wait.assertEquals

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0487e71  NO-JIRA some Wait.assertEquals
     new 67022a0  This closes #2979
0487e71 is described below

commit 0487e712e2b0cbf30cac0103477a59f16e0f826c
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Feb 10 09:25:06 2020 -0500

    NO-JIRA some Wait.assertEquals
---
 .../integration/amqp/AmqpTransactionTest.java      | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
index e35635d..84a4927 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
@@ -264,7 +264,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
 
       session.commit();
 
-      assertEquals(0, queue.getMessageCount());
+      Wait.assertEquals(0, queue::getMessageCount);
 
       connection.close();
    }
@@ -295,7 +295,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
 
       session.rollback();
 
-      assertEquals(1, queue.getMessageCount());
+      Wait.assertEquals(1, queue::getMessageCount);
 
       sender.close();
       connection.close();
@@ -332,7 +332,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
       AmqpReceiver receiver3 = session3.createReceiver(getQueueName());
 
       final Queue queue = getProxyToQueue(getQueueName());
-      assertEquals(3, queue.getMessageCount());
+      Wait.assertEquals(3, queue::getMessageCount);
 
       // Begin the transaction that all senders will operate in.
       txnSession.begin();
@@ -351,11 +351,11 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
       message2.accept(txnSession);
       message3.accept(txnSession);
 
-      assertEquals(3, queue.getMessageCount());
+      Wait.assertEquals(3, queue::getMessageCount);
 
       txnSession.commit();
 
-      assertEquals(0, queue.getMessageCount());
+      Wait.assertEquals(0, queue::getMessageCount);
    }
 
    @Test(timeout = 60000)
@@ -389,7 +389,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
       AmqpReceiver receiver3 = session3.createReceiver(getQueueName());
 
       final Queue queue = getProxyToQueue(getQueueName());
-      assertEquals(3, queue.getMessageCount());
+      Wait.assertEquals(3, queue::getMessageCount);
 
       // Begin the transaction that all senders will operate in.
       txnSession.begin();
@@ -408,11 +408,11 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
       message2.accept(txnSession);
       message3.accept(txnSession);
 
-      assertEquals(3, queue.getMessageCount());
+      Wait.assertEquals(3, queue::getMessageCount);
 
       txnSession.rollback();
 
-      assertEquals(3, queue.getMessageCount());
+      Wait.assertEquals(3, queue::getMessageCount);
    }
 
    @Test(timeout = 60000)
@@ -448,11 +448,11 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
       sender2.send(message, txnSession.getTransactionId());
       sender3.send(message, txnSession.getTransactionId());
 
-      assertEquals(0, queue.getMessageCount());
+      Wait.assertEquals(0, queue::getMessageCount);
 
       txnSession.commit();
 
-      assertEquals(3, queue.getMessageCount());
+      Wait.assertEquals(3, queue::getMessageCount);
    }
 
    @Test(timeout = 60000)
@@ -488,11 +488,11 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
       sender2.send(message, txnSession.getTransactionId());
       sender3.send(message, txnSession.getTransactionId());
 
-      assertEquals(0, queue.getMessageCount());
+      Wait.assertEquals(0, queue::getMessageCount);
 
       txnSession.rollback();
 
-      assertEquals(0, queue.getMessageCount());
+      Wait.assertEquals(0, queue::getMessageCount);
    }
 
    //----- Tests Ported from AmqpNetLite client -----------------------------//