fixed clients overlapping from one test to another by:

- adding client and server wrappers to verify the clientid starts with the testname - adding disposable baseclass - clear disconnect handler from client so it does not try to reconnect after it is disposed - moved code from dispose to cleanup in case it is called in a stop method as dispose may only be called once while start / stop may be called multiple times
2026-10-20 11:45:43 +08:00 · 2019-12-20 15:37:23 +01:00
parent 624fafc662
commit 14419e4d63
22 changed files with 486 additions and 170 deletions
@@ -22,10 +22,12 @@ namespace MQTTnet.Tests
    [TestClass]
    public class Server_Tests
    {
+        public TestContext TestContext { get; set; }
+
        [TestMethod]
        public async Task Use_Empty_Client_ID()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync();

@@ -51,7 +53,8 @@ namespace MQTTnet.Tests
                MqttQualityOfServiceLevel.AtMostOnce,
                "A/B/C",
                MqttQualityOfServiceLevel.AtMostOnce,
-                1);
+                1, 
+                TestContext);
        }

        [TestMethod]
@@ -62,7 +65,8 @@ namespace MQTTnet.Tests
                MqttQualityOfServiceLevel.AtLeastOnce,
                "A/B/C",
                MqttQualityOfServiceLevel.AtLeastOnce,
-                1);
+                1,
+                TestContext);
        }

        [TestMethod]
@@ -73,13 +77,14 @@ namespace MQTTnet.Tests
                MqttQualityOfServiceLevel.ExactlyOnce,
                "A/B/C",
                MqttQualityOfServiceLevel.ExactlyOnce,
-                1);
+                1,
+                TestContext);
        }

        [TestMethod]
        public async Task Use_Clean_Session()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync();

@@ -93,7 +98,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Will_Message_Do_Not_Send()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var receivedMessagesCount = 0;

@@ -119,7 +124,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Will_Message_Send()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var receivedMessagesCount = 0;

@@ -145,7 +150,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Intercept_Subscription()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder().WithSubscriptionInterceptor(
                    c =>
@@ -184,7 +189,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Subscribe_Unsubscribe()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var receivedMessagesCount = 0;

@@ -204,7 +209,7 @@ namespace MQTTnet.Tests
                var subscribeEventCalled = false;
                server.ClientSubscribedTopicHandler = new MqttServerClientSubscribedHandlerDelegate(e =>
                {
-                    subscribeEventCalled = e.TopicFilter.Topic == "a" && e.ClientId == "c1";
+                    subscribeEventCalled = e.TopicFilter.Topic == "a" && e.ClientId == c1.Options.ClientId;
                });

                await c1.SubscribeAsync(new TopicFilter { Topic = "a", QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce });
@@ -218,7 +223,7 @@ namespace MQTTnet.Tests
                var unsubscribeEventCalled = false;
                server.ClientUnsubscribedTopicHandler = new MqttServerClientUnsubscribedTopicHandlerDelegate(e =>
                {
-                    unsubscribeEventCalled = e.TopicFilter == "a" && e.ClientId == "c1";
+                    unsubscribeEventCalled = e.TopicFilter == "a" && e.ClientId == c1.Options.ClientId;
                });

                await c1.UnsubscribeAsync("a");
@@ -238,7 +243,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Subscribe_Multiple_In_Single_Request()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var receivedMessagesCount = 0;

@@ -271,7 +276,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Subscribe_Multiple_In_Multiple_Request()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var receivedMessagesCount = 0;

@@ -310,7 +315,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Publish_From_Server()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync();

@@ -336,7 +341,7 @@ namespace MQTTnet.Tests
            var receivedMessagesCount = 0;
            var locked = new object();

-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync();

@@ -378,7 +383,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Session_Takeover()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync();

@@ -400,7 +405,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task No_Messages_If_No_Subscription()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync();

@@ -433,7 +438,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Set_Subscription_At_Server()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync();
                server.ClientConnectedHandler = new MqttServerClientConnectedHandlerDelegate(e => server.SubscribeAsync(e.ClientId, "topic1"));
@@ -464,7 +469,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Shutdown_Disconnects_Clients_Gracefully()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder());

@@ -486,7 +491,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Handle_Clean_Disconnect()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder());

@@ -515,7 +520,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Client_Disconnect_Without_Errors()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                bool clientWasConnected;

