fix tests

Author: JavaSaBr

application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy

@@ -23,18 +23,17 @@ class TopicSubscriberTest extends NetworkUnitSpecification {
       TopicName topicNames,
       QoS[] subscriberQos,
       QoS[] matchedQos,
-      MqttClient[] mqttClients
-  ) {
+      MqttClient[] mqttClients) {
     given:
-        def subscribeTopicFilter = Mock(SubscribeTopicFilter) {
-          getQos() >>> subscriberQos
-          getTopicFilter() >>> topicFilters
+        SubscribeTopicFilter[] subscribeFilters = new SubscribeTopicFilter[mqttClients.length]
+        mqttClients.eachWithIndex { MqttClient entry, int i ->
+          subscribeFilters[i] = new SubscribeTopicFilter(topicFilters[i], subscriberQos[i])
         }
         def topicSubscriber = new TopicSubscribers()
     when:
-        topicSubscriber.addSubscriber(mqttClients[0], subscribeTopicFilter)
-        topicSubscriber.addSubscriber(mqttClients[1], subscribeTopicFilter)
-        topicSubscriber.addSubscriber(mqttClients[2], subscribeTopicFilter)
+        topicSubscriber.addSubscriber(mqttClients[0], subscribeFilters[0])
+        topicSubscriber.addSubscriber(mqttClients[1], subscribeFilters[1])
+        topicSubscriber.addSubscriber(mqttClients[2], subscribeFilters[2])
     then:
         def subscribers = topicSubscriber.matches(topicNames)
         subscribers.size() == matchedQos.size()
@@ -67,10 +66,10 @@ class TopicSubscriberTest extends NetworkUnitSpecification {
             [AT_LEAST_ONCE, AT_MOST_ONCE, EXACTLY_ONCE]
         ]
         mqttClients << [
-            [mqtt311Client, mqtt311Client, mqtt311Client],
-            [mqtt311Client, mqtt311Client, mqtt311Client],
-            [mqtt311Client, mqtt311Client, mqtt311Client],
-            [defaultMqttClient(), defaultMqttClient(), defaultMqttClient()]
+            [defaultMqtt311Client, defaultMqtt311Client, defaultMqtt311Client],
+            [defaultMqtt311Client, defaultMqtt311Client, defaultMqtt311Client],
+            [defaultMqtt311Client, defaultMqtt311Client, defaultMqtt311Client],
+            [newMqtt311Client(), newMqtt311Client(), newMqtt311Client()]
         ]
   }
 }

application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy

@@ -17,6 +17,7 @@ import javasabr.rlib.collections.array.IntArray
 import spock.lang.Shared
 
 import java.nio.charset.StandardCharsets
+import java.util.concurrent.atomic.AtomicInteger
 
 import static javasabr.mqtt.model.utils.TopicUtils.buildTopicFilter
 import static javasabr.mqtt.model.utils.TopicUtils.buildTopicName
@@ -34,7 +35,8 @@ class NetworkUnitSpecification extends UnitSpecification {
   public static final sessionPresent = true
   public static final cleanStart = false
   public static final willRetain = false
-  public static final clientId = "testClientId"
+  public static final mqtt311ClientId = "testMqtt311ClientId"
+  public static final mqtt5ClientId = "testMqtt5ClientId"
   public static final packetId = 1234 as short
   public static final userName = "testUser"
   public static final userPassword = "testPassword".getBytes(StandardCharsets.UTF_8)
@@ -102,15 +104,16 @@ class NetworkUnitSpecification extends UnitSpecification {
   public static final topicFiltersObj5 = Array.of(topicFilter1Obj5, topicFilter2Obj5)
   public static final publishPayload = "publishPayload".getBytes(StandardCharsets.UTF_8)
   public static final correlationData = "correlationData".getBytes(StandardCharsets.UTF_8)
+  public static final clientIdGenerator = new AtomicInteger(1)
 
   @Shared
   MqttServerConnectionConfig defaultServerConnectionConfig = defaultServerConnectionConfig()
 
   @Shared
-  MqttClient defaultMqtt311Client = mqttClient(defaultMqtt311ClientConnectionConfig(), clientId)
+  MqttClient defaultMqtt311Client = mqttClient(defaultMqtt311ClientConnectionConfig(), mqtt311ClientId)
 
   @Shared
-  MqttClient defaultMqtt5Client = mqttClient(defaultMqtt5ClientConnectionConfig(), clientId)
+  MqttClient defaultMqtt5Client = mqttClient(defaultMqtt5ClientConnectionConfig(), mqtt5ClientId)
 
   @Shared
   MqttConnection defaultMqtt5Connection = mqtt5Connection();
@@ -176,14 +179,14 @@ class NetworkUnitSpecification extends UnitSpecification {
     return mqttConnection(
         defaultServerConnectionConfig(),
         defaultMqtt311ClientConnectionConfig(),
-        clientId)
+        mqtt311ClientId)
   }
 
   MqttConnection mqtt5Connection() {
     return mqttConnection(
         defaultServerConnectionConfig(),
         defaultMqtt5ClientConnectionConfig(),
-        clientId)
+        mqtt5ClientId)
   }
 
   static MqttServerConnectionConfig serverConnectionConfig(
@@ -268,6 +271,17 @@ class NetworkUnitSpecification extends UnitSpecification {
     return Stub(MqttClient.UnsafeMqttClient) {
       connectionConfig() >> clientConfig
       clientId() >> id
+      toString() >> id
+    }
+  }
+
+  MqttClient newMqtt311Client() {
+    def config = defaultMqtt311ClientConnectionConfig()
+    def id = "generatedClient_${clientIdGenerator.incrementAndGet()}"
+    return Stub(MqttClient.UnsafeMqttClient) {
+      connectionConfig() >> config
+      clientId() >> id
+      toString() >> id
     }
   }
 }

