YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-28 01:02:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust namespaces.

Browse Source
This commit is contained in:
Christian
2021-11-20 10:48:18 +01:00
parent 28310c69bb
commit c59969067c
45 changed files with 1482 additions and 1335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/MQTTnet.Benchmarks/MessageProcessingBenchmark.cs
+1
View File
@@ -2,6 +2,7 @@
using BenchmarkDotNet.Jobs;
using MQTTnet.Client;
using MQTTnet.Server;
using IMqttClient = MQTTnet.Client.IMqttClient;
namespace MQTTnet.Benchmarks
{
Tests/MQTTnet.Core.Tests/Client/ManagedMqttClient_Tests.cs
+1
View File
@@ -9,6 +9,7 @@ using MQTTnet.Diagnostics;
using MQTTnet.Extensions.ManagedClient;
using MQTTnet.Server;
using MQTTnet.Tests.Mockups;
using IMqttClient = MQTTnet.Client.IMqttClient;
namespace MQTTnet.Tests.Client
{
Tests/MQTTnet.Core.Tests/Internal/MqttPacketBus_Tests.cs
+32 -32
View File
@@ -18,7 +18,7 @@ namespace MQTTnet.Tests.Internal
using (var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(1)))
{
await bus.DequeueAsync(timeout.Token);
await bus.DequeueItemAsync(timeout.Token);
}
}
@@ -27,31 +27,31 @@ namespace MQTTnet.Tests.Internal
{
var bus = new MqttPacketBus();
bus.Enqueue(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.Enqueue(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.Enqueue(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.Enqueue(new MqttPacketBusItem(new MqttSubAckPacket()), MqttPacketBusPartition.Control);
bus.Enqueue(new MqttPacketBusItem(new MqttSubAckPacket()), MqttPacketBusPartition.Control);
bus.Enqueue(new MqttPacketBusItem(new MqttSubAckPacket()), MqttPacketBusPartition.Control);
bus.EnqueueItem(new MqttPacketBusItem(new MqttSubAckPacket()), MqttPacketBusPartition.Control);
bus.EnqueueItem(new MqttPacketBusItem(new MqttSubAckPacket()), MqttPacketBusPartition.Control);
bus.EnqueueItem(new MqttPacketBusItem(new MqttSubAckPacket()), MqttPacketBusPartition.Control);
bus.Enqueue(new MqttPacketBusItem(new MqttPingRespPacket()), MqttPacketBusPartition.Health);
bus.Enqueue(new MqttPacketBusItem(new MqttPingRespPacket()), MqttPacketBusPartition.Health);
bus.Enqueue(new MqttPacketBusItem(new MqttPingRespPacket()), MqttPacketBusPartition.Health);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPingRespPacket()), MqttPacketBusPartition.Health);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPingRespPacket()), MqttPacketBusPartition.Health);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPingRespPacket()), MqttPacketBusPartition.Health);
Assert.AreEqual(9, bus.PacketsCount);
Assert.AreEqual(9, bus.ItemsCount);
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
Assert.IsInstanceOfType(bus.DequeueAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
Assert.AreEqual(0, bus.PacketsCount);
Assert.AreEqual(0, bus.ItemsCount);
}
[TestMethod]
@@ -59,11 +59,11 @@ namespace MQTTnet.Tests.Internal
{
var bus = new MqttPacketBus();
bus.Enqueue(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.Enqueue(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.Enqueue(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
bus.EnqueueItem(new MqttPacketBusItem(new MqttPublishPacket()), MqttPacketBusPartition.Data);
Assert.AreEqual(3, bus.PacketsCount);
Assert.AreEqual(3, bus.ItemsCount);
var exportedPackets = bus.ExportPackets(MqttPacketBusPartition.Control);
Assert.AreEqual(0, exportedPackets.Count);
@@ -74,7 +74,7 @@ namespace MQTTnet.Tests.Internal
exportedPackets = bus.ExportPackets(MqttPacketBusPartition.Data);
Assert.AreEqual(3, exportedPackets.Count);
Assert.AreEqual(3, bus.PacketsCount);
Assert.AreEqual(3, bus.ItemsCount);
}
[TestMethod]
@@ -93,21 +93,21 @@ namespace MQTTnet.Tests.Internal
delivered = true;
};
bus.Enqueue(item1, MqttPacketBusPartition.Data);
bus.Enqueue(item2, MqttPacketBusPartition.Data);
bus.Enqueue(item3, MqttPacketBusPartition.Data);
bus.EnqueueItem(item1, MqttPacketBusPartition.Data);
bus.EnqueueItem(item2, MqttPacketBusPartition.Data);
bus.EnqueueItem(item3, MqttPacketBusPartition.Data);
Assert.IsFalse(delivered);
bus.DequeueAsync(CancellationToken.None).Result.MarkAsDelivered();
bus.DequeueItemAsync(CancellationToken.None).Result.MarkAsDelivered();
Assert.IsFalse(delivered);
bus.DequeueAsync(CancellationToken.None).Result.MarkAsDelivered();
bus.DequeueItemAsync(CancellationToken.None).Result.MarkAsDelivered();
Assert.IsFalse(delivered);
bus.DequeueAsync(CancellationToken.None).Result.MarkAsDelivered();
bus.DequeueItemAsync(CancellationToken.None).Result.MarkAsDelivered();
// The third packet has the event attached.
Assert.IsTrue(delivered);
Tests/MQTTnet.Core.Tests/Mockups/TestEnvironment.cs
+1
View File
@@ -12,6 +12,7 @@ using MQTTnet.Extensions.Rpc;
using MQTTnet.Extensions.Rpc.Options;
using MQTTnet.Formatter;
using MQTTnet.LowLevelClient;
using IMqttClient = MQTTnet.Client.IMqttClient;
namespace MQTTnet.Tests.Mockups
{
Tests/MQTTnet.Core.Tests/Server/General.cs
+630 -688
View File
File diff suppressed because it is too large Load Diff
Tests/MQTTnet.Core.Tests/Server/MqttSubscriptionsManager_Tests.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace MQTTnet.Tests.Server
retainedMessagesManager,
new MqttClientSessionsManager(options, retainedMessagesManager, eventContainer, logger));
_subscriptionsManager = new MqttClientSubscriptionsManager(session, new MqttServerOptions(), new MqttServerEventContainer(),
_subscriptionsManager = new MqttClientSubscriptionsManager(session, new MqttServerEventContainer(),
new MqttRetainedMessagesManager(new MqttServerEventContainer(), new MqttNetNullLogger()));
}
Tests/MQTTnet.Core.Tests/Server/Session_Tests.cs
+6 -7
View File
@@ -6,6 +6,7 @@ using MQTTnet.Client;
using MQTTnet.Protocol;
using MQTTnet.Server;
using MQTTnet.Tests.Mockups;
using IMqttClient = MQTTnet.Client.IMqttClient;
namespace MQTTnet.Tests.Server
{
@@ -124,18 +125,16 @@ namespace MQTTnet.Tests.Server
{
// Arrange client and server.
var server = await testEnvironment.StartServer(o => o.WithPersistentSessions(false));
var client = await testEnvironment.ConnectClient();
// Arrange session status tracking.
var status = await server.GetSessionsAsync();
var clientStatus = status[0];
var deletedEventFired = false;
clientStatus.Deleted += (_, __) =>
server.SessionDeletedAsync += e =>
{
deletedEventFired = true;
return Task.CompletedTask;
};
var client = await testEnvironment.ConnectClient();
// Act: Disconnect the client -> Event must be fired.
await client.DisconnectAsync();
Tests/MQTTnet.Core.Tests/Server/Status_Tests.cs
+4 -4
View File
@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Client;
@@ -29,8 +29,8 @@ namespace MQTTnet.Tests.Server
Assert.AreEqual(2, clientStatus.Count);
Assert.AreEqual(2, sessionStatus.Count);
Assert.IsTrue(clientStatus.Any(s => s.ClientId == c1.Options.ClientId));
Assert.IsTrue(clientStatus.Any(s => s.ClientId == c2.Options.ClientId));
Assert.IsTrue(clientStatus.Any(s => s.Id == c1.Options.ClientId));
Assert.IsTrue(clientStatus.Any(s => s.Id == c2.Options.ClientId));
await c1.DisconnectAsync();
await c2.DisconnectAsync();
@@ -59,7 +59,7 @@ namespace MQTTnet.Tests.Server
var clientStatus = await server.GetClientsAsync();
Assert.AreEqual(1, clientStatus.Count);
Assert.IsTrue(clientStatus.Any(s => s.ClientId == c1.Options.ClientId));
Assert.IsTrue(clientStatus.Any(s => s.Id == c1.Options.ClientId));
await clientStatus.First().DisconnectAsync();
Tests/MQTTnet.TestApp.AspNetCore2/Startup.cs
+7 -1
View File
@@ -9,6 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
using MQTTnet.AspNetCore;
using MQTTnet.AspNetCore.Extensions;
using MQTTnet.Server;
namespace MQTTnet.TestApp.AspNetCore2
{
@@ -55,7 +56,12 @@ namespace MQTTnet.TestApp.AspNetCore2
{
try
{
await server.PublishAsync("server", msg.Build());
await server.InjectApplicationMessage(new MqttServer.MqttInjectedApplicationMessage
{
SenderClientId = "server",
ApplicationMessage = msg.Build()
});
msg.WithPayload($"Mqtt hosted on {frameworkName} is still awesome at {DateTime.Now}");
}
catch (Exception e)
Tests/MQTTnet.TestApp.NetCore/PerformanceTest.cs
+1
View File
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
using MQTTnet.Client;
using MQTTnet.Protocol;
using MQTTnet.Server;
using IMqttClient = MQTTnet.Client.IMqttClient;
namespace MQTTnet.TestApp.NetCore
{
Tests/MQTTnet.TestApp.NetCore/ServerTest.cs
+1 -1
View File
@@ -86,7 +86,7 @@ namespace MQTTnet.TestApp.NetCore
retainedMessages = new List<MqttApplicationMessage>();
}
e.StoredRetainedMessages = retainedMessages;
e.LoadedRetainedMessages = retainedMessages;
return Task.FromResult(0);
};