@@ -546,7 +551,7 @@ namespace MQTTnet.Tests
        {
            const int ClientCount = 50;

-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync();

@@ -598,7 +603,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Retained_Messages_Flow()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var retainedMessage = new MqttApplicationMessageBuilder().WithTopic("r").WithPayload("r").WithRetainFlag().Build();

@@ -635,7 +640,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Receive_No_Retained_Message_After_Subscribe()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync();

@@ -658,7 +663,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Receive_Retained_Message_After_Subscribe()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync();

@@ -689,7 +694,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Clear_Retained_Message_With_Empty_Payload()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var receivedMessagesCount = 0;

@@ -717,7 +722,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Clear_Retained_Message_With_Null_Payload()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var receivedMessagesCount = 0;

@@ -745,7 +750,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Intercept_Application_Message()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync(
                    new MqttServerOptionsBuilder().WithApplicationMessageInterceptor(
@@ -768,7 +773,7 @@ namespace MQTTnet.Tests
        {
            var serverStorage = new TestServerStorage();

-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder().WithStorage(serverStorage));

@@ -785,7 +790,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Publish_After_Client_Connects()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync();
                server.UseClientConnectedHandler(async e =>
@@ -818,7 +823,7 @@ namespace MQTTnet.Tests
                context.ApplicationMessage.Payload = Encoding.ASCII.GetBytes("extended");
            }

-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder().WithApplicationMessageInterceptor(Interceptor));

@@ -844,7 +849,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Send_Long_Body()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                const int PayloadSizeInMB = 30;
                const int CharCount = PayloadSizeInMB * 1024 * 1024;
@@ -892,28 +897,15 @@ namespace MQTTnet.Tests
                context.ReturnCode = MqttConnectReturnCode.ConnectionRefusedNotAuthorized;
            });

-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                testEnvironment.IgnoreClientLogErrors = true;

                await testEnvironment.StartServerAsync(serverOptions);

-                try
-                {
-                    await testEnvironment.ConnectClientAsync();
-                    Assert.Fail("An exception should be raised.");
-                }
-                catch (Exception exception)
-                {
-                    if (exception is MqttConnectingFailedException connectingFailedException)
-                    {
-                        Assert.AreEqual(MqttClientConnectResultCode.NotAuthorized, connectingFailedException.ResultCode);
-                    }
-                    else
-                    {
-                        Assert.Fail("Wrong exception.");
-                    }
-                }
+
+                var connectingFailedException = await Assert.ThrowsExceptionAsync<MqttConnectingFailedException>(() => testEnvironment.ConnectClientAsync());
+                Assert.AreEqual(MqttClientConnectResultCode.NotAuthorized, connectingFailedException.ResultCode);
            }
        }

@@ -934,7 +926,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Same_Client_Id_Refuse_Connection()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                testEnvironment.IgnoreClientLogErrors = true;

@@ -1023,7 +1015,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Same_Client_Id_Connect_Disconnect_Event_Order()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder());

@@ -1107,7 +1099,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Remove_Session()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder());

@@ -1126,7 +1118,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Stop_And_Restart()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                testEnvironment.IgnoreClientLogErrors = true;

@@ -1152,7 +1144,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Close_Idle_Connection()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder().WithDefaultCommunicationTimeout(TimeSpan.FromSeconds(1)));

@@ -1181,7 +1173,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Send_Garbage()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder().WithDefaultCommunicationTimeout(TimeSpan.FromSeconds(1)));

@@ -1214,7 +1206,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Do_Not_Send_Retained_Messages_For_Denied_Subscription()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder().WithSubscriptionInterceptor(c =>
                {
@@ -1258,7 +1250,7 @@ namespace MQTTnet.Tests
        [TestMethod]
        public async Task Collect_Messages_In_Disconnected_Session()
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(TestContext))
            {
                var server = await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder().WithPersistentSessions());

@@ -1285,7 +1277,7 @@ namespace MQTTnet.Tests
                Assert.AreEqual(0, clientStatus.Count);
                Assert.AreEqual(2, sessionStatus.Count);

-                Assert.AreEqual(3, sessionStatus.First(s => s.ClientId == "a").PendingApplicationMessagesCount);
+                Assert.AreEqual(3, sessionStatus.First(s => s.ClientId == client1.Options.ClientId).PendingApplicationMessagesCount);
            }
        }

@@ -1294,9 +1286,10 @@ namespace MQTTnet.Tests
            MqttQualityOfServiceLevel qualityOfServiceLevel,
            string topicFilter,
            MqttQualityOfServiceLevel filterQualityOfServiceLevel,
-            int expectedReceivedMessagesCount)
+            int expectedReceivedMessagesCount,
+            TestContext testContext)
        {
-            using (var testEnvironment = new TestEnvironment())
+            using (var testEnvironment = new TestEnvironment(testContext))
            {
                var receivedMessagesCount = 0;