application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy

@@ -46,7 +46,7 @@ class ConnectAckInPacketTest extends BaseInPacketTest {
         def propertiesBuffer = BufferUtils.prepareBuffer(512) {
           it.putProperty(PacketProperty.REASON_STRING, reasonString)
           it.putProperty(PacketProperty.SERVER_REFERENCE, serverReference)
-          it.putProperty(PacketProperty.ASSIGNED_CLIENT_IDENTIFIER, clientId)
+          it.putProperty(PacketProperty.ASSIGNED_CLIENT_IDENTIFIER, mqtt311ClientId)
           it.putProperty(PacketProperty.AUTHENTICATION_DATA, authData)
           it.putProperty(PacketProperty.AUTHENTICATION_METHOD, authMethod)
           it.putProperty(PacketProperty.MAXIMUM_PACKET_SIZE, maxPacketSize)
@@ -76,7 +76,7 @@ class ConnectAckInPacketTest extends BaseInPacketTest {
         packet.sessionPresent == sessionPresent
         packet.serverReference == serverReference
         packet.reason == reasonString
-        packet.assignedClientId == clientId
+        packet.assignedClientId == mqtt311ClientId
         packet.authenticationData == authData
         packet.authenticationMethod == authMethod
         packet.maxPacketSize == maxPacketSize

application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy

@@ -16,7 +16,7 @@ class ConnectInPacketTest extends BaseInPacketTest {
           it.put(4 as byte)
           it.put(0b11000010 as byte)
           it.putShort(keepAlive as short)
-          it.putString(clientId)
+          it.putString(mqtt311ClientId)
           it.putString(userName)
           it.putBytes(userPassword)
         }
@@ -25,7 +25,7 @@ class ConnectInPacketTest extends BaseInPacketTest {
         def result = packet.read(defaultMqtt311Connection, dataBuffer, dataBuffer.limit())
     then:
         result
-        packet.clientId() == clientId
+        packet.clientId() == mqtt311ClientId
         packet.mqttVersion() == MqttVersion.MQTT_3_1_1
         packet.password() == userPassword
         packet.username() == userName
@@ -54,7 +54,7 @@ class ConnectInPacketTest extends BaseInPacketTest {
           it.putShort(keepAlive as short)
           it.putMbi(propertiesBuffer.limit())
           it.put(propertiesBuffer)
-          it.putString(clientId)
+          it.putString(mqtt311ClientId)
           it.putString(userName)
           it.putBytes(userPassword)
         }
@@ -66,7 +66,7 @@ class ConnectInPacketTest extends BaseInPacketTest {
         packet.keepAlive() == keepAlive
         packet.authenticationMethod() == authMethod
         packet.authenticationData() == authData
-        packet.clientId() == clientId
+        packet.clientId() == mqtt311ClientId
         packet.mqttVersion() == MqttVersion.MQTT_5
         packet.maxPacketSize() == maxPacketSize
         packet.password() == userPassword

application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy

@@ -14,7 +14,7 @@ class Connect311OutPacketTest extends BaseOutPacketTest {
         def packet = new Connect311OutPacket(
             userName,
             "",
-            clientId,
+            mqtt311ClientId,
             userPassword,
             ArrayUtils.EMPTY_BYTE_ARRAY,
             QoS.AT_MOST_ONCE,
@@ -30,7 +30,7 @@ class Connect311OutPacketTest extends BaseOutPacketTest {
     then:
         result
         reader.username() == userName
-        reader.clientId() == clientId
+        reader.clientId() == mqtt311ClientId
         reader.password() == userPassword
         reader.keepAlive() == keepAlive
         reader.userProperties() == Array.empty()

application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy

@@ -13,7 +13,7 @@ class Connect5OutPacketTest extends BaseOutPacketTest {
         def packet = new Connect5OutPacket(
             userName,
             "",
-            clientId,
+            mqtt311ClientId,
             userPassword,
             ArrayUtils.EMPTY_BYTE_ARRAY,
             QoS.AT_MOST_ONCE,
@@ -38,7 +38,7 @@ class Connect5OutPacketTest extends BaseOutPacketTest {
     then:
         result
         reader.username() == userName
-        reader.clientId() == clientId
+        reader.clientId() == mqtt311ClientId
         reader.password() == userPassword
         reader.keepAlive() == keepAlive
         reader.userProperties() == userProperties

application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy

@@ -33,7 +33,7 @@ class ConnectAck5OutPacketTest extends BaseOutPacketTest {
             clientConfig,
             ConnectAckReasonCode.BAD_USER_NAME_OR_PASSWORD,
             sessionPresent,
-            clientId,
+            mqtt311ClientId,
             requestedClientId,
             requestedSessionExpireInterval,
             requestedKeepAlive,
@@ -58,7 +58,7 @@ class ConnectAck5OutPacketTest extends BaseOutPacketTest {
         reader.sessionExpiryInterval == 240
         reader.receiveMaxPublishes == 250
         reader.maxPacketSize == maxPacketSize
-        reader.assignedClientId == clientId
+        reader.assignedClientId == mqtt311ClientId
         reader.topicAliasMaxValue == 300
         reader.reason == reasonString
         reader.userProperties() == userProperties