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/05/08 15:48:04 UTC
activemq-artemis git commit: NO-JIRA Improving MqttClusterWildcardTest
Repository: activemq-artemis
Updated Branches:
refs/heads/master 50e170b7e -> 82d8992bc
NO-JIRA Improving MqttClusterWildcardTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/82d8992b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/82d8992b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/82d8992b
Branch: refs/heads/master
Commit: 82d8992bced368589fec81e0d72cd37b5b6a3890
Parents: 50e170b
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 8 11:45:07 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 8 11:45:07 2018 -0400
----------------------------------------------------------------------
.../mqtt/imported/MqttClusterWildcardTest.java | 29 ++++++++------------
1 file changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82d8992b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
index b9185b2..ab8d30c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
@@ -26,6 +26,7 @@ import org.fusesource.mqtt.client.MQTT;
import org.fusesource.mqtt.client.Message;
import org.fusesource.mqtt.client.QoS;
import org.fusesource.mqtt.client.Topic;
+import org.junit.Assert;
import org.junit.Test;
public class MqttClusterWildcardTest extends ClusterTestBase {
@@ -116,7 +117,6 @@ public class MqttClusterWildcardTest extends ClusterTestBase {
public void wildcardsWithBroker1Disconnected() throws Exception {
BlockingConnection connection1 = null;
BlockingConnection connection2 = null;
- BlockingConnection connection3 = null;
final String TOPIC = "test/+/some/#";
try {
@@ -129,15 +129,12 @@ public class MqttClusterWildcardTest extends ClusterTestBase {
setupServer(0, false, isNetty());
servers[0].getConfiguration().setWildCardConfiguration(wildcardConfiguration);
-
setupClusterConnection("cluster0", "", MessageLoadBalancingType.ON_DEMAND, 1, isNetty(), 0, 1);
startServers(0);
-
connection1 = retrieveMQTTConnection("tcp://localhost:61616");
-
// Subscribe to topics
Topic[] topics = {new Topic(TOPIC, QoS.AT_MOST_ONCE)};
connection1.subscribe(topics);
@@ -163,25 +160,27 @@ public class MqttClusterWildcardTest extends ClusterTestBase {
startServers(1);
connection2 = retrieveMQTTConnection("tcp://localhost:61617");
- connection3 = retrieveMQTTConnection("tcp://localhost:61617");
connection2.subscribe(topics);
- connection3.subscribe(new Topic[]{new Topic("teste/1/some/1", QoS.AT_MOST_ONCE)});
waitForBindings(1, TOPIC, 1, 1, false);
waitForBindings(1, TOPIC, 1, 1, true);
+ waitForBindings(0, TOPIC, 1, 1, false);
waitForBindings(0, TOPIC, 1, 1, true);
-
connection1.publish("test/1/some/la", payload1.getBytes(), QoS.AT_LEAST_ONCE, false);
connection1.publish("test/1/some/la", payload2.getBytes(), QoS.AT_MOST_ONCE, false);
connection1.publish("test/1/some/la", payload3.getBytes(), QoS.AT_MOST_ONCE, false);
-
- Message message2 = connection1.receive(5, TimeUnit.SECONDS);
- Message message3 = connection1.receive(5, TimeUnit.SECONDS);
- Message message4 = connection2.receive(5, TimeUnit.SECONDS);
- Message message5 = connection2.receive(5, TimeUnit.SECONDS);
- Message message6 = connection2.receive(5, TimeUnit.SECONDS);
+ Message message2 = connection1.receive(10, TimeUnit.SECONDS);
+ Assert.assertNotNull(message2);
+ Message message3 = connection1.receive(10, TimeUnit.SECONDS);
+ Assert.assertNotNull(message3);
+ Message message4 = connection2.receive(10, TimeUnit.SECONDS);
+ Assert.assertNotNull(message4);
+ Message message5 = connection2.receive(10, TimeUnit.SECONDS);
+ Assert.assertNotNull(message5);
+ Message message6 = connection2.receive(10, TimeUnit.SECONDS);
+ Assert.assertNotNull(message6);
assertEquals(payload1, new String(message1.getPayload()));
assertEquals(payload2, new String(message2.getPayload()));
@@ -200,10 +199,6 @@ public class MqttClusterWildcardTest extends ClusterTestBase {
connection2.unsubscribe(topics);
connection2.disconnect();
}
- if (connection3 != null) {
- connection3.unsubscribe(new String[]{"teste/1/some/1"});
- connection3.disconnect();
- }
}
}