diff --git a/src/WireMock.Net.Testcontainers/Utils/CombineUtils.cs b/src/WireMock.Net.Testcontainers/Utils/CombineUtils.cs index caab4c75..ac38f056 100644 --- a/src/WireMock.Net.Testcontainers/Utils/CombineUtils.cs +++ b/src/WireMock.Net.Testcontainers/Utils/CombineUtils.cs @@ -1,8 +1,5 @@ // Copyright © WireMock.Net -using System.Collections.Generic; -using System.Linq; - namespace WireMock.Net.Testcontainers.Utils; internal static class CombineUtils diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs index 63287c83..10f213e1 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs @@ -1,15 +1,11 @@ // Copyright © WireMock.Net -#if !(NET452 || NET461 || NETCOREAPP3_1) -using System.Threading.Tasks; using RestEase; -using VerifyXunit; using WireMock.Client; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests.AdminApi; @@ -149,5 +145,4 @@ message HelloReply { return server; } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs index f8da3f87..54052e43 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs @@ -1,11 +1,7 @@ // Copyright © WireMock.Net -#if !(NET452 || NET461 || NETCOREAPP3_1) -using System; -using System.Linq; using System.Net.Http; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; @@ -16,7 +12,6 @@ using WireMock.Client; using WireMock.Constants; using WireMock.Models; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests.AdminApi; @@ -37,17 +32,18 @@ public partial class WireMockAdminApiTests public async Task HttpClient_PostMappingsAsync_ForProtoBufMapping(string mappingFile, string guid) { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var mappingsJson = ReadMappingFile(mappingFile); using var server = WireMockServer.StartWithAdminInterface(); var httpClient = server.CreateClient(); // Act - var result = await httpClient.PostAsync("/__admin/mappings", new StringContent(mappingsJson, Encoding.UTF8, WireMockConstants.ContentTypeJson)); + var result = await httpClient.PostAsync("/__admin/mappings", new StringContent(mappingsJson, Encoding.UTF8, WireMockConstants.ContentTypeJson), cancelationToken); result.EnsureSuccessStatusCode(); // Assert - var mapping = await httpClient.GetStringAsync($"/__admin/mappings/{guid}"); + var mapping = await httpClient.GetStringAsync($"/__admin/mappings/{guid}", cancelationToken); mapping = RemoveLineContainingUpdatedAt(mapping); mapping.Should().Be(mappingsJson); } @@ -174,5 +170,4 @@ public partial class WireMockAdminApiTests server.Stop(); } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs b/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs index a0a9f29d..cd52cd27 100644 --- a/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs +++ b/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs @@ -3,7 +3,6 @@ using System.Collections; using FluentAssertions; using WireMock.Extensions; -using Xunit; namespace WireMock.Net.Tests.Extensions; diff --git a/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs b/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs index a9abb3cd..6ff06055 100644 --- a/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs +++ b/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs @@ -1,9 +1,7 @@ // Copyright © WireMock.Net -using System; using FluentAssertions; using WireMock.Extensions; -using Xunit; namespace WireMock.Net.Tests.Extensions; diff --git a/test/WireMock.Net.Tests/Extensions/HttpClientExtensions.cs b/test/WireMock.Net.Tests/Extensions/HttpClientExtensions.cs new file mode 100644 index 00000000..8d8f484d --- /dev/null +++ b/test/WireMock.Net.Tests/Extensions/HttpClientExtensions.cs @@ -0,0 +1,87 @@ +// Copyright © WireMock.Net + +#if !NET5_0_OR_GREATER +namespace System.Net.Http; + +/// +/// Extension methods for HttpClient to provide CancellationToken support in frameworks before .NET 5.0. +/// +internal static class HttpClientExtensions +{ + /// + /// Sends a GET request to the specified Uri as an asynchronous operation. + /// This extension is only used in frameworks prior to .NET 5.0 where CancellationToken is not supported. + /// + public static Task GetAsync(this HttpClient client, Uri requestUri, CancellationToken _) + { + // In older frameworks, we ignore the cancellation token since it's not supported + return client.GetAsync(requestUri); + } + + /// + /// Sends a GET request to the specified Uri and return the response body as a string. + /// This extension is only used in frameworks prior to .NET 5.0 where CancellationToken is not supported. + /// + public static Task GetStringAsync(this HttpClient client, string requestUri, CancellationToken _) + { + // In older frameworks, we ignore the cancellation token since it's not supported + return client.GetStringAsync(requestUri); + } + + /// + /// Sends a GET request to the specified Uri and return the response body as a string. + /// This extension is only used in frameworks prior to .NET 5.0 where CancellationToken is not supported. + /// + public static Task GetStringAsync(this HttpClient client, Uri requestUri, CancellationToken _) + { + // In older frameworks, we ignore the cancellation token since it's not supported + return client.GetStringAsync(requestUri); + } + + /// + /// Sends a POST request to the specified Uri as an asynchronous operation. + /// This extension is only used in frameworks prior to .NET 5.0 where CancellationToken is not supported. + /// + public static Task PostAsync(this HttpClient client, string requestUri, HttpContent content, CancellationToken _) + { + // In older frameworks, we ignore the cancellation token since it's not supported + return client.PostAsync(requestUri, content); + } + + /// + /// Sends a POST request to the specified Uri as an asynchronous operation. + /// This extension is only used in frameworks prior to .NET 5.0 where CancellationToken is not supported. + /// + public static Task PostAsync(this HttpClient client, Uri requestUri, HttpContent content, CancellationToken _) + { + // In older frameworks, we ignore the cancellation token since it's not supported + return client.PostAsync(requestUri, content); + } + + /// + /// Sends an HTTP request as an asynchronous operation. + /// This extension is only used in frameworks prior to .NET 5.0 where CancellationToken is not supported. + /// + public static Task SendAsync(this HttpClient client, HttpRequestMessage request, CancellationToken _) + { + // In older frameworks, we ignore the cancellation token since it's not supported + return client.SendAsync(request); + } +} + +/// +/// Extension methods for HttpContent to provide CancellationToken support in frameworks before .NET 5.0. +/// +internal static class HttpContentExtensions +{ + /// + /// Serialize the HTTP content to a string as an asynchronous operation. + /// This extension is only used in frameworks prior to .NET 5.0 where CancellationToken is not supported. + /// + public static Task ReadAsStringAsync(this HttpContent content, CancellationToken _) + { + // In older frameworks, we ignore the cancellation token since it's not supported + return content.ReadAsStringAsync(); + } +} +#endif \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs b/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs index c740c700..e570e02a 100644 --- a/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs +++ b/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs @@ -1,8 +1,6 @@ // Copyright © WireMock.Net -using System; using System.Diagnostics.CodeAnalysis; -using Xunit; namespace WireMock.Net.Tests.Facts; diff --git a/test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs b/test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs index d48f4433..b98916d9 100644 --- a/test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs +++ b/test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs @@ -1,16 +1,18 @@ // Copyright © WireMock.Net #if NET6_0_OR_GREATER using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using WireMock.Net.Testcontainers.Utils; -using Xunit; namespace WireMock.Net.Tests.Facts; [ExcludeFromCodeCoverage] public sealed class RunOnDockerPlatformFact : FactAttribute { - public RunOnDockerPlatformFact(string platform) + public RunOnDockerPlatformFact(string platform, + [CallerFilePath] string? sourceFilePath = null, + [CallerLineNumber] int sourceLineNumber = -1) : base(sourceFilePath, sourceLineNumber) { if (TestcontainersUtils.GetImageOSAsync.Value.Result != OSPlatform.Create(platform)) { diff --git a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs index 81ced28e..dd427f4f 100644 --- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs +++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Linq; using FluentAssertions; using FluentAssertions.Execution; using WireMock.FluentAssertions; diff --git a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs index 874b7c6a..aa53d733 100644 --- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs +++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs @@ -1,12 +1,9 @@ // Copyright © WireMock.Net -using System; -using System.Linq; using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Net.Http.Json; -using System.Threading.Tasks; using FluentAssertions; using WireMock.FluentAssertions; using WireMock.Matchers; @@ -14,7 +11,6 @@ using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.FluentAssertions; diff --git a/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs b/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs index 6bdfd340..e404559a 100644 --- a/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs +++ b/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs @@ -1,10 +1,7 @@ // Copyright © WireMock.Net -using System; -using System.IO; using NFluent; using WireMock.Handlers; -using Xunit; namespace WireMock.Net.Tests.Handlers; diff --git a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs index 6af562c2..9ca5a89b 100644 --- a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs @@ -2,10 +2,8 @@ using System.Net.Http.Headers; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using WireMock.Http; -using Xunit; namespace WireMock.Net.Tests.Http; diff --git a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs index 12f120fd..740e85f1 100644 --- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs @@ -1,15 +1,12 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using NFluent; using WireMock.Http; using WireMock.Models; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Http; diff --git a/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs b/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs index c3abf998..2baeb799 100644 --- a/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs @@ -3,7 +3,6 @@ using System.Net.Http.Headers; using FluentAssertions; using WireMock.Http; -using Xunit; namespace WireMock.Net.Tests.Http; diff --git a/test/WireMock.Net.Tests/MappingBuilderTests.cs b/test/WireMock.Net.Tests/MappingBuilderTests.cs index 8c8adc1e..17e77b09 100644 --- a/test/WireMock.Net.Tests/MappingBuilderTests.cs +++ b/test/WireMock.Net.Tests/MappingBuilderTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -#if !(NET452 || NET461 || NETCOREAPP3_1) using System.Net; using Moq; using WireMock.Handlers; @@ -253,5 +252,4 @@ public class MappingBuilderTests _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny(), It.IsAny()), Times.Exactly(_numMappings)); _fileSystemHandlerMock.VerifyNoOtherCalls(); } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs index 4465e3c7..67132de9 100644 --- a/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs @@ -3,7 +3,6 @@ using FluentAssertions; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs index 65a4313c..007ef315 100644 --- a/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs @@ -3,7 +3,6 @@ using FluentAssertions; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs index 73beafa2..e0ef755c 100644 --- a/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs @@ -2,7 +2,6 @@ using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs index 8bdda741..62978d77 100644 --- a/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs @@ -2,7 +2,6 @@ using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs index 4bb6a80d..d717920f 100644 --- a/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs @@ -1,14 +1,10 @@ // Copyright © WireMock.Net -using System.Collections.Generic; -using System.Linq; using System.Net.Http; -using System.Threading.Tasks; using AnyOfTypes; using FluentAssertions; using WireMock.Matchers; using WireMock.Models; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs index 944a0487..28bbcf1d 100644 --- a/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs @@ -4,7 +4,6 @@ using FluentAssertions; using Newtonsoft.Json.Linq; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs index 710e6476..38d2d0fb 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs @@ -1,14 +1,11 @@ // Copyright © WireMock.Net -using System; -using System.IO; using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs index 62bb961b..171f9f0a 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs @@ -1,13 +1,10 @@ // Copyright © WireMock.Net -using System; -using System.IO; using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs index e215d4ad..c2f39f7d 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs @@ -1,13 +1,10 @@ // Copyright © WireMock.Net -using System; -using System.IO; using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs index c6a04044..e5ac48a0 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System; using FluentAssertions; using Newtonsoft.Json.Linq; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/MatchBehaviourHelperTests.cs b/test/WireMock.Net.Tests/Matchers/MatchBehaviourHelperTests.cs index 90f4bb6f..97705643 100644 --- a/test/WireMock.Net.Tests/Matchers/MatchBehaviourHelperTests.cs +++ b/test/WireMock.Net.Tests/Matchers/MatchBehaviourHelperTests.cs @@ -2,7 +2,6 @@ using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/MatcherTests.cs b/test/WireMock.Net.Tests/Matchers/MatcherTests.cs index 1b05075f..a1bb0a1d 100644 --- a/test/WireMock.Net.Tests/Matchers/MatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/MatcherTests.cs @@ -1,6 +1,5 @@ using FluentAssertions; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs index 8371e1c1..8c2b2286 100644 --- a/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs @@ -3,7 +3,6 @@ using FluentAssertions; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs index 2e79a673..5d540ce8 100644 --- a/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net -using System; using FluentAssertions; using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs b/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs index ad2af984..4f7bb939 100644 --- a/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs +++ b/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net -using System.Linq; using FluentAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/SimMetricsMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/SimMetricsMatcherTests.cs index 23bcdf84..50f177ad 100644 --- a/test/WireMock.Net.Tests/Matchers/SimMetricsMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/SimMetricsMatcherTests.cs @@ -2,7 +2,6 @@ using NFluent; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs b/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs index ce9b5d81..463e70cf 100644 --- a/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs +++ b/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs @@ -5,7 +5,6 @@ using FluentAssertions; using NFluent; using WireMock.Matchers; using WireMock.Models; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/XPathMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/XPathMatcherTests.cs index c8bb8c63..adb91beb 100644 --- a/test/WireMock.Net.Tests/Matchers/XPathMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/XPathMatcherTests.cs @@ -3,7 +3,6 @@ using NFluent; using WireMock.Admin.Mappings; using WireMock.Matchers; -using Xunit; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs index 66b4ed52..eadfbf68 100644 --- a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs +++ b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs @@ -1,13 +1,8 @@ // Copyright © WireMock.Net -using System; -using System.Collections.Generic; using System.Collections.Specialized; -using System.Linq; using System.Net; using System.Net.Http; -using System.Threading; -using System.Threading.Tasks; using FluentAssertions; using Moq; using NFluent; @@ -16,7 +11,6 @@ using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs b/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs index 64a853da..0b431b20 100644 --- a/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs +++ b/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs @@ -1,9 +1,7 @@ // Copyright © WireMock.Net -#if !(NET452 || NET461 || NETCOREAPP3_1) using FluentAssertions; using WireMock.Net.OpenApiParser.Utils; -using Xunit; namespace WireMock.Net.Tests.OpenApiParser; @@ -36,5 +34,4 @@ public class PathUtilsTests // Assert result.Should().Be("/path1/path2"); } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs b/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs index f3b3c303..d5e92ab4 100644 --- a/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs +++ b/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs @@ -1,9 +1,7 @@ // Copyright © WireMock.Net -using System; using FluentAssertions; using WireMock.OpenTelemetry; -using Xunit; namespace WireMock.Net.Tests.OpenTelemetry; diff --git a/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs b/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs index a870e5c6..f08618bc 100644 --- a/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs +++ b/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using System; using System.Diagnostics; using FluentAssertions; using Moq; @@ -10,7 +9,6 @@ using WireMock.Models; using WireMock.Owin.ActivityTracing; using WireMock.Settings; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Owin.ActivityTracing; diff --git a/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs b/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs index ff7be774..90a679d9 100644 --- a/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs +++ b/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using System.Linq; using FluentAssertions; using WireMock.Owin; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.Owin; diff --git a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs index 931c903b..4ae443aa 100644 --- a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs +++ b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs @@ -1,12 +1,6 @@ // Copyright © WireMock.Net -using System; -using System.Collections.Generic; -using System.IO; -using Xunit; using Moq; -using System.Threading.Tasks; -using System.Threading; using FluentAssertions; using WireMock.Handlers; using WireMock.Owin.Mappers; diff --git a/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs b/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs index e81bce1e..05de82c8 100644 --- a/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs +++ b/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using System; using System.Collections.Concurrent; using FluentAssertions; using Moq; @@ -9,7 +8,6 @@ using WireMock.Matchers.Request; using WireMock.Models; using WireMock.Owin; using WireMock.Services; -using Xunit; namespace WireMock.Net.Tests.Owin; diff --git a/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs b/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs index 2921ee09..36bfe746 100644 --- a/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs +++ b/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs @@ -4,7 +4,6 @@ using WireMock.Handlers; using WireMock.Proxy; using WireMock.Settings; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.Proxy; diff --git a/test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs b/test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs index ab280c25..f056751f 100644 --- a/test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs +++ b/test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs @@ -1,9 +1,7 @@ // Copyright © WireMock.Net -using System; using NFluent; using WireMock.RegularExpressions; -using Xunit; namespace WireMock.Net.Tests.RegularExpressions; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs index 70f273c9..d05fa983 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs @@ -1,14 +1,12 @@ // Copyright © WireMock.Net using NFluent; -using System.Collections.Generic; using WireMock.Matchers.Request; using WireMock.Models; using WireMock.Owin; using WireMock.RequestBuilders; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs index 09b9de93..9c80a5f8 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using NFluent; using WireMock.Matchers.Request; using WireMock.RequestBuilders; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs index 09cab484..352e2332 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs @@ -1,8 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; using FluentAssertions; using Newtonsoft.Json; @@ -14,7 +11,6 @@ using WireMock.Models; using WireMock.RequestBuilders; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs index efe82a17..1e5ae81b 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs @@ -5,7 +5,6 @@ using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; using WireMock.RequestBuilders; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs index 35224dbe..20941a56 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs index e35b90ed..202a9f03 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithParamTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithParamTests.cs index 37da5f67..0f6f47ef 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithParamTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithParamTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs index eeb1b1ee..14a9f47a 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs @@ -1,9 +1,7 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using NFluent; using WireMock.Matchers; -using Xunit; using WireMock.RequestBuilders; using WireMock.Matchers.Request; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs index 0ccf4dbe..199c53ce 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using FluentAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs index d8a49442..1bfb7033 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; -using Xunit; namespace WireMock.Net.Tests.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs index 561871f0..214d4a1c 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs @@ -1,10 +1,6 @@ // Copyright © WireMock.Net -using System; -using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using Moq; using NFluent; @@ -13,7 +9,6 @@ using WireMock.Matchers.Request; using WireMock.Models; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.RequestMatchers; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs index 16ad904d..e4ffd1e1 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs @@ -1,12 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; -using System.Linq; using Moq; using NFluent; using WireMock.Matchers.Request; using WireMock.Models; -using Xunit; namespace WireMock.Net.Tests.RequestMatchers; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs index 1bc14636..bdc6e0d5 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; -using Xunit; namespace WireMock.Net.Tests.RequestMatchers; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs index 8518b60b..17e860d9 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; -using Xunit; namespace WireMock.Net.Tests.RequestMatchers; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs index 87984948..61547b16 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs @@ -4,7 +4,6 @@ using FluentAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; -using Xunit; namespace WireMock.Net.Tests.RequestMatchers; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs index a0b46a35..7fdb8c20 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs @@ -7,7 +7,6 @@ using WireMock.Matchers.Request; using WireMock.Models; using WireMock.Owin; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.RequestMatchers; diff --git a/test/WireMock.Net.Tests/RequestMessageTests.cs b/test/WireMock.Net.Tests/RequestMessageTests.cs index 3a5390e8..91716a11 100644 --- a/test/WireMock.Net.Tests/RequestMessageTests.cs +++ b/test/WireMock.Net.Tests/RequestMessageTests.cs @@ -3,7 +3,6 @@ using NFluent; using WireMock.Models; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs index 264d9974..78eef2fb 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs @@ -1,13 +1,11 @@ // Copyright © WireMock.Net -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Moq; using NFluent; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs index 464b23a3..1861b031 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs @@ -1,14 +1,11 @@ // Copyright © WireMock.Net -using System.IO; using System.Net; using System.Net.Http; -using System.Threading.Tasks; using FluentAssertions; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders { diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs index 655d6dc4..e8c2598d 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs @@ -1,10 +1,7 @@ // Copyright © WireMock.Net -using System.Collections.Generic; -using System.Linq; using System.Net; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; @@ -15,7 +12,6 @@ using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs index 934fe99b..269cf0e5 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs @@ -1,13 +1,11 @@ // Copyright © WireMock.Net -using System.Threading.Tasks; using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs index 379d9942..83718956 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Threading.Tasks; using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; @@ -11,7 +9,6 @@ using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs index 7c94ca17..5de840fe 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Threading.Tasks; using FluentAssertions; using HandlebarsDotNet; using Microsoft.AspNetCore.Http; @@ -13,7 +11,6 @@ using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs index b0bf2149..474c370c 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Moq; using NFluent; @@ -10,7 +9,6 @@ using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs index 1553622b..8be93b66 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; @@ -10,7 +8,6 @@ using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs index 38d678ef..314a5797 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs @@ -1,8 +1,6 @@ // Copyright © WireMock.Net -using System; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; @@ -15,7 +13,6 @@ using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs index 2f1705f9..2c956c9a 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Threading.Tasks; using FluentAssertions; using HandlebarsDotNet; using Microsoft.AspNetCore.Http; @@ -14,7 +12,6 @@ using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs index ad676e01..2c8ee77c 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System.Linq; -using System.Threading.Tasks; using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; @@ -11,7 +9,6 @@ using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs index 4d7eadab..a68c1c15 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Moq; using NFluent; @@ -11,7 +9,6 @@ using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs index 265114a4..b02b8a5e 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs @@ -4,12 +4,10 @@ using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; using NFluent; -using System.Threading.Tasks; using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs index 756fed71..854a836d 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Moq; using NFluent; @@ -9,7 +7,6 @@ using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs index a66b3a25..26507d97 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs @@ -1,9 +1,6 @@ // Copyright © WireMock.Net -using System; -using System.Collections.Generic; using System.Net.Http; -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Moq; using NFluent; @@ -14,7 +11,6 @@ using WireMock.Server; using WireMock.Settings; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs index 51b4a7d7..ea50194f 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Threading.Tasks; using FluentAssertions; using NFluent; using WireMock.Models; @@ -9,7 +7,6 @@ using WireMock.ResponseBuilders; using WireMock.Settings; using WireMock.Types; using WireMock.Util; -using Xunit; using WireMock.Handlers; using Moq; #if NET452 diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs index 7c1bf913..ca6ca6f0 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs @@ -1,14 +1,12 @@ // Copyright © WireMock.Net using System.Net; -using System.Threading.Tasks; using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcher.cs b/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcher.cs index 5885c974..bcbb5e29 100644 --- a/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcher.cs +++ b/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcher.cs @@ -1,8 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Collections.Generic; -using System.Linq; using System.Text.RegularExpressions; using AnyOfTypes; using Newtonsoft.Json; diff --git a/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcherModel.cs b/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcherModel.cs index 167225a3..69fc94c0 100644 --- a/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcherModel.cs +++ b/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcherModel.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System.Collections.Generic; - namespace WireMock.Net.Tests.Serialization { public class CustomPathParamMatcherModel diff --git a/test/WireMock.Net.Tests/Serialization/MappingFileNameSanitizerTests.cs b/test/WireMock.Net.Tests/Serialization/MappingFileNameSanitizerTests.cs index f9d3ace2..88b6199a 100644 --- a/test/WireMock.Net.Tests/Serialization/MappingFileNameSanitizerTests.cs +++ b/test/WireMock.Net.Tests/Serialization/MappingFileNameSanitizerTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net -using System; using Moq; using WireMock.Serialization; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.Serialization; diff --git a/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs b/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs index f1f7a11d..d0cc573d 100644 --- a/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs +++ b/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System; using FluentAssertions; using JsonConverter.Newtonsoft.Json; using WireMock.Admin.Mappings; using WireMock.Serialization; -using Xunit; #if NET8_0_OR_GREATER using JsonConverter.System.Text.Json; #endif diff --git a/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs b/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs index 704123cf..a4c6c710 100644 --- a/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs +++ b/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs @@ -1,8 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Linq; -using System.Threading.Tasks; using FluentAssertions; using HandlebarsDotNet; using HandlebarsDotNet.Helpers.Enums; @@ -12,7 +9,6 @@ using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.Settings; diff --git a/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs b/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs index 88c56ae0..a94e278b 100644 --- a/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs +++ b/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using FluentAssertions; using NFluent; using WireMock.Settings; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.Settings; diff --git a/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs b/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs index 274c1468..6a8e98e1 100644 --- a/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs +++ b/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs @@ -2,7 +2,6 @@ using FluentAssertions; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests.Settings; diff --git a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs index 9c237f9c..f0092bab 100644 --- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs +++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs @@ -1,16 +1,12 @@ // Copyright © WireMock.Net -using System; -using System.Linq; using System.Net; using System.Net.Http; -using System.Threading.Tasks; using FluentAssertions; using NFluent; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests; @@ -294,6 +290,7 @@ public class StatefulBehaviorTests public async Task Scenarios_TodoList_Example() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var server = WireMockServer.Start(); var client = server.CreateClient(); @@ -319,7 +316,7 @@ public class StatefulBehaviorTests Check.That(server.Scenarios.Any()).IsFalse(); // Act and Assert - var getResponse1 = await client.GetStringAsync("/todo/items"); + var getResponse1 = await client.GetStringAsync("/todo/items", cancelationToken); Check.That(getResponse1).Equals("Buy milk"); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); @@ -327,7 +324,7 @@ public class StatefulBehaviorTests Check.That(server.Scenarios["To do list"].Started).IsTrue(); Check.That(server.Scenarios["To do list"].Finished).IsFalse(); - var postResponse = await client.PostAsync("/todo/items", new StringContent("Cancel newspaper subscription")); + var postResponse = await client.PostAsync("/todo/items", new StringContent("Cancel newspaper subscription"), cancelationToken); Check.That(postResponse.StatusCode).Equals(HttpStatusCode.Created); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); @@ -335,7 +332,7 @@ public class StatefulBehaviorTests Check.That(server.Scenarios["To do list"].Started).IsTrue(); Check.That(server.Scenarios["To do list"].Finished).IsFalse(); - string getResponse2 = await client.GetStringAsync("/todo/items"); + string getResponse2 = await client.GetStringAsync("/todo/items", cancelationToken); Check.That(getResponse2).Equals("Buy milk;Cancel newspaper subscription"); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); @@ -350,6 +347,7 @@ public class StatefulBehaviorTests public async Task Scenarios_TodoList_WithSetState() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var scenario = "To do list"; using var server = WireMockServer.Start(); var client = server.CreateClient(); @@ -370,14 +368,14 @@ public class StatefulBehaviorTests server.SetScenarioState(scenario, "Buy milk"); server.Scenarios[scenario].Should().BeEquivalentTo(new { Name = scenario, NextState = "Buy milk" }); - var getResponse1 = await client.GetStringAsync("/todo/items"); + var getResponse1 = await client.GetStringAsync("/todo/items", cancelationToken); getResponse1.Should().Be("Buy milk"); server.SetScenarioState(scenario, "Cancel newspaper"); server.Scenarios[scenario].Name.Should().Be(scenario); server.Scenarios[scenario].Should().BeEquivalentTo(new { Name = scenario, NextState = "Cancel newspaper" }); - var getResponse2 = await client.GetStringAsync("/todo/items"); + var getResponse2 = await client.GetStringAsync("/todo/items", cancelationToken); getResponse2.Should().Be("Buy milk;Cancel newspaper subscription"); } @@ -413,6 +411,7 @@ public class StatefulBehaviorTests public async Task Scenarios_Should_process_request_if_equals_state_and_multiple_state_defined() { // Assign + var cancelationToken = TestContext.Current.CancellationToken; var server = WireMockServer.Start(); server @@ -441,16 +440,16 @@ public class StatefulBehaviorTests // Act and Assert string url = "http://localhost:" + server.Ports[0]; - var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1"); + var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1", cancelationToken); Check.That(responseNoState1).Equals("No state msg 1"); - var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2"); + var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2", cancelationToken); Check.That(responseNoState2).Equals("No state msg 2"); - var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X"); + var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X", cancelationToken); Check.That(responseWithState1).Equals("Test state msg 1"); - var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X"); + var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X", cancelationToken); Check.That(responseWithState2).Equals("Test state msg 2"); server.Stop(); diff --git a/test/WireMock.Net.Tests/TestUtils.cs b/test/WireMock.Net.Tests/TestUtils.cs index 22b86966..21a335c7 100644 --- a/test/WireMock.Net.Tests/TestUtils.cs +++ b/test/WireMock.Net.Tests/TestUtils.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using System; using System.Reflection; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs b/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs index 95f55774..e0cfcce3 100644 --- a/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs +++ b/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs @@ -1,9 +1,7 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using FluentAssertions; using WireMock.Net.Testcontainers.Utils; -using Xunit; namespace WireMock.Net.Tests.Testcontainers; diff --git a/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs b/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs index c93108ea..35c1a7d8 100644 --- a/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs +++ b/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs @@ -5,7 +5,6 @@ using Moq; using WireMock.Handlers; using WireMock.Settings; using WireMock.Transformers.Handlebars; -using Xunit; namespace WireMock.Net.Tests.Transformers.Handlebars; diff --git a/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs b/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs index 6db2ad50..31a52a11 100644 --- a/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs +++ b/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs @@ -1,12 +1,10 @@ // Copyright © WireMock.Net -using System; using FluentAssertions; using Moq; using WireMock.Handlers; using WireMock.Transformers.Scriban; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests.Transformers.Scriban { diff --git a/test/WireMock.Net.Tests/Util/BodyParserTests.cs b/test/WireMock.Net.Tests/Util/BodyParserTests.cs index 8fc31afc..f47d2ee6 100644 --- a/test/WireMock.Net.Tests/Util/BodyParserTests.cs +++ b/test/WireMock.Net.Tests/Util/BodyParserTests.cs @@ -1,14 +1,10 @@ // Copyright © WireMock.Net -using System; -using System.IO; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using NFluent; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs b/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs index 3b220d62..1c6fc8d0 100644 --- a/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs @@ -3,7 +3,6 @@ using System.Text; using FluentAssertions; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs b/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs index 0ef5f7b4..9f363d25 100644 --- a/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs +++ b/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs @@ -3,7 +3,6 @@ using FluentAssertions; using Newtonsoft.Json.Linq; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs b/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs index cdd60c4c..7e6296f7 100644 --- a/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs @@ -1,12 +1,10 @@ // Copyright © WireMock.Net -using System; using System.Text; using FluentAssertions; using RandomDataGenerator.FieldOptions; using RandomDataGenerator.Randomizers; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/FileHelperTests.cs b/test/WireMock.Net.Tests/Util/FileHelperTests.cs index f1808552..f350ff39 100644 --- a/test/WireMock.Net.Tests/Util/FileHelperTests.cs +++ b/test/WireMock.Net.Tests/Util/FileHelperTests.cs @@ -2,10 +2,8 @@ using FluentAssertions; using Moq; -using System; using WireMock.Handlers; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs b/test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs index 48cea1e4..ae494cd9 100644 --- a/test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs @@ -1,9 +1,7 @@ // Copyright © WireMock.Net using NFluent; -using System.IO; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs b/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs index 6e67e1ae..d3886dba 100644 --- a/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs +++ b/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net using FluentAssertions; -using System; using System.Net; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs b/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs index 1b3d356c..1ed86d88 100644 --- a/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs +++ b/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs @@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis; using FluentAssertions; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/PortUtilsTests.cs b/test/WireMock.Net.Tests/Util/PortUtilsTests.cs index 2915e75f..17021600 100644 --- a/test/WireMock.Net.Tests/Util/PortUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/PortUtilsTests.cs @@ -2,7 +2,6 @@ using FluentAssertions; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs b/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs index e94bfb49..44b2ee6c 100644 --- a/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs +++ b/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using FluentAssertions; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs b/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs index 8e2365a6..8bfa3d52 100644 --- a/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net -using System.Collections.Generic; using System.Text.RegularExpressions; using FluentAssertions; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs b/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs index 4fe60541..53a0fc48 100644 --- a/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs @@ -2,7 +2,6 @@ using FluentAssertions; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs b/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs index e37a6bdb..bbf2c387 100644 --- a/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs +++ b/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs @@ -1,12 +1,10 @@ // Copyright © WireMock.Net -using System.IO; using AnyOfTypes; using FluentAssertions; using WireMock.Matchers; using WireMock.Models; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/UrlUtilsTests.cs b/test/WireMock.Net.Tests/Util/UrlUtilsTests.cs index 68fe3cfa..3ba83d3d 100644 --- a/test/WireMock.Net.Tests/Util/UrlUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/UrlUtilsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using System; #if NET452 using Microsoft.Owin; #else @@ -8,7 +7,6 @@ using Microsoft.AspNetCore.Http; #endif using NFluent; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs b/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs index 136f7c34..840795c8 100644 --- a/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs +++ b/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net -using System; using System.Diagnostics.CodeAnalysis; using FluentAssertions; using WireMock.Validators; -using Xunit; namespace WireMock.Net.Tests.Validators; diff --git a/test/WireMock.Net.Tests/VerifyExtensions/VerifyNewtonsoftJson.cs b/test/WireMock.Net.Tests/VerifyExtensions/VerifyNewtonsoftJson.cs index 06550b05..e422d909 100644 --- a/test/WireMock.Net.Tests/VerifyExtensions/VerifyNewtonsoftJson.cs +++ b/test/WireMock.Net.Tests/VerifyExtensions/VerifyNewtonsoftJson.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net #if !(NET452 || NET461) -using System.Collections.Generic; using System.Collections.Specialized; using Newtonsoft.Json.Linq; -using VerifyTests; namespace WireMock.Net.Tests.VerifyExtensions; diff --git a/test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs b/test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs index 2ce35ac1..4653fef4 100644 --- a/test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs +++ b/test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs @@ -1,8 +1,6 @@ // Copyright © WireMock.Net #if !(NET452 || NET461) -using VerifyTests; - namespace WireMock.Net.Tests.VerifyExtensions; internal static class VerifySettingsExtensions diff --git a/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs b/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs index fb4d5bfe..cf5b1737 100644 --- a/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs +++ b/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs @@ -49,13 +49,14 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); received.Should().Be(testMessage); - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task WithText_Should_Send_Configured_Text() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -79,23 +80,24 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) var uri = new Uri($"{server.Url}/ws/message"); // Act - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); client.State.Should().Be(WebSocketState.Open); var testMessage = "Any message from client"; - await client.SendAsync(testMessage); + await client.SendAsync(testMessage, cancellationToken: cancelationToken); // Assert - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); received.Should().Be(responseMessage); - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task WithText_Should_Send_Same_Text_For_Multiple_Messages() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -117,26 +119,27 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/message"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); var testMessages = new[] { "First", "Second", "Third" }; // Act & Assert foreach (var testMessage in testMessages) { - await client.SendAsync(testMessage); + await client.SendAsync(testMessage, cancellationToken: cancelationToken); - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); received.Should().Be(responseMessage, $"should always return the fixed response regardless of input message '{testMessage}'"); } - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task WithBinary_Should_Send_Configured_Bytes() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -160,23 +163,24 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) var uri = new Uri($"{server.Url}/ws/binary"); // Act - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); client.State.Should().Be(WebSocketState.Open); var testMessage = "Any message from client"; - await client.SendAsync(testMessage); + await client.SendAsync(testMessage, cancellationToken: cancelationToken); // Assert - var receivedData = await client.ReceiveAsBytesAsync(); + var receivedData = await client.ReceiveAsBytesAsync(cancellationToken: cancelationToken); receivedData.Should().BeEquivalentTo(responseBytes); - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task WithBinary_Should_Send_Same_Bytes_For_Multiple_Messages() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -198,20 +202,20 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/binary"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); var testMessages = new[] { "First", "Second", "Third" }; // Act & Assert foreach (var testMessage in testMessages) { - await client.SendAsync(testMessage); + await client.SendAsync(testMessage, cancellationToken: cancelationToken); - var receivedData = await client.ReceiveAsBytesAsync(); + var receivedData = await client.ReceiveAsBytesAsync(cancellationToken: cancelationToken); receivedData.Should().BeEquivalentTo(responseBytes, $"should always return the fixed bytes regardless of input message '{testMessage}'"); } - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } @@ -219,6 +223,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) public async Task EchoServer_Should_Echo_Multiple_Messages() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -236,27 +241,28 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/echo"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); var testMessages = new[] { "Hello", "World", "WebSocket", "Test" }; // Act & Assert foreach (var testMessage in testMessages) { - await client.SendAsync(testMessage); + await client.SendAsync(testMessage, cancellationToken: cancelationToken); - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); received.Should().Be(testMessage, $"message '{testMessage}' should be echoed back"); } - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task EchoServer_Should_Echo_Binary_Messages() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -274,25 +280,26 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/echo"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); var testData = new byte[] { 0x01, 0x02, 0x03, 0x04, 0x05 }; // Act - await client.SendAsync(new ArraySegment(testData), WebSocketMessageType.Binary, true, CancellationToken.None); + await client.SendAsync(new ArraySegment(testData), WebSocketMessageType.Binary, true, cancelationToken); - var receivedData = await client.ReceiveAsBytesAsync(); + var receivedData = await client.ReceiveAsBytesAsync(cancellationToken: cancelationToken); // Assert receivedData.Should().BeEquivalentTo(testData); - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task EchoServer_Should_Handle_Empty_Messages() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -310,24 +317,25 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/echo"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); // Act - await client.SendAsync(string.Empty); + await client.SendAsync(string.Empty, cancellationToken: cancelationToken); var receiveBuffer = new byte[1024]; - var result = await client.ReceiveAsync(new ArraySegment(receiveBuffer), CancellationToken.None); + var result = await client.ReceiveAsync(new ArraySegment(receiveBuffer), cancelationToken); // Assert result.Count.Should().Be(0); - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task CustomHandler_Should_Handle_Help_Command() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -358,12 +366,12 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/chat"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); // Act - await client.SendAsync("/help"); + await client.SendAsync("/help", cancellationToken: cancelationToken); - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); // Assert received.Should().Contain("Available commands"); @@ -371,13 +379,14 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) received.Should().Contain("/time"); received.Should().Contain("/echo"); - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task CustomHandler_Should_Handle_Multiple_Commands_In_Sequence() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -430,7 +439,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/chat"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); var commands = new (string, Action)[] { @@ -444,22 +453,23 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) // Act & Assert foreach (var (command, assertion) in commands) { - await client.SendAsync(command); + await client.SendAsync(command, cancellationToken: cancelationToken); - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); assertion(received); } - await client.SendAsync("/close"); + await client.SendAsync("/close", cancellationToken: cancelationToken); - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task WhenMessage_Should_Handle_Multiple_Conditions_Fluently() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -484,7 +494,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/conditional"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); var testCases = new (string message, string expectedContains)[] { @@ -498,20 +508,21 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) // Act & Assert foreach (var (message, expectedContains) in testCases) { - await client.SendAsync(message); + await client.SendAsync(message, cancellationToken: cancelationToken); - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); received.Should().Contain(expectedContains, $"message '{message}' should return response containing '{expectedContains}'"); } - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } [Fact] public async Task WhenMessage_NoMatch_Should_Return404() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -533,12 +544,12 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/test"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); // Act - await client.SendAsync("/close"); + await client.SendAsync("/close", cancellationToken: cancelationToken); - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); // Assert received.Should().Contain("Closing connection"); @@ -548,7 +559,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) try { var receiveBuffer = new byte[1024]; - var result = await client.ReceiveAsync(new ArraySegment(receiveBuffer), CancellationToken.None); + var result = await client.ReceiveAsync(new ArraySegment(receiveBuffer), cancelationToken); // If we get here, the message type should be Close result.MessageType.Should().Be(WebSocketMessageType.Close); @@ -566,6 +577,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) public async Task WhenMessage_Should_Close_Connection_When_AndClose_Is_Used() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -587,12 +599,12 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) using var client = new ClientWebSocket(); var uri = new Uri($"{server.Url}/ws/close"); - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); // Act - await client.SendAsync("/close"); + await client.SendAsync("/close", cancellationToken: cancelationToken); - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); // Assert received.Should().Contain("Closing connection"); @@ -602,7 +614,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) try { var receiveBuffer = new byte[1024]; - var result = await client.ReceiveAsync(new ArraySegment(receiveBuffer), CancellationToken.None); + var result = await client.ReceiveAsync(new ArraySegment(receiveBuffer), cancelationToken); // If we get here, the message type should be Close result.MessageType.Should().Be(WebSocketMessageType.Close); @@ -620,6 +632,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) public async Task WithTransformer_Should_Transform_Message_Using_Handlebars() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(new WireMockServerSettings { Logger = new TestOutputHelperWireMockLogger(output), @@ -642,16 +655,16 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) var uri = new Uri($"{server.Url}/ws/transform"); // Act - await client.ConnectAsync(uri, CancellationToken.None); + await client.ConnectAsync(uri, cancelationToken); client.State.Should().Be(WebSocketState.Open); var testMessage = "HellO"; - await client.SendAsync(testMessage); + await client.SendAsync(testMessage, cancellationToken: cancelationToken); // Assert - var received = await client.ReceiveAsTextAsync(); + var received = await client.ReceiveAsTextAsync(cancellationToken: cancelationToken); received.Should().Be("/ws/transform hello"); - await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", CancellationToken.None); + await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", cancelationToken); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/WireMockServer.Admin.cs b/test/WireMock.Net.Tests/WireMockServer.Admin.cs index 4f575e1d..c13973cf 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Admin.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Admin.cs @@ -1,12 +1,8 @@ // Copyright © WireMock.Net -using System; -using System.IO; -using System.Linq; using System.Net; using System.Net.Http; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using Moq; using Newtonsoft.Json; @@ -20,7 +16,6 @@ using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests; @@ -505,6 +500,7 @@ public class WireMockServerAdminTests public async Task WireMockServer_Admin_DeleteMappings() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var server = WireMockServer.Start(new WireMockServerSettings { StartAdminInterface = true, @@ -549,7 +545,7 @@ public class WireMockServerAdminTests Content = new StringContent(guidsJsonBody, Encoding.UTF8, "application/json") }; - var response = await new HttpClient().SendAsync(request); + var response = await new HttpClient().SendAsync(request, cancelationToken); // Assert var guids = server.MappingModels.Select(mapping => mapping.Guid!.Value).ToArray(); @@ -557,7 +553,7 @@ public class WireMockServerAdminTests Check.That(guids.Contains(guid2.Value)).IsFalse(); Check.That(guids.Contains(guid3.Value)).IsTrue(); Check.That(response.StatusCode).Equals(HttpStatusCode.OK); - Check.That(await response.Content.ReadAsStringAsync()).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}"); + Check.That(await response.Content.ReadAsStringAsync(cancelationToken)).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}"); } #if NET5_0_OR_GREATER @@ -565,12 +561,13 @@ public class WireMockServerAdminTests public async Task WireMockServer_CreateHttpClientFactory_And_CallEndpoint() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var server = WireMockServer.Start(); var factory = server.CreateHttpClientFactory(); var client = factory.CreateClient("any name"); // Act - await client.GetAsync($"{server.Url}/foo"); + await client.GetAsync($"{server.Url}/foo", cancelationToken); // Assert Check.That(server.LogEntries).HasSize(1); diff --git a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs index 06ad5c80..a0b3bb74 100644 --- a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs +++ b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs @@ -1,17 +1,14 @@ // Copyright © WireMock.Net -using System.IO; using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using Moq; using WireMock.Handlers; using WireMock.Server; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/WireMockServer.Authentication.cs b/test/WireMock.Net.Tests/WireMockServer.Authentication.cs index d3aa77c2..134e9d50 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Authentication.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Authentication.cs @@ -5,7 +5,6 @@ using NFluent; using WireMock.Matchers; using WireMock.Owin; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests { diff --git a/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs b/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs index 83fbf0c6..edf67f25 100644 --- a/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs +++ b/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs @@ -1,10 +1,7 @@ // Copyright © WireMock.Net -using System.IO; -using System.Linq; using FluentAssertions; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests { diff --git a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs index b914c515..260ec3e2 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs @@ -1,12 +1,9 @@ // Copyright © WireMock.Net -using System; -using System.Linq; using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using System.Threading.Tasks; using FluentAssertions; using Moq; using NFluent; @@ -19,7 +16,6 @@ using WireMock.ResponseBuilders; using WireMock.Server; using WireMock.Settings; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/WireMockServer.Settings.cs b/test/WireMock.Net.Tests/WireMockServer.Settings.cs index 7a82e8a9..cf6833c1 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Settings.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Settings.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using System.Linq; using FluentAssertions; using Moq; using NFluent; @@ -10,7 +9,6 @@ using WireMock.Logging; using WireMock.Owin; using WireMock.Server; using WireMock.Settings; -using Xunit; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs index 00b41e7b..6cad5897 100644 --- a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs +++ b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs @@ -1,10 +1,7 @@ // Copyright © WireMock.Net -using System; -using System.Linq; using System.Net; using System.Net.Http; -using System.Threading.Tasks; using FluentAssertions; using Moq; using WireMock.Logging; @@ -15,7 +12,6 @@ using WireMock.Server; using WireMock.Settings; using WireMock.Types; using WireMock.Util; -using Xunit; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs b/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs index 4a5a67d0..fd0636ce 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs @@ -3,7 +3,6 @@ using System.Net; using System.Net.Http; using System.Security.Cryptography.X509Certificates; -using System.Threading.Tasks; using FluentAssertions; using WireMock.Net.Tests.Facts; using WireMock.RequestBuilders; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs index 34f1ac6f..c41e8ba0 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -#if !NET452 using System.Net; using System.Net.Http; using System.Net.Http.Json; @@ -183,15 +182,16 @@ public partial class WireMockServerTests ); // Act + var cancelationToken = TestContext.Current.CancellationToken; var content = "{\"jsonrpc\":\"2.0\",\"id\":\"ec475f56d4694b48bc737500ba575b35-1\",\"method\":\"initialize\",\"params\":{\"protocolVersion\":\"2024-11-05\",\"capabilities\":{},\"clientInfo\":{\"name\":\"GitHub Test\",\"version\":\"1.0.0\"}}}"; var response = await new HttpClient() - .PostAsync($"{server.Url}/foo", new StringContent(content, Encoding.UTF8, "application/json")) + .PostAsync($"{server.Url}/foo", new StringContent(content, Encoding.UTF8, "application/json"), cancelationToken) ; // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); - var responseText = await response.Content.ReadAsStringAsync(); + var responseText = await response.Content.ReadAsStringAsync(cancelationToken); responseText.Should().Contain("ec475f56d4694b48bc737500ba575b35-1"); } @@ -231,6 +231,7 @@ public partial class WireMockServerTests public async Task WireMockServer_WithBodyAsFormUrlEncoded_Using_PostAsync_And_WithFunc() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(); server.Given( Request.Create() @@ -245,7 +246,7 @@ public partial class WireMockServerTests // Act var content = new FormUrlEncodedContent([new KeyValuePair("key1", "value1")]); var response = await new HttpClient() - .PostAsync($"{server.Url}/foo", content) + .PostAsync($"{server.Url}/foo", content, cancelationToken) ; // Assert @@ -291,6 +292,7 @@ public partial class WireMockServerTests public async Task WireMockServer_WithBodyAsFormUrlEncoded_Using_PostAsync_And_WithFormUrlEncodedMatcher() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var matcher = new FormUrlEncodedMatcher(["email=johndoe@example.com", "name=John Doe"]); var server = WireMockServer.Start(); server.Given( @@ -322,7 +324,7 @@ public partial class WireMockServerTests new KeyValuePair("email", "johndoe@example.com") }); var responseOrdered = await new HttpClient() - .PostAsync($"{server.Url}/foo", contentOrdered) + .PostAsync($"{server.Url}/foo", contentOrdered, cancelationToken) ; // Assert 1 @@ -336,7 +338,7 @@ public partial class WireMockServerTests new KeyValuePair("name", "John Doe"), }); var responseUnordered = await new HttpClient() - .PostAsync($"{server.Url}/bar", contentUnordered) + .PostAsync($"{server.Url}/bar", contentUnordered, cancelationToken) ; // Assert 2 @@ -401,5 +403,4 @@ public partial class WireMockServerTests // Assert 2 data.Should().Be("x 1;x 2;x 3;"); } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs index 505fdfe0..4e4ba7a1 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs @@ -2,12 +2,10 @@ using System.Net; using System.Net.Http; -using System.Threading.Tasks; using FluentAssertions; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests { diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs index 0204bf81..87609a72 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs @@ -1,16 +1,12 @@ // Copyright © WireMock.Net -using System; using System.Net; -using System.Threading.Tasks; using FluentAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; -using WireMock.ResponseBuilders; using WireMock.Server; using WireMock.Settings; using WireMock.Types; -using Xunit; namespace WireMock.Net.Tests; @@ -23,6 +19,7 @@ public partial class WireMockServerTests public async Task WireMockServer_WithParam_QueryParameterMultipleValueSupport_NoComma_Should_Ignore_Comma(string queryValue) { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var settings = new WireMockServerSettings { QueryParameterMultipleValueSupport = QueryParameterMultipleValueSupport.NoComma @@ -40,7 +37,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/foo?query={queryValue}"); - var response = await server.CreateClient().GetAsync(requestUri); + var response = await server.CreateClient().GetAsync(requestUri, cancelationToken); // Assert response.StatusCode.Should().Be(HttpStatusCode.Accepted); @@ -52,6 +49,7 @@ public partial class WireMockServerTests public async Task WireMockServer_WithParam_MultiValueComma() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var queryValue = "1,2,3"; var server = WireMockServer.Start(); server @@ -64,7 +62,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/foo?query={queryValue}"); - var response = await server.CreateClient().GetAsync(requestUri); + var response = await server.CreateClient().GetAsync(requestUri, cancelationToken); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -76,6 +74,7 @@ public partial class WireMockServerTests public async Task WireMockServer_WithParam_RejectOnMatch_OnNonMatchingParam_ShouldReturnMappingOk() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var server = WireMockServer.Start(); server.Given( Request.Create() @@ -87,7 +86,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/v1/person/workers?showsourcesystem=true&count=700&page=1§ions=personal%2Corganizations%2Cemployment"); - var response = await server.CreateClient().GetAsync(requestUri); + var response = await server.CreateClient().GetAsync(requestUri, cancelationToken); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -99,6 +98,7 @@ public partial class WireMockServerTests public async Task WireMockServer_WithParam_AcceptOnMatch_OnNonMatchingParam_ShouldReturnMappingOk() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var server = WireMockServer.Start(); server.Given( Request.Create() @@ -110,7 +110,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/v1/person/workers?showsourcesystem=true&count=700&page=1§ions=personal%2Corganizations%2Cemployment"); - var response = await server.CreateClient().GetAsync(requestUri); + var response = await server.CreateClient().GetAsync(requestUri, cancelationToken); // Assert response.StatusCode.Should().Be(HttpStatusCode.NotFound); diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithProbability.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithProbability.cs index 553796df..bb094ddf 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithProbability.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithProbability.cs @@ -1,13 +1,9 @@ // Copyright © WireMock.Net -using System; -using System.Collections.Generic; using System.Net; -using System.Threading.Tasks; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests; @@ -17,6 +13,7 @@ public partial class WireMockServerTests public async Task WireMockServer_WithProbability() { // Arrange + var cancelationToken = TestContext.Current.CancellationToken; var server = WireMockServer.Start(); server .Given(Request.Create().UsingGet().WithPath("/foo")) @@ -29,7 +26,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/foo"); - var response = await server.CreateClient().GetAsync(requestUri); + var response = await server.CreateClient().GetAsync(requestUri, cancelationToken); // Assert Assert.Contains(response.StatusCode, new HashSet { HttpStatusCode.OK, HttpStatusCode.InternalServerError }); diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs index aaec3811..ad3b1d58 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs @@ -1,13 +1,8 @@ // Copyright © WireMock.Net -using System; -using System.Collections.Generic; -using System.IO; using System.Net.Http; -using System.Threading.Tasks; using FluentAssertions; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs b/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs index b8622591..2d55c48f 100644 --- a/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs +++ b/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs @@ -1,10 +1,8 @@ // Copyright © WireMock.Net -using System; using FluentAssertions; using WireMock.Admin.Mappings; using WireMock.Server; -using Xunit; namespace WireMock.Net.Tests.WithMapping;