[activemq-artemis] branch master updated: NO-JIRA More general test fixes

[clebertsuconic]

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

clebertsuconic 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 e217f9a  NO-JIRA More general test fixes
e217f9a is described below

commit e217f9ab6c3b76dfda38cb3db694429e97eab67b
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Wed Mar 13 15:26:48 2019 -0400

    NO-JIRA More general test fixes
---
 .../artemis/tests/integration/addressing/AddressingTest.java        | 2 +-
 .../activemq/artemis/tests/integration/client/LargeMessageTest.java | 5 +++--
 .../tests/integration/management/ActiveMQServerControlTest.java     | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
index 550adbe..37e365b 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
@@ -264,7 +264,7 @@ public class AddressingTest extends ActiveMQTestBase {
       producer.send(session.createMessage(true));
       session.createConsumer(queueName).close();
       assertNotNull(server.locateQueue(queueName));
-      assertEquals(1, server.locateQueue(queueName).getMessageCount());
+      Wait.assertEquals(1, server.locateQueue(queueName)::getMessageCount);
    }
 
    @Test
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
index eac724c..84727f6 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
@@ -51,6 +51,7 @@ import 
org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import 
org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.Wait;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -2545,9 +2546,9 @@ public class LargeMessageTest extends 
LargeMessageTestBase {
 
       session.commit();
 
-      Assert.assertEquals(0, 
server.getPagingManager().getPageStore(ADDRESS).getAddressSize());
+      Wait.assertEquals(0, 
server.getPagingManager().getPageStore(ADDRESS)::getAddressSize);
 
-      Assert.assertEquals(0, server.getPagingManager().getGlobalSize());
+      Wait.assertEquals(0, server.getPagingManager()::getGlobalSize);
 
       session.close();
 
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index 36ad5fb..e2e8607 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -1716,7 +1716,11 @@ public class ActiveMQServerControlTest extends 
ManagementTestBase {
       Assert.assertEquals("messagesAcked", "0", 
array.getJsonObject(0).getString("messagesAcked"));
       Assert.assertEquals("deliveringCount", "0", 
array.getJsonObject(0).getString("deliveringCount"));
       Assert.assertEquals("messagesKilled", "0", 
array.getJsonObject(0).getString("messagesKilled"));
-      Assert.assertEquals("deliverDeliver", "false", 
array.getJsonObject(0).getString("deliverDeliver"));
+      String resultDirectDeliver = 
array.getJsonObject(0).getString("deliverDeliver");
+      // if there is a core consumer, the result here would be true (if 
directDeliver is supported).
+      // as for what we expect it's either true or false through management, 
we are not testing for directDeliver here, just
+      // if management works.
+      Assert.assertTrue(resultDirectDeliver.equals("true") || 
resultDirectDeliver.equals("false"));
 
    }