Merge branch 'develop' into ServerShutdown

Tests/MQTTnet.Core.Tests/MqttClientTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
@@ -8,13 +8,14 @@ using MQTTnet.Client;
 using MQTTnet.Diagnostics;
 using MQTTnet.Exceptions;
 using MQTTnet.Packets;
+using MQTTnet.Implementations;
+using MQTTnet.Server;
 
 namespace MQTTnet.Core.Tests
 {
     [TestClass]
     public class MqttClientTests
     {
-
         [TestMethod]
         public async Task ClientDisconnectException()
         {

Tests/MQTTnet.Core.Tests/MqttKeepAliveMonitorTests.cs

@@ -60,7 +60,7 @@ namespace MQTTnet.Core.Tests
         {
             public string ClientId { get; }
 
-            public int StopCalledCount { get; set; }
+            public int StopCalledCount { get; private set; }
 
             public void FillStatus(MqttClientSessionStatus status)
             {
@@ -77,7 +77,7 @@ namespace MQTTnet.Core.Tests
                 throw new NotSupportedException();
             }
 
-            public Task<bool> RunAsync(MqttConnectPacket connectPacket, IMqttChannelAdapter adapter)
+            public Task RunAsync(MqttConnectPacket connectPacket, IMqttChannelAdapter adapter)
             {
                 throw new NotSupportedException();
             }

Tests/MQTTnet.Core.Tests/MqttServerTests.cs

@@ -552,6 +552,54 @@ namespace MQTTnet.Core.Tests
             Assert.IsTrue(bodyIsMatching);
         }
 
+        [TestMethod]
+        public async Task MqttServer_SameClientIdConnectDisconnectEventOrder()
+        {
+            var serverAdapter = new MqttTcpServerAdapter(new MqttNetLogger().CreateChildLogger());
+            var s = new MqttFactory().CreateMqttServer(new[] { serverAdapter }, new MqttNetLogger());
+
+            var connectedClient = false;
+            var connecteCalledBeforeConnectedClients = false;
+
+            s.ClientConnected += (_, __) =>
+            {
+                connecteCalledBeforeConnectedClients |= connectedClient;
+                connectedClient = true;
+            };
+
+            s.ClientDisconnected += (_, __) =>
+            {
+                connectedClient = false;
+            };
+
+            var clientOptions = new MqttClientOptionsBuilder()
+                .WithTcpServer("localhost")
+                .WithClientId(Guid.NewGuid().ToString())
+                .Build();
+
+            await s.StartAsync(new MqttServerOptions());
+
+            var c1 = new MqttFactory().CreateMqttClient();
+            var c2 = new MqttFactory().CreateMqttClient();
+
+            await c1.ConnectAsync(clientOptions);
+
+            await Task.Delay(100);
+
+            await c2.ConnectAsync(clientOptions);
+
+            await Task.Delay(100);
+
+            await c1.DisconnectAsync();
+            await c2.DisconnectAsync();
+
+            await s.StopAsync();
+
+            await Task.Delay(100);
+
+            Assert.IsFalse(connecteCalledBeforeConnectedClients, "ClientConnected was called before ClientDisconnect was called");
+        }
+
         private class TestStorage : IMqttServerStorage
         {
             public IList<MqttApplicationMessage> Messages = new List<MqttApplicationMessage>();