YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-24 22:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/chkr1011/MQTTnet into feature/Reason_Code_In_Subscription_Interceptor

Browse Source 
# Conflicts:
#	Build/MQTTnet.nuspec
#	Source/MQTTnet/Server/Internal/MqttClientSessionsManager.cs
This commit is contained in:
Christian
2021-10-29 21:58:57 +02:00
parent d5237bb3f5
commit 6bad9f183c
191 changed files with 601 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/MQTTnet.Core.Tests/Client/ManagedMqttClient_Tests.cs
+23 -17
View File
@@ -5,11 +5,7 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Client;
using MQTTnet.Client.Connecting;
using MQTTnet.Client.Options;
using MQTTnet.Client.Receiving;
using MQTTnet.Diagnostics;
using MQTTnet.Diagnostics.Logger;
using MQTTnet.Extensions.ManagedClient;
using MQTTnet.Server;
using MQTTnet.Tests.Mockups;
@@ -73,10 +69,15 @@ namespace MQTTnet.Tests.Client
.WithClientOptions(clientOptions)
.Build());
var recievingClient = await testEnvironment.ConnectClient();
await recievingClient.SubscribeAsync("My/last/will");
recievingClient.UseApplicationMessageReceivedHandler(context => Interlocked.Increment(ref receivedMessagesCount));
var receivingClient = await testEnvironment.ConnectClient();
receivingClient.ApplicationMessageReceivedAsync += e =>
{
Interlocked.Increment(ref receivedMessagesCount);
return Task.CompletedTask;
};
await receivingClient.SubscribeAsync("My/last/will");
dyingManagedClient.Dispose();
@@ -314,10 +315,11 @@ namespace MQTTnet.Tests.Client
var receivedManagedMessages = new List<MqttApplicationMessage>();
var managedClient = new ManagedMqttClient(testEnvironment.CreateClient(), new MqttNetEventLogger());
managedClient.ApplicationMessageReceivedHandler = new MqttApplicationMessageReceivedHandlerDelegate(c =>
managedClient.ApplicationMessageReceivedAsync += e =>
{
receivedManagedMessages.Add(c.ApplicationMessage);
});
receivedManagedMessages.Add(e.ApplicationMessage);
return Task.CompletedTask;
};
await managedClient.SubscribeAsync("topic");
@@ -399,14 +401,16 @@ namespace MQTTnet.Tests.Client
try
{
var sendClient = await testEnvironment.ConnectClient(options);
sendClient.ApplicationMessageReceivedHandler = new MQTTnet.Client.Receiving.MqttApplicationMessageReceivedHandlerDelegate(e =>
sendClient.ApplicationMessageReceivedAsync += e =>
{
onReceive();
});
return Task.CompletedTask;
};
await sendClient.SubscribeAsync("aaa");
return sendClient;
}
catch (System.Exception)
catch (Exception)
{
return null;
}
@@ -465,15 +469,17 @@ namespace MQTTnet.Tests.Client
var receivedMessages = new List<MqttApplicationMessage>();
var result = new TaskCompletionSource<List<MqttApplicationMessage>>(TaskCreationOptions.RunContinuationsAsynchronously);
managedClient.ApplicationMessageReceivedHandler = new MqttApplicationMessageReceivedHandlerDelegate(r =>
managedClient.ApplicationMessageReceivedAsync += e =>
{
receivedMessages.Add(r.ApplicationMessage);
receivedMessages.Add(e.ApplicationMessage);
if (receivedMessages.Count == expectedNumberOfMessages)
{
result.TrySetResult(receivedMessages);
}
});
return Task.CompletedTask;
};
return result.Task;
}