Improve Unit Tests

Author: chkr1011

Source/MQTTnet.TestApp/AsyncLockTest.cs

@@ -6,7 +6,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Exceptions;
-using MQTTnet.Internal;
 
 namespace MQTTnet.TestApp;
 

Source/MQTTnet.Tests/MQTTnet.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-    
+
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
@@ -18,9 +18,9 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
-        
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+        <PackageReference Include="MSTest" Version="3.6.4"/>
+
 
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>

Source/MQTTnet/Adapter/ReceivedMqttPacket.cs

@@ -8,7 +8,7 @@ namespace MQTTnet.Adapter;
 
 public readonly struct ReceivedMqttPacket
 {
-    public static readonly ReceivedMqttPacket Empty = new();
+    public static readonly ReceivedMqttPacket Empty;
 
     public ReceivedMqttPacket(byte fixedHeader, ArraySegment<byte> body, int totalLength)
     {

Source/MQTTnet/Diagnostics/Logger/IMqttNetLogger.cs

@@ -10,5 +10,5 @@ public interface IMqttNetLogger
 {
     bool IsEnabled { get; }
 
-    void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception);
+    void Publish(MqttNetLogLevel level, string source, string message, object[] parameters, Exception exception);
 }

Source/MQTTnet/Diagnostics/Logger/MqttNetEventLogger.cs

@@ -17,6 +17,8 @@ public sealed class MqttNetEventLogger(string logId = null) : IMqttNetLogger
 
     public string LogId { get; } = logId;
 
+    public IFormatProvider FormatProvider { get; set; }
+
     public void Publish(MqttNetLogLevel level, string source, string message, object[] parameters, Exception exception)
     {
         var eventHandler = LogMessagePublished;
@@ -32,7 +34,7 @@ public void Publish(MqttNetLogLevel level, string source, string message, object
         {
             try
             {
-                message = string.Format(message, parameters);
+                message = string.Format(FormatProvider, message, parameters);
             }
             catch (FormatException)
             {

Source/MQTTnet/Diagnostics/Logger/MqttNetNullLogger.cs

@@ -13,9 +13,9 @@ public sealed class MqttNetNullLogger : IMqttNetLogger
 {
     public static MqttNetNullLogger Instance { get; } = new();
 
-    public bool IsEnabled { get; } = false;
+    public bool IsEnabled { get; }
 
-    public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
+    public void Publish(MqttNetLogLevel level, string source, string message, object[] parameters, Exception exception)
     {
     }
 }

Source/MQTTnet/Disconnecting/MqttClientDisconnectOptionsValidator.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Linq;
 using MQTTnet.Formatter;
 
 namespace MQTTnet;
@@ -20,7 +19,7 @@ public static void ThrowIfNotSupported(MqttClientDisconnectOptions options, Mqtt
             return;
         }
 
-        if (options.ReasonString?.Any() == true)
+        if (options.ReasonString?.Length > 0)
         {
             Throw(nameof(options.ReasonString));
         }

Source/MQTTnet/Formatter/IMqttPacketFormatter.cs

@@ -9,7 +9,7 @@ namespace MQTTnet.Formatter;
 
 public interface IMqttPacketFormatter
 {
-    MqttPacket Decode(ReceivedMqttPacket receivedMqttPacket);
+    MqttPacket Decode(ReceivedMqttPacket receivedPacket);
 
-    MqttPacketBuffer Encode(MqttPacket mqttPacket);
+    MqttPacketBuffer Encode(MqttPacket packet);
 }

Source/MQTTnet/Formatter/V3/MqttV3PacketFormatter.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Buffers;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using MQTTnet.Adapter;
 using MQTTnet.Exceptions;
@@ -30,14 +29,14 @@ public MqttV3PacketFormatter(MqttBufferWriter bufferWriter, MqttProtocolVersion
         _mqttProtocolVersion = mqttProtocolVersion;
     }
 
-    public MqttPacket Decode(ReceivedMqttPacket receivedMqttPacket)
+    public MqttPacket Decode(ReceivedMqttPacket receivedPacket)
     {
-        if (receivedMqttPacket.TotalLength == 0)
+        if (receivedPacket.TotalLength == 0)
         {
             return null;
         }
 
-        var controlPacketType = receivedMqttPacket.FixedHeader >> 4;
+        var controlPacketType = receivedPacket.FixedHeader >> 4;
         if (controlPacketType is < 1 or > 14)
         {
             throw new MqttProtocolViolationException($"The packet type is invalid ({controlPacketType}).");
@@ -46,41 +45,41 @@ public MqttPacket Decode(ReceivedMqttPacket receivedMqttPacket)
         switch ((MqttControlPacketType)controlPacketType)
         {
             case MqttControlPacketType.Publish:
-                return DecodePublishPacket(receivedMqttPacket);
+                return DecodePublishPacket(receivedPacket);
             case MqttControlPacketType.PubAck:
-                return DecodePubAckPacket(receivedMqttPacket.Body);
+                return DecodePubAckPacket(receivedPacket.Body);
             case MqttControlPacketType.PubRec:
-                return DecodePubRecPacket(receivedMqttPacket.Body);
+                return DecodePubRecPacket(receivedPacket.Body);
             case MqttControlPacketType.PubRel:
-                return DecodePubRelPacket(receivedMqttPacket.Body);
+                return DecodePubRelPacket(receivedPacket.Body);
             case MqttControlPacketType.PubComp:
-                return DecodePubCompPacket(receivedMqttPacket.Body);
+                return DecodePubCompPacket(receivedPacket.Body);
 
             case MqttControlPacketType.PingReq:
                 return MqttPingReqPacket.Instance;
             case MqttControlPacketType.PingResp:
                 return MqttPingRespPacket.Instance;
 
             case MqttControlPacketType.Connect:
-                return DecodeConnectPacket(receivedMqttPacket.Body);
+                return DecodeConnectPacket(receivedPacket.Body);
             case MqttControlPacketType.ConnAck:
                 if (_mqttProtocolVersion == MqttProtocolVersion.V311)
                 {
-                    return DecodeConnAckPacketV311(receivedMqttPacket.Body);
+                    return DecodeConnAckPacketV311(receivedPacket.Body);
                 }
 
-                return DecodeConnAckPacket(receivedMqttPacket.Body);
+                return DecodeConnAckPacket(receivedPacket.Body);
             case MqttControlPacketType.Disconnect:
                 return DisconnectPacket;
 
             case MqttControlPacketType.Subscribe:
-                return DecodeSubscribePacket(receivedMqttPacket.Body);
+                return DecodeSubscribePacket(receivedPacket.Body);
             case MqttControlPacketType.SubAck:
-                return DecodeSubAckPacket(receivedMqttPacket.Body);
+                return DecodeSubAckPacket(receivedPacket.Body);
             case MqttControlPacketType.Unsubscribe:
-                return DecodeUnsubscribePacket(receivedMqttPacket.Body);
+                return DecodeUnsubscribePacket(receivedPacket.Body);
             case MqttControlPacketType.UnsubAck:
-                return DecodeUnsubAckPacket(receivedMqttPacket.Body);
+                return DecodeUnsubAckPacket(receivedPacket.Body);
 
             case MqttControlPacketType.Auth:
             default:
@@ -123,7 +122,7 @@ public MqttPacketBuffer Encode(MqttPacket packet)
             : new MqttPacketBuffer(firstSegment, payload);
     }
 
-    MqttPacket DecodeConnAckPacket(ArraySegment<byte> body)
+    MqttConnAckPacket DecodeConnAckPacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -137,7 +136,7 @@ MqttPacket DecodeConnAckPacket(ArraySegment<byte> body)
         return packet;
     }
 
-    MqttPacket DecodeConnAckPacketV311(ArraySegment<byte> body)
+    MqttConnAckPacket DecodeConnAckPacketV311(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -153,7 +152,7 @@ MqttPacket DecodeConnAckPacketV311(ArraySegment<byte> body)
         return packet;
     }
 
-    MqttPacket DecodeConnectPacket(ArraySegment<byte> body)
+    MqttConnectPacket DecodeConnectPacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -221,7 +220,7 @@ MqttPacket DecodeConnectPacket(ArraySegment<byte> body)
         return packet;
     }
 
-    MqttPacket DecodePubAckPacket(ArraySegment<byte> body)
+    MqttPubAckPacket DecodePubAckPacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -233,7 +232,7 @@ MqttPacket DecodePubAckPacket(ArraySegment<byte> body)
         };
     }
 
-    MqttPacket DecodePubCompPacket(ArraySegment<byte> body)
+    MqttPubCompPacket DecodePubCompPacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -245,7 +244,7 @@ MqttPacket DecodePubCompPacket(ArraySegment<byte> body)
         };
     }
 
-    MqttPacket DecodePublishPacket(ReceivedMqttPacket receivedMqttPacket)
+    MqttPublishPacket DecodePublishPacket(ReceivedMqttPacket receivedMqttPacket)
     {
         ThrowIfBodyIsEmpty(receivedMqttPacket.Body);
 
@@ -280,7 +279,7 @@ MqttPacket DecodePublishPacket(ReceivedMqttPacket receivedMqttPacket)
         return packet;
     }
 
-    MqttPacket DecodePubRecPacket(ArraySegment<byte> body)
+    MqttPubRecPacket DecodePubRecPacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -292,7 +291,7 @@ MqttPacket DecodePubRecPacket(ArraySegment<byte> body)
         };
     }
 
