Fix merge conflicts

Source/MQTTnet.Tests/ManagedMqttClient/ManagedMqttClient_Connection_Tests.cs

@@ -9,10 +9,10 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Client;
-using MQTTnet.Diagnostics;
 using MQTTnet.Extensions.ManagedClient;
 using MQTTnet.Formatter;
 using MQTTnet.Internal;
+using MQTTnet.Protocol;
 using MQTTnet.Server;
 using MQTTnet.Tests.Mockups;
 
@@ -86,11 +86,9 @@ namespace MQTTnet.Tests.ManagedMqttClient
             using (var testEnvironment = CreateTestEnvironment())
             {
                 await testEnvironment.StartServer();
-                var managedClient = await testEnvironment.StartManagedClient();
-
                 await LongTestDelay();
 
-                var managedClient = testEnvironment.Factory.CreateManagedMqttClient(mqttClient);
+                var managedClient = testEnvironment.Factory.CreateManagedMqttClient(testEnvironment.CreateClient());
 
                 ConnectingFailedEventArgs connectingFailedEventArgs = null;
                 managedClient.ConnectingFailedAsync += args =>
@@ -314,7 +312,6 @@ namespace MQTTnet.Tests.ManagedMqttClient
                 await server.InjectApplicationMessage(testEnvironment.Factory.CreateApplicationMessageBuilder().WithTopic("topic").WithPayload("payload").WithRetainFlag().Build());
                 
                 // Now use the managed client and check if subscriptions get cleared properly.
-                var managedClient = testEnvironment.CreateManagedMqttClient();
                 var receivedManagedMessages = new List<MqttApplicationMessage>();
                 
                 var managedClient = testEnvironment.Factory.CreateManagedMqttClient(testEnvironment.CreateClient());
@@ -453,7 +450,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
 
             managedClient.ConnectedAsync += e =>
             {
-                connected.TrySetResult(true);
+                promise.TrySetResult(true);
                 return CompletedTask.Instance;
             };
 

Source/MQTTnet.Tests/ManagedMqttClient/ManagedMqttClient_Event_Tests.cs

@@ -7,7 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Extensions.ManagedClient;
-using MQTTnet.Implementations;
+using MQTTnet.Internal;
 
 namespace MQTTnet.Tests.ManagedMqttClient
 {
@@ -27,7 +27,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
                 managedClient.ConnectedAsync += e =>
                 {
                     eventFired = true;
-                    return PlatformAbstractionLayer.CompletedTask;
+                    return CompletedTask.Instance;
                 };
 
                 await managedClient.StartAsync(testEnvironment.CreateDefaultManagedMqttClientOptions());
@@ -51,7 +51,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
                 managedClient.ConnectingFailedAsync += args =>
                 {
                     connectingFailedEventArgs = args;
-                    return PlatformAbstractionLayer.CompletedTask;
+                    return CompletedTask.Instance;
                 };
 
                 await managedClient.StartAsync(
@@ -82,7 +82,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
                 managedClient.DisconnectedAsync += e =>
                 {
                     eventFired = true;
-                    return PlatformAbstractionLayer.CompletedTask;
+                    return CompletedTask.Instance;
                 };
 
                 await managedClient.StartAsync(testEnvironment.CreateDefaultManagedMqttClientOptions());
@@ -110,7 +110,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
                 managedClient.ApplicationMessageEnqueueingAsync += e =>
                 {
                     eventFired = true;
-                    return PlatformAbstractionLayer.CompletedTask;
+                    return CompletedTask.Instance;
                 };
 
                 await managedClient.EnqueueAsync("A");
@@ -134,7 +134,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
                 managedClient.SubscribeProcessedAsync += e =>
                 {
                     eventFired = e.Options.TopicFilters[0].Topic == "A";
-                    return PlatformAbstractionLayer.CompletedTask;
+                    return CompletedTask.Instance;
                 };
 
                 await managedClient.StartAsync(testEnvironment.CreateDefaultManagedMqttClientOptions());
@@ -160,7 +160,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
                 managedClient.UnsubscribeProcessedAsync += e =>
                 {
                     eventFired = e.Options.TopicFilters[0] == "A";
-                    return PlatformAbstractionLayer.CompletedTask;
+                    return CompletedTask.Instance;
                 };
 
                 await managedClient.StartAsync(testEnvironment.CreateDefaultManagedMqttClientOptions());

Source/MQTTnet.Tests/ManagedMqttClient/ManagedMqttClient_Messages_Tests.cs

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Extensions.ManagedClient;
 using MQTTnet.Implementations;
+using MQTTnet.Internal;
 using MQTTnet.Server;
 
 namespace MQTTnet.Tests.ManagedMqttClient
@@ -93,7 +94,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
                 managedClient.ApplicationMessageReceivedAsync += e =>
                 {
                     applicationMessages.Add(e.ApplicationMessage);
-                    return PlatformAbstractionLayer.CompletedTask;
+                    return CompletedTask.Instance;
                 };
 
                 await managedClient.SubscribeAsync("B");

Source/MQTTnet.Tests/Mockups/TestEnvironment.cs

@@ -452,7 +452,7 @@ namespace MQTTnet.Tests.Mockups
                 ServerReceivedApplicationMessages.Add(arg.ApplicationMessage);
             }
 
-            return PlatformAbstractionLayer.CompletedTask;
+            return CompletedTask.Instance;
         }
     }
 }