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

Fix server adapter memory leak and UnitTests

Browse Source
This commit is contained in:
Christian Kratky
2020-07-25 23:34:30 +02:00
parent 5056843611
commit 4e6aeb91a4
11 changed files with 125 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/MQTTnet.Core.Tests/Mockups/TestEnvironment.cs
+27 -30
View File
@@ -2,7 +2,6 @@
using MQTTnet.Client;
using MQTTnet.Client.Options;
using MQTTnet.Diagnostics;
using MQTTnet.Internal;
using MQTTnet.Server;
using System;
using System.Collections.Generic;
@@ -11,13 +10,10 @@ using System.Threading.Tasks;
namespace MQTTnet.Tests.Mockups
{
public sealed class TestEnvironment : Disposable
public sealed class TestEnvironment : IDisposable
{
readonly MqttFactory _mqttFactory = new MqttFactory();
readonly List<IMqttClient> _clients = new List<IMqttClient>();
readonly IMqttNetLogger _serverLogger = new MqttNetLogger("server");
readonly IMqttNetLogger _clientLogger = new MqttNetLogger("client");
readonly List<string> _serverErrors = new List<string>();
readonly List<string> _clientErrors = new List<string>();
@@ -31,9 +27,9 @@ namespace MQTTnet.Tests.Mockups
public int ServerPort { get; set; } = 1888;
public IMqttNetLogger ServerLogger => _serverLogger;
public IMqttNetLogger ServerLogger { get; } = new MqttNetLogger("server");
public IMqttNetLogger ClientLogger => _clientLogger;
public IMqttNetLogger ClientLogger { get; } = new MqttNetLogger("client");
public TestContext TestContext { get; }
@@ -45,7 +41,7 @@ namespace MQTTnet.Tests.Mockups
{
TestContext = testContext;
_serverLogger.LogMessagePublished += (s, e) =>
ServerLogger.LogMessagePublished += (s, e) =>
{
if (e.LogMessage.Level == MqttNetLogLevel.Error)
{
@@ -56,7 +52,7 @@ namespace MQTTnet.Tests.Mockups
}
};
_clientLogger.LogMessagePublished += (s, e) =>
ClientLogger.LogMessagePublished += (s, e) =>
{
if (e.LogMessage.Level == MqttNetLogLevel.Error)
{
@@ -70,7 +66,7 @@ namespace MQTTnet.Tests.Mockups
public IMqttClient CreateClient()
{
var client = _mqttFactory.CreateMqttClient(_clientLogger);
var client = _mqttFactory.CreateMqttClient(ClientLogger);
_clients.Add(client);
return new TestClientWrapper(client, TestContext);
@@ -83,13 +79,18 @@ namespace MQTTnet.Tests.Mockups
public async Task<IMqttServer> StartServerAsync(MqttServerOptionsBuilder options)
{
if (options == null) throw new ArgumentNullException(nameof(options));
if (Server != null)
{
throw new InvalidOperationException("Server already started.");
}
Server = new TestServerWrapper(_mqttFactory.CreateMqttServer(_serverLogger), TestContext, this);
await Server.StartAsync(options.WithDefaultEndpointPort(ServerPort).Build());
Server = new TestServerWrapper(_mqttFactory.CreateMqttServer(ServerLogger), TestContext, this);
options.WithDefaultEndpointPort(ServerPort);
await Server.StartAsync(options.Build()).ConfigureAwait(false);
return Server;
}
@@ -106,7 +107,7 @@ namespace MQTTnet.Tests.Mockups
options = options.WithTcpServer("localhost", ServerPort);
var client = CreateClient();
await client.ConnectAsync(options.Build());
await client.ConnectAsync(options.Build()).ConfigureAwait(false);
return client;
}
@@ -116,7 +117,7 @@ namespace MQTTnet.Tests.Mockups
if (options == null) throw new ArgumentNullException(nameof(options));
var client = CreateClient();
await client.ConnectAsync(options);
await client.ConnectAsync(options).ConfigureAwait(false);
return client;
}
@@ -140,26 +141,22 @@ namespace MQTTnet.Tests.Mockups
}
}
protected override void Dispose(bool disposing)
public void Dispose()
{
if (disposing)
foreach (var mqttClient in _clients)
{
foreach (var mqttClient in _clients)
{
mqttClient?.Dispose();
}
Server?.StopAsync().GetAwaiter().GetResult();
ThrowIfLogErrors();
if (_exceptions.Any())
{
throw new Exception($"{_exceptions.Count} exceptions tracked.\r\n" + string.Join(Environment.NewLine, _exceptions));
}
mqttClient?.Dispose();
}
base.Dispose(disposing);
Server?.StopAsync().GetAwaiter().GetResult();
Server?.Dispose();
ThrowIfLogErrors();
if (_exceptions.Any())
{
throw new Exception($"{_exceptions.Count} exceptions tracked.\r\n" + string.Join(Environment.NewLine, _exceptions));
}
}
public void TrackException(Exception exception)
Tests/MQTTnet.Core.Tests/Mockups/TestServerWrapper.cs
+4
View File
@@ -132,5 +132,9 @@ namespace MQTTnet.Tests.Mockups
{
return Implementation.UnsubscribeAsync(clientId, topicFilters);
}
public void Dispose()
{
}
}
}
Tests/MQTTnet.Core.Tests/Server_Tests.cs
+16 -17
View File
@@ -287,7 +287,7 @@ namespace MQTTnet.Tests
c1.UseApplicationMessageReceivedHandler(c => Interlocked.Increment(ref receivedMessagesCount));
var optionsBuilder = new MqttClientSubscribeOptionsBuilder();
for (var i = 0; i < 1000; i++)
for (var i = 0; i < 500; i++)
{
optionsBuilder.WithTopicFilter(i.ToString(), MqttQualityOfServiceLevel.AtMostOnce);
}
@@ -297,16 +297,16 @@ namespace MQTTnet.Tests
var c2 = await testEnvironment.ConnectClientAsync();
var messageBuilder = new MqttApplicationMessageBuilder();
for (var i = 0; i < 1000; i++)
for (var i = 0; i < 500; i++)
{
messageBuilder.WithTopic(i.ToString());
await c2.PublishAsync(messageBuilder.Build()).ConfigureAwait(false);
}
SpinWait.SpinUntil(() => receivedMessagesCount == 1000, 2000);
SpinWait.SpinUntil(() => receivedMessagesCount == 500, 2000);
Assert.AreEqual(1000, receivedMessagesCount);
Assert.AreEqual(500, receivedMessagesCount);
}
}
@@ -322,7 +322,7 @@ namespace MQTTnet.Tests
var c1 = await testEnvironment.ConnectClientAsync();
c1.UseApplicationMessageReceivedHandler(c => Interlocked.Increment(ref receivedMessagesCount));
for (var i = 0; i < 1000; i++)
for (var i = 0; i < 500; i++)
{
var so = new MqttClientSubscribeOptionsBuilder()
.WithTopicFilter(i.ToString(), MqttQualityOfServiceLevel.AtMostOnce).Build();
@@ -333,16 +333,16 @@ namespace MQTTnet.Tests
var c2 = await testEnvironment.ConnectClientAsync();
var messageBuilder = new MqttApplicationMessageBuilder();
for (var i = 0; i < 1000; i++)
for (var i = 0; i < 500; i++)
{
messageBuilder.WithTopic(i.ToString());
await c2.PublishAsync(messageBuilder.Build()).ConfigureAwait(false);
}
SpinWait.SpinUntil(() => receivedMessagesCount == 1000, 2000);
SpinWait.SpinUntil(() => receivedMessagesCount == 500, 2000);
Assert.AreEqual(1000, receivedMessagesCount);
Assert.AreEqual(500, receivedMessagesCount);
}
}
@@ -1391,14 +1391,14 @@ namespace MQTTnet.Tests
using (var testEnvironment = new TestEnvironment())
{
var undeliverd = string.Empty;
var svr = await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder().WithUndeliveredMessageInterceptor(
context =>
{
undeliverd = context.ApplicationMessage.Topic;
}));
var topicAReceived = false;
var topicBReceived = false;
var options = new MqttServerOptionsBuilder().WithUndeliveredMessageInterceptor(
context =>
{
undeliverd = context.ApplicationMessage.Topic;
});
await testEnvironment.StartServerAsync(options);
var client = await testEnvironment.ConnectClientAsync();
@@ -1408,8 +1408,7 @@ namespace MQTTnet.Tests
await Task.Delay(500);
Assert.AreEqual(undeliverd, "a");
Assert.AreEqual("a", undeliverd);
}
}
}