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 2019/08/27 20:52:20 UTC
[activemq-artemis] branch master updated: NO-JIRA Fixing
ScaleDownDirectTest and ReconnectTest
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 3a58387 NO-JIRA Fixing ScaleDownDirectTest and ReconnectTest
3a58387 is described below
commit 3a58387bd34cb3c1945c1e46720d3ef7192cfa4e
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue Aug 27 16:52:02 2019 -0400
NO-JIRA Fixing ScaleDownDirectTest and ReconnectTest
---
.../activemq/artemis/tests/integration/remoting/ReconnectTest.java | 6 +++++-
.../artemis/tests/integration/server/ScaleDownDirectTest.java | 5 +++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
index 867d4b2..14fd107 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
@@ -428,7 +428,11 @@ public class ReconnectTest extends ActiveMQTestBase {
}
private int getConsumerCount(ActiveMQServer server, ClientSessionInternal session) {
- Set<ServerConsumer> serverConsumers = server.getSessionByID(session.getName()).getServerConsumers();
+ ServerSession serverSession = server.getSessionByID(session.getName());
+ if (serverSession == null) {
+ return 0;
+ }
+ Set<ServerConsumer> serverConsumers = serverSession.getServerConsumers();
return serverConsumers.size();
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownDirectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownDirectTest.java
index 02b81c2..a2f1f9e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownDirectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownDirectTest.java
@@ -32,6 +32,7 @@ import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
import org.apache.activemq.artemis.core.server.impl.ScaleDownHandler;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.tests.util.Wait;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -220,8 +221,8 @@ public class ScaleDownDirectTest extends ClusterTestBase {
removeConsumer(1);
// at this point on node 0 there should be 2 messages in testQueue1 and 1 message in testQueue2
- Assert.assertEquals(TEST_SIZE, getMessageCount(((LocalQueueBinding) servers[0].getPostOffice().getBinding(new SimpleString(queueName1))).getQueue()));
- Assert.assertEquals(TEST_SIZE - 1, getMessageCount(((LocalQueueBinding) servers[0].getPostOffice().getBinding(new SimpleString(queueName2))).getQueue()));
+ Wait.assertEquals(TEST_SIZE, () -> getMessageCount(((LocalQueueBinding) servers[0].getPostOffice().getBinding(new SimpleString(queueName1))).getQueue()));
+ Wait.assertEquals(TEST_SIZE - 1, () -> getMessageCount(((LocalQueueBinding) servers[0].getPostOffice().getBinding(new SimpleString(queueName2))).getQueue()));
assertEquals(TEST_SIZE, performScaledown());
// trigger scaleDown from node 0 to node 1