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

Use latest language features (#2176)

Browse Source 
* Make use of language features line AsyncDispose, init etc.

* Fix build errors

* Improve Unit Tests

* Improve Unit Tests

* Improve Unit Tests

* Update samples

* Remove obsolete benchmarks

* Code cleanup

* Improve unit tests

* Improve Unit Tests

* Fix Unit Tests

* Improve Unit Tests

* Improve Unit Tests

* Restore unit tests

* Exclude load tests from unit tests
This commit is contained in:
Christian
2025-08-30 10:52:59 +02:00
committed by GitHub
parent 247988e633
commit e43e7f8e36
330 changed files with 21417 additions and 22919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet.Tests/Diagnostics/Logger_Tests.cs
+52 -52
View File
@@ -6,61 +6,61 @@ using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Diagnostics.Logger;
namespace MQTTnet.Tests.Diagnostics
namespace MQTTnet.Tests.Diagnostics;
// ReSharper disable InconsistentNaming
[TestClass]
public sealed class Logger_Tests : BaseTestClass
{
[TestClass]
public sealed class Logger_Tests : BaseTestClass
[TestMethod]
public void Log_Without_Source()
{
[TestMethod]
public void Log_Without_Source()
var logger = new MqttNetEventLogger();
MqttNetLogMessage logMessage = null;
logger.LogMessagePublished += (_, e) => { logMessage = e.LogMessage; };
logger.Publish(MqttNetLogLevel.Info, "SOURCE", "MESSAGE", ["ABC"], new InvalidOperationException());
Assert.AreEqual(MqttNetLogLevel.Info, logMessage.Level);
Assert.AreEqual("SOURCE", logMessage.Source);
Assert.AreEqual("MESSAGE", logMessage.Message);
Assert.AreEqual("InvalidOperationException", logMessage.Exception.GetType().Name);
}
[TestMethod]
public void Root_Log_Messages()
{
var logger = new MqttNetEventLogger();
var childLogger = logger.WithSource("Source1");
var logMessagesCount = 0;
logger.LogMessagePublished += (_, _) => { logMessagesCount++; };
childLogger.Verbose("Verbose");
childLogger.Info("Info");
childLogger.Warning((Exception)null, "Warning");
childLogger.Error(null, "Error");
Assert.AreEqual(4, logMessagesCount);
}
[TestMethod]
public void Use_Custom_Log_Id()
{
var logger = new MqttNetEventLogger("logId");
var childLogger = logger.WithSource("Source1");
logger.LogMessagePublished += (_, e) =>
{
var logger = new MqttNetEventLogger();
Assert.AreEqual("logId", e.LogMessage.LogId);
Assert.AreEqual("Source1", e.LogMessage.Source);
};
MqttNetLogMessage logMessage = null;
logger.LogMessagePublished += (s, e) => { logMessage = e.LogMessage; };
logger.Publish(MqttNetLogLevel.Info, "SOURCE", "MESSAGE", new object[] { "ABC" }, new InvalidOperationException());
Assert.AreEqual(MqttNetLogLevel.Info, logMessage.Level);
Assert.AreEqual("SOURCE", logMessage.Source);
Assert.AreEqual("MESSAGE", logMessage.Message);
Assert.AreEqual("InvalidOperationException", logMessage.Exception.GetType().Name);
}
[TestMethod]
public void Root_Log_Messages()
{
var logger = new MqttNetEventLogger();
var childLogger = logger.WithSource("Source1");
var logMessagesCount = 0;
logger.LogMessagePublished += (s, e) => { logMessagesCount++; };
childLogger.Verbose("Verbose");
childLogger.Info("Info");
childLogger.Warning((Exception)null, "Warning");
childLogger.Error(null, "Error");
Assert.AreEqual(4, logMessagesCount);
}
[TestMethod]
public void Use_Custom_Log_Id()
{
var logger = new MqttNetEventLogger("logId");
var childLogger = logger.WithSource("Source1");
logger.LogMessagePublished += (s, e) =>
{
Assert.AreEqual("logId", e.LogMessage.LogId);
Assert.AreEqual("Source1", e.LogMessage.Source);
};
childLogger.Verbose("Verbose");
childLogger.Info("Info");
childLogger.Warning((Exception)null, "Warning");
childLogger.Error(null, "Error");
}
childLogger.Verbose("Verbose");
childLogger.Info("Info");
childLogger.Warning((Exception)null, "Warning");
childLogger.Error(null, "Error");
}
}
Source/MQTTnet.Tests/Diagnostics/PacketInspection_Tests.cs
+27 -31
View File
@@ -10,41 +10,37 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Formatter;
using MQTTnet.Internal;
namespace MQTTnet.Tests.Diagnostics
namespace MQTTnet.Tests.Diagnostics;
// ReSharper disable InconsistentNaming
[TestClass]
public sealed class PacketInspection_Tests : BaseTestClass
{
[TestClass]
public sealed class PacketInspection_Tests : BaseTestClass
[TestMethod]
public async Task Inspect_Client_Packets()
{
[TestMethod]
public async Task Inspect_Client_Packets()
using var testEnvironment = CreateTestEnvironment();
await testEnvironment.StartServer();
using var mqttClient = testEnvironment.CreateClient();
var mqttClientOptions = testEnvironment.ClientFactory.CreateClientOptionsBuilder()
.WithClientId("CLIENT_ID") // Must be fixed.
.WithProtocolVersion(MqttProtocolVersion.V311)
.WithTcpServer("127.0.0.1", testEnvironment.ServerPort)
.Build();
var packets = new List<string>();
mqttClient.InspectPacketAsync += eventArgs =>
{
using (var testEnvironment = CreateTestEnvironment())
{
await testEnvironment.StartServer();
packets.Add(eventArgs.Direction + ":" + Convert.ToBase64String(eventArgs.Buffer));
return CompletedTask.Instance;
};
using (var mqttClient = testEnvironment.CreateClient())
{
var mqttClientOptions = testEnvironment.ClientFactory.CreateClientOptionsBuilder()
.WithClientId("CLIENT_ID") // Must be fixed.
.WithProtocolVersion(MqttProtocolVersion.V311)
.WithTcpServer("127.0.0.1", testEnvironment.ServerPort)
.Build();
await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
var packets = new List<string>();
mqttClient.InspectPacketAsync += eventArgs =>
{
packets.Add(eventArgs.Direction + ":" + Convert.ToBase64String(eventArgs.Buffer));
return CompletedTask.Instance;
};
await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
Assert.AreEqual(2, packets.Count);
Assert.AreEqual("Outbound:ECwABE1RVFQEAgAPACBJbnNwZWN0X0NsaWVudF9QYWNrZXRzX0NMSUVOVF9JRA==", packets[0]); // CONNECT
Assert.AreEqual("Inbound:IAIAAA==", packets[1]); // CONNACK
}
}
}
Assert.AreEqual(2, packets.Count);
Assert.AreEqual("Outbound:ECwABE1RVFQEAgAPACBJbnNwZWN0X0NsaWVudF9QYWNrZXRzX0NMSUVOVF9JRA==", packets[0]); // CONNECT
Assert.AreEqual("Inbound:IAIAAA==", packets[1]); // CONNACK
}
}
Source/MQTTnet.Tests/Diagnostics/SourceLogger_Tests.cs
+16 -17
View File
@@ -3,29 +3,28 @@
// See the LICENSE file in the project root for more information.
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Diagnostics.Logger;
namespace MQTTnet.Tests.Diagnostics
namespace MQTTnet.Tests.Diagnostics;
// ReSharper disable InconsistentNaming
[TestClass]
public sealed class SourceLogger_Tests : BaseTestClass
{
[TestClass]
public sealed class SourceLogger_Tests : BaseTestClass
[TestMethod]
public void Log_With_Source()
{
[TestMethod]
public void Log_With_Source()
MqttNetLogMessage logMessage = null;
var logger = new MqttNetEventLogger();
logger.LogMessagePublished += (_, e) =>
{
MqttNetLogMessage logMessage = null;
logMessage = e.LogMessage;
};
var logger = new MqttNetEventLogger();
logger.LogMessagePublished += (s, e) =>
{
logMessage = e.LogMessage;
};
var sourceLogger = logger.WithSource("The_Source");
sourceLogger.Info("MESSAGE", (object)null, (object)null);
var sourceLogger = logger.WithSource("The_Source");
sourceLogger.Info("MESSAGE", (object)null, (object)null);
Assert.AreEqual("The_Source", logMessage.Source);
}
Assert.AreEqual("The_Source", logMessage.Source);
}
}