[broker-7] add client disconnection to tests with connection

Author: crazyrokr

src/test/groovy/com/ss/mqtt/broker/test/integration/ConnectSubscribePublishTest.groovy

@@ -49,5 +49,8 @@ class ConnectSubscribePublishTest extends MqttBrokerTest {
             receivedMessage.qos == MqttQos.AT_MOST_ONCE
             receivedMessage.type == Mqtt5MessageType.PUBLISH
             receivedMessage.topic.levels.join("/") == topicFilter
+        cleanup:
+            subscriber.disconnect()
+            publisher.disconnect()
     }
 }

src/test/groovy/com/ss/mqtt/broker/test/integration/ConnectionTest.groovy

@@ -8,17 +8,23 @@ import java.util.concurrent.CompletionException
 class ConnectionTest extends MqttBrokerTest {
 
     def "subscriber should not connect to broker with wrong pass"() {
+        given:
+            def client = buildClient()
         when:
-            connectWith(buildClient(), 'user', 'wrongPassword')
+            connectWith(client, 'user', 'wrongPassword')
         then:
             def ex = thrown CompletionException
             def cause = ex.cause as Mqtt5ConnAckException
             cause.mqttMessage.reasonCode == Mqtt5ConnAckReasonCode.BAD_USER_NAME_OR_PASSWORD
+        cleanup:
+            client.disconnect()
     }
 
     def "subscriber should connect to broker without user and pass"() {
+        given:
+            def client = buildClient()
         when:
-            def result = buildClient().connect().join()
+            def result = client.connect().join()
         then:
             result.reasonCode == Mqtt5ConnAckReasonCode.SUCCESS
             !result.serverReference.present
@@ -27,6 +33,8 @@ class ConnectionTest extends MqttBrokerTest {
             !result.sessionExpiryInterval.present
             !result.assignedClientIdentifier.present
             !result.sessionPresent
+        cleanup:
+            client.disconnect()
     }
 
     def "subscriber should connect to broker with user and pass"() {
@@ -42,6 +50,8 @@ class ConnectionTest extends MqttBrokerTest {
             !result.sessionExpiryInterval.present
             !result.assignedClientIdentifier.present
             !result.sessionPresent
+        cleanup:
+            client.disconnect()
     }
 
     def "subscriber should connect to broker without providing a client id"() {
@@ -53,6 +63,8 @@ class ConnectionTest extends MqttBrokerTest {
             result.reasonCode == Mqtt5ConnAckReasonCode.SUCCESS
             result.assignedClientIdentifier.present
             result.assignedClientIdentifier.get().toString() != ""
+        cleanup:
+            client.disconnect()
     }
 
     def "subscriber should not connect to broker with invalid client id"(String clientId) {
@@ -64,6 +76,8 @@ class ConnectionTest extends MqttBrokerTest {
             def ex = thrown CompletionException
             def cause = ex.cause as Mqtt5ConnAckException
             cause.mqttMessage.reasonCode == Mqtt5ConnAckReasonCode.CLIENT_IDENTIFIER_NOT_VALID
+        cleanup:
+            client.disconnect()
         where:
             clientId << ["!@#!@*()^&"]
     }