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

Remove unused test helpers 

- testQueuePropertiesWithCleanSessionSet() was not used
- testQueuePropertiesWithCleanSessionUnset() and
  testQueuePropertiesWithCleanSession() was called only once so removing
the extra layer here to simply structure
This commit is contained in:
Chunyi Lyu 2023-06-22 14:36:53 +01:00
parent 27e0cfce35
commit 468985f7ad
2 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,35 +226,19 @@ public class MqttTest implements MqttCallback {
}
// rabbitmq/rabbitmq-mqtt#37: QoS 1, clean session = false
@Test public void qos1AndCleanSessionUnset()
throws MqttException, IOException, TimeoutException, InterruptedException {
testQueuePropertiesWithCleanSessionUnset("qos1-no-clean-session", 1, true, false);
}
protected void testQueuePropertiesWithCleanSessionSet(String cid, int qos, boolean durable, boolean autoDelete)
throws IOException, MqttException, TimeoutException, InterruptedException {
testQueuePropertiesWithCleanSession(true, cid, qos, durable, autoDelete);
}
protected void testQueuePropertiesWithCleanSessionUnset(String cid, int qos, boolean durable, boolean autoDelete)
throws IOException, MqttException, TimeoutException, InterruptedException {
testQueuePropertiesWithCleanSession(false, cid, qos, durable, autoDelete);
}
protected void testQueuePropertiesWithCleanSession(boolean cleanSession, String cid, int qos,
boolean durable, boolean autoDelete)
@Test public void qos1AndCleanSessionUnset(TestInfo info)
throws MqttException, IOException, TimeoutException {
MqttClient c = newClient(brokerUrl, cid);
MqttClient c = newClient(info);
MqttConnectOptions opts = new TestMqttConnectOptions();
opts.setCleanSession(cleanSession);
opts.setCleanSession(false);
c.connect(opts);
setUpAmqp();
Channel tmpCh = conn.createChannel();
String q = "mqtt-subscription-" + cid + "qos" + qos;
String q = "mqtt-subscription-" + "test-qos1AndCleanSessionUnset" + "qos1";
c.subscribe(topic, qos);
c.subscribe(topic, 1);
// there is no server-sent notification about subscription
// success so we inject a delay
waitForTestDelay();
@ -267,7 +251,7 @@ public class MqttTest implements MqttCallback {
// then assert on properties
Map<String, Object> args = new HashMap<>();
args.put("x-expires", 86400000);
tmpCh.queueDeclare(q, durable, autoDelete, false, args);
tmpCh.queueDeclare(q, true, false, false, args);
} finally {
if (c.isConnected()) {
c.disconnect(3000);

23
deps/rabbitmq_mqtt/test/java_SUITE_data/src/test/java/com/rabbitmq/mqtt/test/MqttV5Test.java vendored
View File

@ -479,31 +479,20 @@ public class MqttV5Test implements MqttCallback {
cleanupClient2.disconnect();
}
@Test public void qos1AndCleanStartFalse()
throws MqttException, IOException, TimeoutException, InterruptedException {
testQueuePropertiesWithCleanStartFalse("qos1-no-clean-session-v5", 1, true, false);
}
protected void testQueuePropertiesWithCleanStartFalse(String cid, int qos, boolean durable, boolean autoDelete)
throws IOException, MqttException, TimeoutException, InterruptedException {
testQueuePropertiesWithCleanStart(false, cid, qos, durable, autoDelete);
}
protected void testQueuePropertiesWithCleanStart(boolean cleanStart, String cid, int qos,
boolean durable, boolean autoDelete)
@Test public void qos1AndCleanSessionUnset(TestInfo info)
throws MqttException, IOException, TimeoutException {
MqttClient c = newClient(brokerUrl, cid);
MqttClient c = newClient(info);
MqttConnectionOptions opts = new TestMqttConnectOptions();
opts.setCleanStart(cleanStart);
opts.setCleanStart(false);
opts.setSessionExpiryInterval(10L);
c.connect(opts);
setUpAmqp();
Channel tmpCh = conn.createChannel();
String q = "mqtt-subscription-" + cid + "qos" + qos;
String q = "mqtt-subscription-" + "test-qos1AndCleanSessionUnset" + "qos1";
c.subscribe(topic, qos);
c.subscribe(topic, 1);
// there is no server-sent notification about subscription
// success so we inject a delay
waitForTestDelay();
@ -516,7 +505,7 @@ public class MqttV5Test implements MqttCallback {
// then assert on properties
Map<String, Object> args = new HashMap<>();
args.put("x-expires", 10000);
tmpCh.queueDeclare(q, durable, false, autoDelete, args);
tmpCh.queueDeclare(q, true, false, false, args);
} finally {
if (c.isConnected()) {
c.disconnect(3000);