[broker-25] continue working on mock client

Author: JavaSaBr

src/main/java/com/ss/mqtt/broker/network/packet/out/Connect311OutPacket.java

@@ -32,6 +32,20 @@ public class Connect311OutPacket extends MqttWritablePacket {
     private final boolean willRetain;
     private final boolean cleanStart;
 
+    public Connect311OutPacket(@NotNull String clientId, int keepAlive) {
+        this(
+            StringUtils.EMPTY,
+            StringUtils.EMPTY,
+            clientId,
+            ArrayUtils.EMPTY_BYTE_ARRAY,
+            ArrayUtils.EMPTY_BYTE_ARRAY,
+            QoS.AT_MOST_ONCE_DELIVERY,
+            keepAlive,
+            false,
+            false
+        );
+    }
+
     protected @NotNull MqttVersion getMqttVersion() {
         return MqttVersion.MQTT_3_1_1;
     }

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

@@ -19,6 +19,7 @@ class IntegrationSpecification extends Specification {
     public static final topicFilter = "topic/Filter"
     public static final publishPayload = "publishPayload".getBytes(encoding)
     public static final clientId = "testClientId"
+    public static final keepAlive = 120
 
     @Autowired
     InetSocketAddress deviceNetworkAddress
@@ -33,9 +34,9 @@ class IntegrationSpecification extends Specification {
     MqttConnection mqtt311MockedConnection
 
     def buildClient() {
-        return buildClient(UUID.randomUUID().toString())
+        return buildClient(generateClientId())
     }
-
+    
     def buildClient(String clientId) {
         return MqttClient.builder()
             .identifier(clientId)
@@ -45,8 +46,12 @@ class IntegrationSpecification extends Specification {
             .build()
             .toAsync()
     }
-
-    def static connectWith(Mqtt5AsyncClient client, String user, String pass) {
+    
+    def generateClientId() {
+        UUID.randomUUID().toString()
+    }
+    
+    def connectWith(Mqtt5AsyncClient client, String user, String pass) {
         return client.connectWith()
             .simpleAuth()
             .username(user)

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

@@ -1,35 +1,23 @@
 package com.ss.mqtt.broker.test.integration
 
-import com.ss.mqtt.broker.model.MqttSession
-import com.ss.mqtt.broker.network.client.MqttClient
-import com.ss.mqtt.broker.network.packet.in.PublishInPacket
-import com.ss.mqtt.broker.network.packet.out.ConnectAck5OutPacket
+import com.ss.mqtt.broker.network.packet.in.ConnectAckInPacket
+import com.ss.mqtt.broker.network.packet.out.Connect311OutPacket
 import com.ss.mqtt.broker.service.MqttSessionService
 import org.springframework.beans.factory.annotation.Autowired
 
-import java.util.concurrent.atomic.AtomicInteger
-
 class PublishRetryTest extends IntegrationSpecification {
 
     @Autowired
     MqttSessionService mqttSessionService
 
-  /*  def "mqtt5 client should be generate session with one pending packet"() {
+    def "mqtt5 client should be generate session with one pending packet"() {
         given:
-            def client = buildMqtt5MockClient()
+            def client = buildMqtt311MockClient()
+            def clientId = generateClientId()
         when:
             client.connect()
-            client.send(new ConnectAck5OutPacket(
-            
-            ))
-        then:
-            noExceptionThrown()
-            publishRetryService.exist(identifier.get().toString())
-        when:
-            client.disconnect().join()
-            Thread.sleep(500)
+            client.send(new Connect311OutPacket(clientId, keepAlive))
         then:
-            noExceptionThrown()
-            !publishRetryService.exist(identifier.get().toString())
-    }*/
+            client.readNext() instanceof ConnectAckInPacket
+    }
 }

src/test/groovy/com/ss/mqtt/broker/test/mock/MqttMockClient.groovy

@@ -2,6 +2,7 @@ package com.ss.mqtt.broker.test.mock
 
 import com.ss.mqtt.broker.network.MqttConnection
 import com.ss.mqtt.broker.network.packet.PacketType
+import com.ss.mqtt.broker.network.packet.in.ConnectAckInPacket
 import com.ss.mqtt.broker.network.packet.in.ConnectInPacket
 import com.ss.mqtt.broker.network.packet.in.MqttReadablePacket
 import com.ss.mqtt.broker.network.packet.out.MqttWritablePacket
@@ -72,8 +73,8 @@ class MqttMockClient {
         MqttReadablePacket packet
 
         switch (PacketType.fromByte(type)) {
-            case PacketType.CONNECT:
-                packet = new ConnectInPacket(info)
+            case PacketType.CONNECT_ACK:
+                packet = new ConnectAckInPacket(info)
                 break
             default:
                 throw new IllegalStateException("Unknown packet of type: $type")