-    MqttPacket DecodePubRelPacket(ArraySegment<byte> body)
+    MqttPubRelPacket DecodePubRelPacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -304,7 +303,7 @@ MqttPacket DecodePubRelPacket(ArraySegment<byte> body)
         };
     }
 
-    MqttPacket DecodeSubAckPacket(ArraySegment<byte> body)
+    MqttSubAckPacket DecodeSubAckPacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -324,7 +323,7 @@ MqttPacket DecodeSubAckPacket(ArraySegment<byte> body)
         return packet;
     }
 
-    MqttPacket DecodeSubscribePacket(ArraySegment<byte> body)
+    MqttSubscribePacket DecodeSubscribePacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -349,7 +348,7 @@ MqttPacket DecodeSubscribePacket(ArraySegment<byte> body)
         return packet;
     }
 
-    MqttPacket DecodeUnsubAckPacket(ArraySegment<byte> body)
+    MqttUnsubAckPacket DecodeUnsubAckPacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -361,7 +360,7 @@ MqttPacket DecodeUnsubAckPacket(ArraySegment<byte> body)
         };
     }
 
-    MqttPacket DecodeUnsubscribePacket(ArraySegment<byte> body)
+    MqttUnsubscribePacket DecodeUnsubscribePacket(ArraySegment<byte> body)
     {
         ThrowIfBodyIsEmpty(body);
 
@@ -380,15 +379,15 @@ MqttPacket DecodeUnsubscribePacket(ArraySegment<byte> body)
         return packet;
     }
 
