root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Arnaud Cogoluègnes 2016-12-15 14:23:55 +01:00
parent e37b8135b1 335997d140
commit 6d53781e64
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deps/rabbitmq_mqtt/test/java_SUITE_data/src/test/java/com/rabbitmq/mqtt/test/MqttTest.java vendored
View File

@ -242,7 +242,7 @@ public class MqttTest implements MqttCallback {
c.subscribe(topic, qos); c.subscribe(topic, qos);
// there is no server-sent notification about subscription // there is no server-sent notification about subscription
// success so we inject a delay // success so we inject a delay
Thread.sleep(testDelay); waitForTestDelay();
// ensure the queue is declared with the arguments we expect // ensure the queue is declared with the arguments we expect
// e.g. mqtt-subscription-client-3aqos0 // e.g. mqtt-subscription-client-3aqos0
@ -570,7 +570,7 @@ public class MqttTest implements MqttCallback {
} }
@Test public void willIsRetained() throws MqttException, InterruptedException, IOException { @Test public void willIsRetained() throws MqttException, InterruptedException, IOException {
conOpt.setCleanSession(false); conOpt.setCleanSession(true);
client2.connect(conOpt); client2.connect(conOpt);
client2.setCallback(this); client2.setCallback(this);
clearRetained(client2, retainedTopic); clearRetained(client2, retainedTopic);
@ -605,13 +605,14 @@ public class MqttTest implements MqttCallback {
MqttTopic willTopic = client.getTopic(retainedTopic); MqttTopic willTopic = client.getTopic(retainedTopic);
byte[] willPayload = "willpayload".getBytes(); byte[] willPayload = "willpayload".getBytes();
conOpt.setWill(willTopic, willPayload, 1, true); conOpt.setWill(willTopic, willPayload, 1, true);
conOpt.setCleanSession(true);
client.connect(conOpt); client.connect(conOpt);
Assert.assertEquals(1, sockets.size()); Assert.assertEquals(1, sockets.size());
sockets.get(0).close(); sockets.get(0).close();
conOpt.setCleanSession(false); // let last will propagate after disconnection
waitForTestDelay();
client2.connect(conOpt); client2.connect(conOpt);
client2.setCallback(this); client2.setCallback(this);
client2.subscribe(retainedTopic, 1); client2.subscribe(retainedTopic, 1);
@ -747,4 +748,12 @@ public class MqttTest implements MqttCallback {
public boolean isClientConnected() { public boolean isClientConnected() {
return client.isConnected(); return client.isConnected();
} }
private void waitForTestDelay() {
try {
Thread.sleep(testDelay);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
} }