[broker-25] add tests for connect out packet

Author: JavaSaBr

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

@@ -1,6 +1,7 @@
 package com.ss.mqtt.broker.network.packet.out;
 
 import com.ss.mqtt.broker.model.MqttVersion;
+import com.ss.mqtt.broker.model.QoS;
 import com.ss.mqtt.broker.network.packet.PacketType;
 import com.ss.rlib.common.util.ArrayUtils;
 import com.ss.rlib.common.util.StringUtils;
@@ -24,7 +25,8 @@ public class Connect311OutPacket extends MqttWritablePacket {
     private final @NotNull byte[] password;
     private final @NotNull byte[] willPayload;
 
-    private final int willQos;
+    private final @NotNull QoS willQos;
+
     private final int keepAlive;
 
     private final boolean willRetain;
@@ -58,7 +60,9 @@ protected void writePayload(@NotNull ByteBuffer buffer) {
         writeString(buffer, clientId);
 
         // for MQTT 5
-        appendWillProperties(buffer);
+        if (StringUtils.isNotEmpty(willTopic)) {
+            appendWillProperties(buffer);
+        }
 
         if (StringUtils.isNotEmpty(willTopic)) {
             writeString(buffer, willTopic);
@@ -88,7 +92,7 @@ private int buildConnectFlags() {
 
         if (StringUtils.isNotEmpty(willTopic)) {
             connectFlags |= 0b0000_0100;
-            connectFlags |= (willQos << 3);
+            connectFlags |= (willQos.ordinal() << 3);
             if (willRetain) {
                 connectFlags |= 0b0010_0000;
             }

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

@@ -3,6 +3,7 @@
 import com.ss.mqtt.broker.model.MqttPropertyConstants;
 import com.ss.mqtt.broker.model.MqttVersion;
 import com.ss.mqtt.broker.model.PacketProperty;
+import com.ss.mqtt.broker.model.QoS;
 import com.ss.mqtt.broker.util.MqttDataUtils;
 import org.jetbrains.annotations.NotNull;
 
@@ -193,7 +194,7 @@ public Connect5OutPacket(
         @NotNull String clientId,
         @NotNull byte[] password,
         @NotNull byte[] willPayload,
-        int willQos,
+        @NotNull QoS willQos,
         int keepAlive,
         boolean willRetain,
         boolean cleanStart,
@@ -221,6 +222,11 @@ public Connect5OutPacket(
         return MqttVersion.MQTT_5;
     }
 
+    @Override
+    protected boolean isPropertiesSupported() {
+        return true;
+    }
+
     @Override
     protected void appendWillProperties(@NotNull ByteBuffer buffer) {
 
@@ -278,7 +284,7 @@ protected void writeProperties(@NotNull ByteBuffer buffer) {
             buffer,
             PacketProperty.MAXIMUM_PACKET_SIZE,
             maximumPacketSize,
-            MqttPropertyConstants.MAXIMUM_PACKET_SIZE_DEFAULT
+            MqttPropertyConstants.MAXIMUM_PACKET_SIZE_UNDEFINED
         );
     }
 

src/test/groovy/com/ss/mqtt/broker/test/network/NetworkUnitSpecification.groovy

@@ -29,6 +29,8 @@ class NetworkUnitSpecification extends UnitSpecification {
 
     public static final maxQos = QoS.AT_MOST_ONCE_DELIVERY
     public static final sessionPresent = true
+    public static final cleanStart = false
+    public static final willRetain = false
     public static final clientId = "testClientId"
     public static final packetId = 1234 as short
     public static final userName = "testUser"

src/test/groovy/com/ss/mqtt/broker/test/network/out/Connect311OutPacketTest.groovy

@@ -0,0 +1,47 @@
+package com.ss.mqtt.broker.test.network.out
+
+import com.ss.mqtt.broker.model.QoS
+import com.ss.mqtt.broker.network.packet.in.ConnectInPacket
+import com.ss.mqtt.broker.network.packet.out.Connect311OutPacket
+import com.ss.rlib.common.util.ArrayUtils
+import com.ss.rlib.common.util.BufferUtils
+import com.ss.rlib.common.util.array.Array
+
+class Connect311OutPacketTest extends BaseOutPacketTest {
+    
+    def "should write packet correctly"() {
+        
+        given:
+            
+            def packet = new Connect311OutPacket(
+                userName,
+                "",
+                clientId,
+                userPassword,
+                ArrayUtils.EMPTY_BYTE_ARRAY,
+                QoS.AT_MOST_ONCE_DELIVERY,
+                keepAlive,
+                willRetain,
+                cleanStart,
+            )
+        
+        when:
+            
+            def dataBuffer = BufferUtils.prepareBuffer(512) {
+                packet.write(it)
+            }
+            
+            def reader = new ConnectInPacket(0b0001_0000 as byte)
+            def result = reader.read(mqtt311Connection, dataBuffer, dataBuffer.limit())
+        
+        then:
+            result
+            reader.username == userName
+            reader.clientId == clientId
+            reader.password == userPassword
+            reader.keepAlive == keepAlive
+            reader.userProperties == Array.empty()
+            reader.cleanStart == cleanStart
+            reader.willRetain == willRetain
+    }
+}

src/test/groovy/com/ss/mqtt/broker/test/network/out/Connect5OutPacketTest.groovy

@@ -0,0 +1,63 @@
+package com.ss.mqtt.broker.test.network.out
+
+import com.ss.mqtt.broker.model.QoS
+import com.ss.mqtt.broker.network.packet.in.ConnectInPacket
+import com.ss.mqtt.broker.network.packet.out.Connect5OutPacket
+import com.ss.rlib.common.util.ArrayUtils
+import com.ss.rlib.common.util.BufferUtils
+import com.ss.rlib.common.util.array.Array
+
+class Connect5OutPacketTest extends BaseOutPacketTest {
+    
+    def "should write packet correctly"() {
+        
+        given:
+            
+            def packet = new Connect5OutPacket(
+                userName,
+                "",
+                clientId,
+                userPassword,
+                ArrayUtils.EMPTY_BYTE_ARRAY,
+                QoS.AT_MOST_ONCE_DELIVERY,
+                keepAlive,
+                willRetain,
+                cleanStart,
+                authMethod,
+                authData,
+                sessionExpiryInterval,
+                receiveMaximum,
+                maximumPacketSize,
+                topicAliasMaximum,
+                requestResponseInformation,
+                requestProblemInformation
+            )
+        
+        when:
+            
+            def dataBuffer = BufferUtils.prepareBuffer(512) {
+                packet.write(it)
+            }
+            
+            def reader = new ConnectInPacket(0b0001_0000 as byte)
+            def result = reader.read(mqtt5Connection, dataBuffer, dataBuffer.limit())
+        
+        then:
+            result
+            reader.username == userName
+            reader.clientId == clientId
+            reader.password == userPassword
+            reader.keepAlive == keepAlive
+            reader.userProperties == Array.empty()
+            reader.cleanStart == cleanStart
+            reader.willRetain == willRetain
+            reader.authenticationMethod == authMethod
+            reader.authenticationData == authData
+            reader.sessionExpiryInterval == sessionExpiryInterval
+            reader.receiveMax == receiveMaximum
+            reader.maximumPacketSize == maximumPacketSize
+            reader.topicAliasMaximum == topicAliasMaximum
+            reader.requestResponseInformation == requestResponseInformation
+            reader.requestProblemInformation == requestProblemInformation
+    }
+}