-    byte EncodeConnAckPacket(MqttConnAckPacket packet, MqttBufferWriter bufferWriter)
+    static byte EncodeConnAckPacket(MqttConnAckPacket packet, MqttBufferWriter bufferWriter)
     {
         bufferWriter.WriteByte(0); // Reserved.
         bufferWriter.WriteByte((byte)packet.ReturnCode);
 
         return MqttBufferWriter.BuildFixedHeader(MqttControlPacketType.ConnAck);
     }
 
-    byte EncodeConnAckPacketV311(MqttConnAckPacket packet, MqttBufferWriter bufferWriter)
+    static byte EncodeConnAckPacketV311(MqttConnAckPacket packet, MqttBufferWriter bufferWriter)
     {
         byte connectAcknowledgeFlags = 0x0;
         if (packet.IsSessionPresent)
@@ -402,7 +401,7 @@ byte EncodeConnAckPacketV311(MqttConnAckPacket packet, MqttBufferWriter bufferWr
         return MqttBufferWriter.BuildFixedHeader(MqttControlPacketType.ConnAck);
     }
 
-    byte EncodeConnectPacket(MqttConnectPacket packet, MqttBufferWriter bufferWriter)
+    static byte EncodeConnectPacket(MqttConnectPacket packet, MqttBufferWriter bufferWriter)
     {
         ValidateConnectPacket(packet);
 
@@ -471,7 +470,7 @@ byte EncodeConnectPacket(MqttConnectPacket packet, MqttBufferWriter bufferWriter
         return MqttBufferWriter.BuildFixedHeader(MqttControlPacketType.Connect);
     }
 
-    byte EncodeConnectPacketV311(MqttConnectPacket packet, MqttBufferWriter bufferWriter)
+    static byte EncodeConnectPacketV311(MqttConnectPacket packet, MqttBufferWriter bufferWriter)
     {
         ValidateConnectPacket(packet);
 
@@ -695,7 +694,7 @@ static byte EncodeSubAckPacket(MqttSubAckPacket packet, MqttBufferWriter bufferW
 
         bufferWriter.WriteTwoByteInteger(packet.PacketIdentifier);
 
-        if (packet.ReasonCodes.Any())
+        if (packet.ReasonCodes.Count != 0)
         {
             foreach (var packetSubscribeReturnCode in packet.ReasonCodes)
             {
@@ -723,7 +722,7 @@ static byte EncodeSubAckPacket(MqttSubAckPacket packet, MqttBufferWriter bufferW
 
     static byte EncodeSubscribePacket(MqttSubscribePacket packet, MqttBufferWriter bufferWriter)
     {
-        if (!packet.TopicFilters.Any())
+        if (packet.TopicFilters.Count == 0)
         {
             throw new MqttProtocolViolationException("At least one topic filter must be set [MQTT-3.8.3-3].");
         }
@@ -760,7 +759,7 @@ static byte EncodeUnsubAckPacket(MqttUnsubAckPacket packet, MqttBufferWriter buf
 
     static byte EncodeUnsubscribePacket(MqttUnsubscribePacket packet, MqttBufferWriter bufferWriter)
     {
-        if (!packet.TopicFilters.Any())
+        if (packet.TopicFilters.Count == 0)
         {
             throw new MqttProtocolViolationException("At least one topic filter must be set [MQTT-3.10.3-2].");
         }
@@ -772,7 +771,7 @@ static byte EncodeUnsubscribePacket(MqttUnsubscribePacket packet, MqttBufferWrit
 
         bufferWriter.WriteTwoByteInteger(packet.PacketIdentifier);
 
-        if (packet.TopicFilters?.Any() == true)
+        if (packet.TopicFilters?.Count > 0)
         {
             foreach (var topicFilter in packet.TopicFilters)
             {
@@ -792,7 +791,7 @@ static void ThrowIfBodyIsEmpty(ArraySegment<byte> body)
         }
     }
 
-    void ValidateConnectPacket(MqttConnectPacket packet)
+    static void ValidateConnectPacket(MqttConnectPacket packet)
     {
         ArgumentNullException.ThrowIfNull(packet);