Fix UnitTests.

This commit is contained in:
Christian
2021-10-29 22:35:32 +02:00
parent 6bad9f183c
commit 9d982eab5e
9 changed files with 46 additions and 34 deletions
@@ -52,7 +52,7 @@ namespace MQTTnet.Tests.Mockups
remove => Implementation.ApplicationMessageReceivedAsync -= value;
}
public Task<MqttClientConnectResult> ConnectAsync(IMqttClientOptions options, CancellationToken cancellationToken)
public Task<MqttClientConnectResult> ConnectAsync(IMqttClientOptions options, CancellationToken cancellationToken = default)
{
if (TestContext != null)
{
@@ -68,7 +68,7 @@ namespace MQTTnet.Tests.Mockups
return Implementation.ConnectAsync(options, cancellationToken);
}
public Task DisconnectAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken)
public Task DisconnectAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken = default)
{
return Implementation.DisconnectAsync(options, cancellationToken);
}
@@ -78,27 +78,27 @@ namespace MQTTnet.Tests.Mockups
Implementation.Dispose();
}
public Task PingAsync(CancellationToken cancellationToken)
public Task PingAsync(CancellationToken cancellationToken = default)
{
return Implementation.PingAsync(cancellationToken);
}
public Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken)
public Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken = default)
{
return Implementation.PublishAsync(applicationMessage, cancellationToken);
}
public Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken)
public Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken = default)
{
return Implementation.SendExtendedAuthenticationExchangeDataAsync(data, cancellationToken);
}
public Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken)
public Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken = default)
{
return Implementation.SubscribeAsync(options, cancellationToken);
}
public Task<MqttClientUnsubscribeResult> UnsubscribeAsync(MqttClientUnsubscribeOptions options, CancellationToken cancellationToken)
public Task<MqttClientUnsubscribeResult> UnsubscribeAsync(MqttClientUnsubscribeOptions options, CancellationToken cancellationToken = default)
{
return Implementation.UnsubscribeAsync(options, cancellationToken);
}
@@ -83,7 +83,7 @@ namespace MQTTnet.Tests.Mockups
};
}
public IMqttClient CreateClient()
public TestClientWrapper CreateClient()
{
lock (_clients)
{
@@ -94,7 +94,7 @@ namespace MQTTnet.Tests.Mockups
}
}
public Task<IMqttClient> ConnectClient()
public Task<TestClientWrapper> ConnectClient()
{
return ConnectClient(Factory.CreateClientOptionsBuilder().WithProtocolVersion(_protocolVersion));
}
@@ -115,7 +115,7 @@ namespace MQTTnet.Tests.Mockups
return client;
}
public async Task<IMqttClient> ConnectClient(MqttClientOptionsBuilder options)
public async Task<TestClientWrapper> ConnectClient(MqttClientOptionsBuilder options)
{
if (options == null) throw new ArgumentNullException(nameof(options));
@@ -127,7 +127,7 @@ namespace MQTTnet.Tests.Mockups
return client;
}
public async Task<IMqttClient> ConnectClient(IMqttClientOptions options)
public async Task<TestClientWrapper> ConnectClient(IMqttClientOptions options)
{
if (options == null) throw new ArgumentNullException(nameof(options));
@@ -267,7 +267,7 @@ namespace MQTTnet.Tests.Mockups
{
try
{
mqttClient.DisconnectAsync().GetAwaiter().GetResult();
//mqttClient.DisconnectAsync().GetAwaiter().GetResult();
}
catch
{