Restore interfaces.

This commit is contained in:
Christian
2022-04-05 20:00:49 +02:00
parent cf2974cd34
commit 7cf454952f
31 changed files with 293 additions and 137 deletions
@@ -177,7 +177,7 @@ namespace MQTTnet.Tests.Client
}
}
async Task<MqttConnAckPacket> Authenticate(LowLevelMqttClient client)
async Task<MqttConnAckPacket> Authenticate(ILowLevelMqttClient client)
{
await client.SendAsync(
new MqttConnectPacket
@@ -193,7 +193,7 @@ namespace MQTTnet.Tests.Client
return await client.ReceiveAsync(CancellationToken.None).ConfigureAwait(false) as MqttConnAckPacket;
}
async Task<MqttSubAckPacket> Subscribe(LowLevelMqttClient client, string topic)
async Task<MqttSubAckPacket> Subscribe(ILowLevelMqttClient client, string topic)
{
await client.SendAsync(
new MqttSubscribePacket
@@ -389,7 +389,7 @@ namespace MQTTnet.Tests.Client
async Task<ManagedMqttClient> CreateManagedClientAsync(
TestEnvironment testEnvironment,
MqttClient underlyingClient = null,
IMqttClient underlyingClient = null,
TimeSpan? connectionCheckInterval = null,
string host = "localhost")
{
@@ -226,7 +226,7 @@ namespace MQTTnet.Tests.Client
{
await testEnvironment.StartServer();
var clients = new List<MqttClient>();
var clients = new List<IMqttClient>();
for (var i = 0; i < 100; i++)
{
clients.Add(await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithClientId("a")));
@@ -204,7 +204,7 @@ namespace MQTTnet.Tests
{
var disconnectPacket = new MqttDisconnectPacket
{
ReasonCode = MqttDisconnectReasonCode.NormalDisconnection,
ReasonCode = MqttDisconnectReasonCode.NormalDisconnection, // MQTTv3 has no other values than this.
ReasonString = "ReasonString",
ServerReference = "ServerReference",
SessionExpiryInterval = 234,
@@ -216,7 +216,6 @@ namespace MQTTnet.Tests
var deserialized = MqttPacketSerializationHelper.EncodeAndDecodePacket(disconnectPacket, MqttProtocolVersion.V311);
Assert.AreEqual(disconnectPacket.ReasonCode, deserialized.ReasonCode);
Assert.AreEqual(null, deserialized.ReasonString); // Not supported in v3.1.1
Assert.AreEqual(null, deserialized.ServerReference); // Not supported in v3.1.1
@@ -166,7 +166,7 @@ namespace MQTTnet.Tests
{
var disconnectPacket = new MqttDisconnectPacket
{
ReasonCode = MqttDisconnectReasonCode.NormalDisconnection,
ReasonCode = MqttDisconnectReasonCode.QuotaExceeded,
ReasonString = "ReasonString",
ServerReference = "ServerReference",
SessionExpiryInterval = 234,
@@ -15,7 +15,7 @@ namespace MQTTnet.Tests.Mockups
{
readonly List<MqttApplicationMessageReceivedEventArgs> _receivedEventArgs = new List<MqttApplicationMessageReceivedEventArgs>();
public TestApplicationMessageReceivedHandler(MqttClient mqttClient)
public TestApplicationMessageReceivedHandler(IMqttClient mqttClient)
{
mqttClient.ApplicationMessageReceivedAsync += MqttClientOnApplicationMessageReceivedAsync;
}
+10 -11
View File
@@ -17,17 +17,16 @@ using MQTTnet.Implementations;
using MQTTnet.LowLevelClient;
using MQTTnet.Protocol;
using MQTTnet.Server;
using MqttClient = MQTTnet.Client.MqttClient;
namespace MQTTnet.Tests.Mockups
{
public sealed class TestEnvironment : IDisposable
{
readonly List<string> _clientErrors = new List<string>();
readonly List<MqttClient> _clients = new List<MqttClient>();
readonly List<IMqttClient> _clients = new List<IMqttClient>();
readonly List<Exception> _exceptions = new List<Exception>();
readonly List<LowLevelMqttClient> _lowLevelClients = new List<LowLevelMqttClient>();
readonly List<ILowLevelMqttClient> _lowLevelClients = new List<ILowLevelMqttClient>();
readonly MqttProtocolVersion _protocolVersion;
readonly List<string> _serverErrors = new List<string>();
@@ -91,12 +90,12 @@ namespace MQTTnet.Tests.Mockups
public TestContext TestContext { get; }
public Task<MqttClient> ConnectClient()
public Task<IMqttClient> ConnectClient()
{
return ConnectClient(Factory.CreateClientOptionsBuilder().WithProtocolVersion(_protocolVersion));
}
public async Task<MqttClient> ConnectClient(Action<MqttClientOptionsBuilder> configureOptions, TimeSpan timeout = default)
public async Task<IMqttClient> ConnectClient(Action<MqttClientOptionsBuilder> configureOptions, TimeSpan timeout = default)
{
if (configureOptions == null)
{
@@ -128,7 +127,7 @@ namespace MQTTnet.Tests.Mockups
return client;
}
public async Task<MqttClient> ConnectClient(MqttClientOptionsBuilder options, TimeSpan timeout = default)
public async Task<IMqttClient> ConnectClient(MqttClientOptionsBuilder options, TimeSpan timeout = default)
{
if (options == null)
{
@@ -154,7 +153,7 @@ namespace MQTTnet.Tests.Mockups
return client;
}
public async Task<MqttClient> ConnectClient(MqttClientOptions options, TimeSpan timeout = default)
public async Task<IMqttClient> ConnectClient(MqttClientOptions options, TimeSpan timeout = default)
{
if (options == null)
{
@@ -178,7 +177,7 @@ namespace MQTTnet.Tests.Mockups
return client;
}
public async Task<LowLevelMqttClient> ConnectLowLevelClient(Action<MqttClientOptionsBuilder> optionsBuilder = null)
public async Task<ILowLevelMqttClient> ConnectLowLevelClient(Action<MqttClientOptionsBuilder> optionsBuilder = null)
{
var options = new MqttClientOptionsBuilder();
options = options.WithTcpServer("127.0.0.1", ServerPort);
@@ -195,12 +194,12 @@ namespace MQTTnet.Tests.Mockups
return new MqttRpcClient(await ConnectClient(), options);
}
public TestApplicationMessageReceivedHandler CreateApplicationMessageHandler(MqttClient mqttClient)
public TestApplicationMessageReceivedHandler CreateApplicationMessageHandler(IMqttClient mqttClient)
{
return new TestApplicationMessageReceivedHandler(mqttClient);
}
public MqttClient CreateClient()
public IMqttClient CreateClient()
{
lock (_clients)
{
@@ -228,7 +227,7 @@ namespace MQTTnet.Tests.Mockups
}
}
public LowLevelMqttClient CreateLowLevelClient()
public ILowLevelMqttClient CreateLowLevelClient()
{
lock (_clients)
{
+2 -2
View File
@@ -277,7 +277,7 @@ namespace MQTTnet.Tests.Server
}
}
async Task<MqttClient> ConnectAndSubscribe(TestEnvironment testEnvironment, MqttClientOptionsBuilder options, Action onReceive)
async Task<IMqttClient> ConnectAndSubscribe(TestEnvironment testEnvironment, MqttClientOptionsBuilder options, Action onReceive)
{
try
{
@@ -302,7 +302,7 @@ namespace MQTTnet.Tests.Server
}
}
async Task<MqttClient> TryConnect(TestEnvironment testEnvironment, MqttClientOptionsBuilder options)
async Task<IMqttClient> TryConnect(TestEnvironment testEnvironment, MqttClientOptionsBuilder options)
{
try
{