From c24f2396ffb289089d31241f5c580599aa171ab9 Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Sat, 14 Feb 2026 12:35:15 +0100 Subject: [PATCH] --- --- .../WireMockAdminApiTests.PostMappings.cs | 2 +- .../AdminApi/WireMockAdminApiTests.cs | 2 +- .../Builders/AdminApiMappingBuilderTests.cs | 2 +- .../Extensions/DictionaryExtensionsTests.cs | 2 +- .../Extensions/EnumExtensionsTests.cs | 2 +- .../IgnoreOnContinuousIntegrationFact.cs | 5 +- .../Facts/RunOnDockerPlatformFact.cs | 3 +- .../WireMockAssertionsExtensions.cs | 37 ----------- .../WireMockAssertionsTests.cs | 63 ++++++++++--------- .../Grpc/ProtoBufUtilsTests.cs | 2 +- .../Grpc/ProtoDefinitionHelperTests.cs | 2 +- .../Grpc/WireMockServerTests.Grpc.cs | 2 +- .../Http/ByteArrayContentHelperTests.cs | 2 +- .../Http/HttpRequestMessageHelperTests.cs | 2 +- .../Http/StringContentHelperTests.cs | 2 +- .../Matchers/CSharpCodeMatcherTests.cs | 2 +- .../Matchers/ContentTypeMatcherTests.cs | 2 +- .../Matchers/FormUrlEncodedMatcherTests.cs | 2 +- .../Matchers/FuncMatcherTests.cs | 2 +- .../Matchers/GraphQLMatcherTests.cs | 2 +- .../Matchers/JmesPathMatcherTests.cs | 2 +- .../Matchers/JsonMatcherTests.cs | 2 +- .../Matchers/JsonPartialMatcherTests.cs | 2 +- .../JsonPartialWildcardMatcherTests.cs | 2 +- .../Matchers/JsonPathMatcherTests.cs | 2 +- .../Matchers/MatcherTests.cs | 2 +- .../Matchers/MimePartMatcherTests.cs | 2 +- .../WireMockCustomScalarGraphTypeTests.cs | 2 +- .../Matchers/NotNullOrEmptyMatcherTests.cs | 2 +- .../Matchers/ProtoBufMatcherTests.cs | 2 +- .../Matchers/RegexMatcherTests.cs | 2 +- .../Matchers/RequestMatchResultTests.cs | 2 +- .../Matchers/WildcardMatcherTest.cs | 2 +- .../ObservableLogEntriesTest.cs | 2 +- .../OpenApiParser/PathUtilsTests.cs | 2 +- .../OpenTelemetryOptionsParserTests.cs | 2 +- .../WireMockOpenTelemetryExtensionsTests.cs | 2 +- .../WireMockActivitySourceTests.cs | 2 +- .../Owin/HostUrlOptionsTests.cs | 2 +- .../Owin/Mappers/OwinResponseMapperTests.cs | 2 +- .../Owin/MappingMatcherTests.cs | 2 +- .../Owin/WireMockMiddlewareTests.cs | 2 +- test/WireMock.Net.Tests/Pact/PactTests.cs | 2 +- .../RequestBuilderWithBodyTests.cs | 2 +- .../RequestBuilderWithGraphQLSchemaTests.cs | 2 +- .../RequestBuilderWithMultiPartTests.cs | 2 +- .../RequestBuilderWithProtoBufTests.cs | 2 +- .../RequestMessageBodyMatcherTests.cs | 2 +- .../RequestMessageGraphQLMatcherTests.cs | 2 +- .../RequestMessageMethodMatcherTests.cs | 2 +- .../RequestMessageMultiPartMatcher.cs | 2 +- .../RequestMessageParamMatcherTests.cs | 2 +- .../ResponseWithBodyFromFileTests.cs | 5 +- .../ResponseBuilders/ResponseWithBodyTests.cs | 2 +- .../ResponseWithCallbackTests.cs | 2 +- .../ResponseWithFaultTests.cs | 2 +- .../ResponseWithHandlebarsDateTimeTests.cs | 2 +- .../ResponseWithHandlebarsFileTests.cs | 2 +- .../ResponseWithHandlebarsJsonPathTests.cs | 2 +- .../ResponseWithHandlebarsLinqTests.cs | 2 +- .../ResponseWithHandlebarsRandomTests.cs | 2 +- .../ResponseWithHandlebarsXPathTests.cs | 2 +- .../ResponseWithProxyIntegrationTests.cs | 2 +- .../ResponseWithScribanTests.cs | 2 +- .../ResponseWithStatusCodeTests.cs | 2 +- .../ResponseWithTransformerTests.cs | 2 +- .../MappingConverterTests.ToCSharpCode.cs | 2 +- .../Serialization/MappingConverterTests.cs | 2 +- .../Serialization/MappingSerializerTests.cs | 2 +- .../Serialization/MatcherMapperTests.cs | 4 +- .../Settings/HandlebarsSettingsTests.cs | 2 +- .../Settings/SimpleSettingsParserTests.cs | 2 +- .../WireMockServerSettingsParserTests.cs | 2 +- .../StatefulBehaviorTests.cs | 2 +- .../Testcontainers/CombineUtilsTests.cs | 2 +- .../Testcontainers/TestcontainersTests.cs | 4 +- .../Testcontainers/TestcontainersTestsGrpc.cs | 4 +- .../HandlebarsContextFactoryTests.cs | 2 +- .../Scriban/ScribanContextFactoryTests.cs | 2 +- .../Util/BodyParserTests.cs | 2 +- .../Util/BytesEncodingUtilsTests.cs | 2 +- .../Util/CSharpFormatterTests.cs | 2 +- .../Util/CompressionUtilsTests.cs | 2 +- .../Util/CultureInfoUtilsTests.cs | 2 +- .../Util/FileHelperTests.cs | 2 +- .../Util/HttpStatusRangeParserTests.cs | 2 +- .../Util/HttpVersionParserTests.cs | 2 +- .../WireMock.Net.Tests/Util/PortUtilsTests.cs | 2 +- .../Util/QueryStringParserTests.cs | 2 +- .../Util/RegexUtilsTests.cs | 2 +- .../Util/StringUtilsTests.cs | 2 +- .../Util/SystemUtilsTests.cs | 2 +- .../Util/TypeLoaderTests.cs | 2 +- .../Validators/PathValidatorTests.cs | 2 +- .../WebSockets/WebSocketIntegrationTests.cs | 2 +- .../WireMock.Net.Tests.csproj | 2 +- .../WireMockServer.Admin.cs | 2 +- .../WireMockServer.AdminFiles.cs | 2 +- .../WireMockServer.Authentication.cs | 2 +- .../WireMockServer.ImportWireMockOrg.cs | 2 +- .../WireMockServer.Proxy.cs | 2 +- .../WireMockServer.Settings.cs | 2 +- .../WireMockServer.WebhookTests.cs | 2 +- .../WireMockServerTests.ClientCertificate.cs | 2 +- .../WireMockServerTests.WithBody.cs | 2 +- .../WireMockServerTests.WithCallback.cs | 2 +- .../WireMockServerTests.WithMultiPart.cs | 2 +- .../WireMockServerTests.WithParam.cs | 2 +- .../WireMockServerTests.WithTransformer.cs | 2 +- .../WireMock.Net.Tests/WireMockServerTests.cs | 6 +- .../WireMockServerWithMappingTests.cs | 2 +- 111 files changed, 152 insertions(+), 183 deletions(-) delete mode 100644 test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs index 54052e43..8e363094 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs @@ -2,7 +2,7 @@ using System.Net.Http; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using NFluent; diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs index 84de9689..62c64247 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Moq; using NFluent; using RestEase; diff --git a/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs b/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs index 182107eb..ea31df35 100644 --- a/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs +++ b/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Client; using WireMock.Client.Extensions; using WireMock.Net.Tests.VerifyExtensions; diff --git a/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs b/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs index cd52cd27..45589d16 100644 --- a/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs +++ b/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Collections; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Extensions; namespace WireMock.Net.Tests.Extensions; diff --git a/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs b/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs index 6ff06055..7902064a 100644 --- a/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs +++ b/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Extensions; namespace WireMock.Net.Tests.Extensions; diff --git a/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs b/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs index e570e02a..12a6ba91 100644 --- a/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs +++ b/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs @@ -1,6 +1,7 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; namespace WireMock.Net.Tests.Facts; @@ -12,7 +13,9 @@ public sealed class IgnoreOnContinuousIntegrationFact : FactAttribute private static readonly bool IsContinuousIntegrationGithub = bool.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), out var isGH) && isGH; private static readonly bool IsContinuousIntegration = IsContinuousIntegrationAzure || IsContinuousIntegrationGithub; - public IgnoreOnContinuousIntegrationFact() + public IgnoreOnContinuousIntegrationFact( + [CallerFilePath] string? sourceFilePath = null, + [CallerLineNumber] int sourceLineNumber = -1) : base(sourceFilePath, sourceLineNumber) { if (IsContinuousIntegration) { diff --git a/test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs b/test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs index b98916d9..d12cdb4f 100644 --- a/test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs +++ b/test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs @@ -10,7 +10,8 @@ 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) { diff --git a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs deleted file mode 100644 index dd427f4f..00000000 --- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright © WireMock.Net - -using FluentAssertions; -using FluentAssertions.Execution; -using WireMock.FluentAssertions; - -namespace WireMock.Net.Tests.FluentAssertions; - -public static class WireMockAssertionsExtensions -{ - [CustomAssertion] - public static AndWhichConstraint AtAbsoluteUrl2(this WireMockAssertions assertions, - string absoluteUrl, string because = "", params object[] becauseArgs) - { - var (filter, condition) = assertions.BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase)); - - Execute.Assertion - .BecauseOf(because, becauseArgs) - .Given(() => assertions.RequestMessages) - .ForCondition(requests => assertions.CallsCount == 0 || requests.Any()) - .FailWith( - "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.", - absoluteUrl - ) - .Then - .ForCondition(condition) - .FailWith( - "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.", - _ => absoluteUrl, - requests => requests.Select(request => request.AbsoluteUrl) - ); - - assertions.FilterRequestMessages(filter); - - return new AndWhichConstraint(assertions, absoluteUrl); - } -} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs index aa53d733..2d95e050 100644 --- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs +++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs @@ -4,8 +4,8 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Net.Http.Json; -using FluentAssertions; -using WireMock.FluentAssertions; +using AwesomeAssertions; +using WireMock.AwesomeAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; @@ -33,7 +33,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedNoCalls_AtAbsoluteUrl_WhenACallWasNotMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("xxx"); + await _httpClient.GetAsync("xxx", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedNoCalls() @@ -43,7 +43,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived0Calls_AtAbsoluteUrl_WhenACallWasNotMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("xxx"); + await _httpClient.GetAsync("xxx", TestContext.Current.CancellationToken); _server.Should() .HaveReceived(0).Calls() @@ -53,7 +53,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl"); + await _httpClient.GetAsync("anyurl", TestContext.Current.CancellationToken); _server.Should() .HaveReceived(1).Calls() @@ -63,17 +63,17 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsoluteUrl2_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl"); + await _httpClient.GetAsync("anyurl", TestContext.Current.CancellationToken); _server.Should() .HaveReceived(1).Calls() - .AtAbsoluteUrl2($"http://localhost:{_portUsed}/anyurl"); + .AtAbsoluteUrl($"http://localhost:{_portUsed}/anyurl"); } [Fact] public async Task HaveReceived1Calls_AtAbsoluteUrlUsingPost_WhenAPostCallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.PostAsync("anyurl", new StringContent("")); + await _httpClient.PostAsync("anyurl", new StringContent(""), TestContext.Current.CancellationToken); _server.Should() .HaveReceived(1).Calls() @@ -85,9 +85,9 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived2Calls_AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl"); + await _httpClient.GetAsync("anyurl", TestContext.Current.CancellationToken); - await _httpClient.GetAsync("anyurl"); + await _httpClient.GetAsync("anyurl", TestContext.Current.CancellationToken); _server.Should() .HaveReceived(2).Calls() @@ -97,7 +97,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl"); + await _httpClient.GetAsync("anyurl", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedACall() @@ -107,7 +107,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsoluteUrlWildcardMatcher_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl"); + await _httpClient.GetAsync("anyurl", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedACall() @@ -129,7 +129,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsoluteUrl_Should_ThrowWhenNoCallsMatchingTheAbsoluteUrlWereMade() { - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("", TestContext.Current.CancellationToken); Action act = () => _server.Should() .HaveReceivedACall() @@ -143,7 +143,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedNoCalls_AtAbsolutePath_WhenACallWasNotMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("xxx"); + await _httpClient.GetAsync("xxx", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedNoCalls() @@ -153,7 +153,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived0Calls_AtAbsolutePath_WhenACallWasNotMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("xxx"); + await _httpClient.GetAsync("xxx", TestContext.Current.CancellationToken); _server.Should() .HaveReceived(0).Calls() @@ -163,7 +163,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("anypath"); + await _httpClient.GetAsync("anypath", TestContext.Current.CancellationToken); _server.Should() .HaveReceived(1).Calls() @@ -173,7 +173,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsolutePathUsingPost_WhenAPostCallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.PostAsync("anypath", new StringContent("")); + await _httpClient.PostAsync("anypath", new StringContent(""), TestContext.Current.CancellationToken); _server.Should() .HaveReceived(1).Calls() @@ -185,9 +185,9 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived2Calls_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("anypath"); + await _httpClient.GetAsync("anypath", TestContext.Current.CancellationToken); - await _httpClient.GetAsync("anypath"); + await _httpClient.GetAsync("anypath", TestContext.Current.CancellationToken); _server.Should() .HaveReceived(2).Calls() @@ -197,7 +197,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("anypath"); + await _httpClient.GetAsync("anypath", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedACall() @@ -207,7 +207,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsolutePathWildcardMatcher_WhenACallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("anypath"); + await _httpClient.GetAsync("anypath", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedACall() @@ -229,7 +229,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsolutePath_Should_ThrowWhenNoCallsMatchingTheAbsolutePathWereMade() { - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("", TestContext.Current.CancellationToken); Action act = () => _server.Should() .HaveReceivedACall() @@ -244,7 +244,7 @@ public class WireMockAssertionsTests : IDisposable public async Task HaveReceivedACall_WithHeader_WhenACallWasMadeWithExpectedHeader_Should_BeOK() { _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer a"); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedACall() @@ -255,7 +255,7 @@ public class WireMockAssertionsTests : IDisposable public async Task HaveReceivedACall_WithHeader_WhenACallWasMadeWithExpectedHeaderWithValue_Should_BeOK() { _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer a"); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedACall() @@ -267,10 +267,10 @@ public class WireMockAssertionsTests : IDisposable { _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await _httpClient.GetAsync("1"); + await _httpClient.GetAsync("1", TestContext.Current.CancellationToken); _httpClient.DefaultRequestHeaders.AcceptLanguage.Add(new StringWithQualityHeaderValue("EN")); - await _httpClient.GetAsync("2"); + await _httpClient.GetAsync("2", TestContext.Current.CancellationToken); _server.Should() .HaveReceivedACall() @@ -282,7 +282,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderNameWereMade() { - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("", TestContext.Current.CancellationToken); Action act = () => _server.Should() .HaveReceivedACall() @@ -298,7 +298,7 @@ public class WireMockAssertionsTests : IDisposable { _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("", TestContext.Current.CancellationToken); Action act = () => _server.Should() .HaveReceivedACall() @@ -316,7 +316,7 @@ public class WireMockAssertionsTests : IDisposable httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await httpClient.GetAsync(""); + await httpClient.GetAsync("", TestContext.Current.CancellationToken); Action act = () => _server.Should() .HaveReceivedACall() @@ -331,6 +331,7 @@ public class WireMockAssertionsTests : IDisposable public async Task HaveReceivedACall_WithHeader_ShouldCheckAllRequests() { // Arrange + var cancellationToken = TestContext.Current.CancellationToken; using var server = WireMockServer.Start(); using var client1 = server.CreateClient(); @@ -344,7 +345,7 @@ public class WireMockAssertionsTests : IDisposable { Authorization = new AuthenticationHeaderValue("Bearer", "invalidToken") } - }); + }, cancellationToken); // Act 2 var task2 = client2.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/") @@ -353,7 +354,7 @@ public class WireMockAssertionsTests : IDisposable { Authorization = new AuthenticationHeaderValue("Bearer", "validToken") } - }); + }, cancellationToken); await Task.WhenAll(task1, task2); diff --git a/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs b/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs index b042722f..410d4426 100644 --- a/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs +++ b/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Grpc; diff --git a/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs b/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs index d6c530b4..e77720cb 100644 --- a/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs +++ b/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Grpc; diff --git a/test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs b/test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs index 6cf4c402..e9157435 100644 --- a/test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs +++ b/test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Text; using ExampleIntegrationTest.Lookup; -using FluentAssertions; +using AwesomeAssertions; using Google.Protobuf.WellKnownTypes; using Greet; using Grpc.Net.Client; diff --git a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs index 9ca5a89b..6cbe0a02 100644 --- a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs @@ -2,7 +2,7 @@ using System.Net.Http.Headers; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Http; namespace WireMock.Net.Tests.Http; diff --git a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs index 740e85f1..a5436393 100644 --- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Http; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs b/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs index 2baeb799..a4317ed8 100644 --- a/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Net.Http.Headers; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Http; namespace WireMock.Net.Tests.Http; diff --git a/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs index 67132de9..f8e0071d 100644 --- a/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs index 007ef315..c8163e6b 100644 --- a/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs index d717920f..f4e55e1d 100644 --- a/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs @@ -2,7 +2,7 @@ using System.Net.Http; using AnyOfTypes; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/Matchers/FuncMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/FuncMatcherTests.cs index bed6637a..49c47fff 100644 --- a/test/WireMock.Net.Tests/Matchers/FuncMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/FuncMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/GraphQLMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/GraphQLMatcherTests.cs index f5c87747..7e3b5798 100644 --- a/test/WireMock.Net.Tests/Matchers/GraphQLMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/GraphQLMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using GraphQLParser.Exceptions; using WireMock.Exceptions; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs index 28bbcf1d..96edd850 100644 --- a/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json.Linq; using NFluent; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs index 38d2d0fb..bd80ac9e 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; diff --git a/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs index 171f9f0a..b216ef35 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NFluent; diff --git a/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs index c2f39f7d..ead88033 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NFluent; diff --git a/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs index e5ac48a0..bf4dd903 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json.Linq; using NFluent; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/MatcherTests.cs b/test/WireMock.Net.Tests/Matchers/MatcherTests.cs index a1bb0a1d..1df80202 100644 --- a/test/WireMock.Net.Tests/Matchers/MatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/MatcherTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs index 51cd4ce9..be9a6bc1 100644 --- a/test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Matchers/Models/WireMockCustomScalarGraphTypeTests.cs b/test/WireMock.Net.Tests/Matchers/Models/WireMockCustomScalarGraphTypeTests.cs index 25093ade..8784c05c 100644 --- a/test/WireMock.Net.Tests/Matchers/Models/WireMockCustomScalarGraphTypeTests.cs +++ b/test/WireMock.Net.Tests/Matchers/Models/WireMockCustomScalarGraphTypeTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.GraphQL.Models; namespace WireMock.Net.Tests.Matchers.Models; diff --git a/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs index 8c2b2286..03c3032d 100644 --- a/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs index 6504dff6..cc609e0c 100644 --- a/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using ProtoBuf; using WireMock.Matchers; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs index 5d540ce8..50c07cbf 100644 --- a/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs b/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs index 4f7bb939..62ea0594 100644 --- a/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs +++ b/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs b/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs index 463e70cf..8a1bdb15 100644 --- a/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs +++ b/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using AnyOfTypes; -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Matchers; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs index eadfbf68..358cb245 100644 --- a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs +++ b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs @@ -3,7 +3,7 @@ using System.Collections.Specialized; using System.Net; using System.Net.Http; -using FluentAssertions; +using AwesomeAssertions; using Moq; using NFluent; using WireMock.Logging; diff --git a/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs b/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs index 0b431b20..0bcdc1a9 100644 --- a/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs +++ b/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Net.OpenApiParser.Utils; namespace WireMock.Net.Tests.OpenApiParser; diff --git a/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs b/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs index d5e92ab4..ca59f8f8 100644 --- a/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs +++ b/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.OpenTelemetry; namespace WireMock.Net.Tests.OpenTelemetry; diff --git a/test/WireMock.Net.Tests/OpenTelemetry/WireMockOpenTelemetryExtensionsTests.cs b/test/WireMock.Net.Tests/OpenTelemetry/WireMockOpenTelemetryExtensionsTests.cs index b754294d..19fa2267 100644 --- a/test/WireMock.Net.Tests/OpenTelemetry/WireMockOpenTelemetryExtensionsTests.cs +++ b/test/WireMock.Net.Tests/OpenTelemetry/WireMockOpenTelemetryExtensionsTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net #if NET6_0_OR_GREATER -using FluentAssertions; +using AwesomeAssertions; using Microsoft.Extensions.DependencyInjection; using WireMock.OpenTelemetry; using Xunit; diff --git a/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs b/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs index f08618bc..90100fe4 100644 --- a/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs +++ b/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Diagnostics; -using FluentAssertions; +using AwesomeAssertions; using Moq; using WireMock.Logging; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs b/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs index 90a679d9..2bdbdb61 100644 --- a/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs +++ b/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Owin; using WireMock.Types; diff --git a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs index 4ae443aa..74cecac8 100644 --- a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs +++ b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using Moq; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Handlers; using WireMock.Owin.Mappers; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs b/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs index 05de82c8..2a8033a5 100644 --- a/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs +++ b/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Collections.Concurrent; -using FluentAssertions; +using AwesomeAssertions; using Moq; using WireMock.Logging; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs index 0f459b42..3e3448c5 100644 --- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs +++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs @@ -12,7 +12,7 @@ using WireMock.Matchers; using WireMock.Admin.Mappings; using WireMock.Admin.Requests; using WireMock.Settings; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Handlers; using WireMock.Matchers.Request; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/Pact/PactTests.cs b/test/WireMock.Net.Tests/Pact/PactTests.cs index 94d7a8e1..8b37eb2c 100644 --- a/test/WireMock.Net.Tests/Pact/PactTests.cs +++ b/test/WireMock.Net.Tests/Pact/PactTests.cs @@ -2,7 +2,7 @@ using System.Net; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs index 352e2332..6f998b6b 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NFluent; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs index fd6f2e32..ffc4a317 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using GraphQL.Types; using WireMock.Matchers; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithMultiPartTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithMultiPartTests.cs index 632bac26..b62e9247 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithMultiPartTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithMultiPartTests.cs @@ -2,7 +2,7 @@ #if MIMEKIT using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs index 199c53ce..e397b7aa 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs index 214d4a1c..fd1f42b0 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Moq; using NFluent; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs index b3b2a56c..5b631069 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Moq; using WireMock.Matchers; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs index 61547b16..6e5c305c 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs index fc55e5ca..0ca8b12f 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs index 7fdb8c20..dc4a182a 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs index 1861b031..8ef67a57 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs @@ -2,7 +2,7 @@ using System.Net; using System.Net.Http; -using FluentAssertions; +using AwesomeAssertions; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; @@ -65,7 +65,8 @@ namespace WireMock.Net.Tests.ResponseBuilders ); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); + using var httpClient = new HttpClient(); + var response = await httpClient.GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); // Assert response.Should().Contain("world"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs index 1b513f92..9933cafa 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using FluentAssertions; +using AwesomeAssertions; using JsonConverter.Newtonsoft.Json; using Microsoft.AspNetCore.Http; using Moq; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs index e8c2598d..a612d973 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs @@ -2,7 +2,7 @@ using System.Net; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using NFluent; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs index 269cf0e5..450e1d2c 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs index 83718956..ac07892d 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs index 5de840fe..f099fe81 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using HandlebarsDotNet; using Microsoft.AspNetCore.Http; using Moq; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs index 314a5797..8293b255 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs index 2c956c9a..211058e4 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using HandlebarsDotNet; using Microsoft.AspNetCore.Http; using Moq; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs index 2c8ee77c..dbb1df71 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs index c14381b0..861090cb 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using NFluent; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs index 6e212879..6acac640 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http.Headers; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs index ea50194f..faffa12b 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Models; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs index ca6ca6f0..78b3c0b6 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Net; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs index 93e647b3..7e56ef79 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json; diff --git a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs index 0b7e2612..526c646f 100644 --- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs +++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Net.Tests.VerifyExtensions; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs index fefe0fba..27141817 100644 --- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs +++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Models; using WireMock.RequestBuilders; diff --git a/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs b/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs index d0cc573d..66942f08 100644 --- a/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs +++ b/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using JsonConverter.Newtonsoft.Json; using WireMock.Admin.Mappings; using WireMock.Serialization; diff --git a/test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs b/test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs index 39b053ca..64d362bc 100644 --- a/test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs +++ b/test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs @@ -1,8 +1,8 @@ // Copyright © WireMock.Net using AnyOfTypes; -using FluentAssertions; -using FluentAssertions.Execution; +using AwesomeAssertions; +using AwesomeAssertions.Execution; using Moq; using Newtonsoft.Json; using NFluent; diff --git a/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs b/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs index a4c6c710..e4f85dc2 100644 --- a/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs +++ b/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using HandlebarsDotNet; using HandlebarsDotNet.Helpers.Enums; using Microsoft.AspNetCore.Http; diff --git a/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs b/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs index a94e278b..32194323 100644 --- a/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs +++ b/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Settings; using WireMock.Types; diff --git a/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs b/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs index 6a8e98e1..2ea8018e 100644 --- a/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs +++ b/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Settings; namespace WireMock.Net.Tests.Settings; diff --git a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs index f0092bab..f11734c9 100644 --- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs +++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs @@ -2,7 +2,7 @@ using System.Net; using System.Net.Http; -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs b/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs index e0cfcce3..7f9e69b2 100644 --- a/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs +++ b/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Net.Testcontainers.Utils; namespace WireMock.Net.Tests.Testcontainers; diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs index f1b1a919..8bcc79e5 100644 --- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs +++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs @@ -2,9 +2,9 @@ #if NET6_0_OR_GREATER using System.Runtime.InteropServices; +using AwesomeAssertions; +using AwesomeAssertions.Execution; using DotNet.Testcontainers.Builders; -using FluentAssertions; -using FluentAssertions.Execution; using Meziantou.Extensions.Logging.Xunit.v3; using Microsoft.Extensions.Logging; using WireMock.Net.Testcontainers; diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTestsGrpc.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTestsGrpc.cs index c7a55ccb..75944f98 100644 --- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTestsGrpc.cs +++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTestsGrpc.cs @@ -2,8 +2,8 @@ #if NET6_0_OR_GREATER using System.Text; -using FluentAssertions; -using FluentAssertions.Execution; +using AwesomeAssertions; +using AwesomeAssertions.Execution; using Greet; using Grpc.Net.Client; using Meziantou.Extensions.Logging.Xunit.v3; diff --git a/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs b/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs index 35c1a7d8..ef6d37d9 100644 --- a/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs +++ b/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Moq; using WireMock.Handlers; using WireMock.Settings; diff --git a/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs b/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs index 31a52a11..60dada48 100644 --- a/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs +++ b/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Moq; using WireMock.Handlers; using WireMock.Transformers.Scriban; diff --git a/test/WireMock.Net.Tests/Util/BodyParserTests.cs b/test/WireMock.Net.Tests/Util/BodyParserTests.cs index f47d2ee6..1ba5f53b 100644 --- a/test/WireMock.Net.Tests/Util/BodyParserTests.cs +++ b/test/WireMock.Net.Tests/Util/BodyParserTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Types; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs b/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs index 1c6fc8d0..ddc13bb8 100644 --- a/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs b/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs index 9f363d25..0f038da9 100644 --- a/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs +++ b/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json.Linq; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs b/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs index 7e6296f7..64d2f6da 100644 --- a/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using FluentAssertions; +using AwesomeAssertions; using RandomDataGenerator.FieldOptions; using RandomDataGenerator.Randomizers; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs b/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs index f9dbd536..a997df26 100644 --- a/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Globalization; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/FileHelperTests.cs b/test/WireMock.Net.Tests/Util/FileHelperTests.cs index f350ff39..884122c7 100644 --- a/test/WireMock.Net.Tests/Util/FileHelperTests.cs +++ b/test/WireMock.Net.Tests/Util/FileHelperTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Moq; using WireMock.Handlers; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs b/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs index d3886dba..ad23c255 100644 --- a/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs +++ b/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using System.Net; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs b/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs index 1ed86d88..ec06a2df 100644 --- a/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs +++ b/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/PortUtilsTests.cs b/test/WireMock.Net.Tests/Util/PortUtilsTests.cs index 17021600..180b1175 100644 --- a/test/WireMock.Net.Tests/Util/PortUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/PortUtilsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs b/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs index 44b2ee6c..4e35ea0f 100644 --- a/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs +++ b/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Types; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs b/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs index 8bfa3d52..88da9330 100644 --- a/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Text.RegularExpressions; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/StringUtilsTests.cs b/test/WireMock.Net.Tests/Util/StringUtilsTests.cs index fdcdf2ad..93d483dd 100644 --- a/test/WireMock.Net.Tests/Util/StringUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/StringUtilsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs b/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs index 53a0fc48..b77cfe67 100644 --- a/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs b/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs index bbf2c387..1786481a 100644 --- a/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs +++ b/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using AnyOfTypes; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Models; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs b/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs index 840795c8..74a26821 100644 --- a/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs +++ b/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Validators; namespace WireMock.Net.Tests.Validators; diff --git a/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs b/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs index cf5b1737..7e7ea1e3 100644 --- a/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs +++ b/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Net.WebSockets; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.Net.Xunit; using WireMock.RequestBuilders; diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj index 1f1d3665..56fe0432 100644 --- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj +++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj @@ -48,7 +48,7 @@ --> - + diff --git a/test/WireMock.Net.Tests/WireMockServer.Admin.cs b/test/WireMock.Net.Tests/WireMockServer.Admin.cs index c13973cf..5ff779e2 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Admin.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Admin.cs @@ -3,7 +3,7 @@ using System.Net; using System.Net.Http; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Moq; using Newtonsoft.Json; using NFluent; diff --git a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs index a0b3bb74..7c4170ed 100644 --- a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs +++ b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Moq; using WireMock.Handlers; using WireMock.Server; diff --git a/test/WireMock.Net.Tests/WireMockServer.Authentication.cs b/test/WireMock.Net.Tests/WireMockServer.Authentication.cs index 134e9d50..493e30c9 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Authentication.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Authentication.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using NFluent; using WireMock.Matchers; using WireMock.Owin; diff --git a/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs b/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs index edf67f25..2ebb6162 100644 --- a/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs +++ b/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Server; namespace WireMock.Net.Tests diff --git a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs index 260ec3e2..d3b6b438 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Moq; using NFluent; using WireMock.Constants; diff --git a/test/WireMock.Net.Tests/WireMockServer.Settings.cs b/test/WireMock.Net.Tests/WireMockServer.Settings.cs index cf6833c1..1ab94dad 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Settings.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Settings.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using Moq; using NFluent; using WireMock.Authentication; diff --git a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs index 6cad5897..43d0c23f 100644 --- a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs +++ b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs @@ -2,7 +2,7 @@ using System.Net; using System.Net.Http; -using FluentAssertions; +using AwesomeAssertions; using Moq; using WireMock.Logging; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs b/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs index fd0636ce..f26d2d45 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs @@ -3,7 +3,7 @@ using System.Net; using System.Net.Http; using System.Security.Cryptography.X509Certificates; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Net.Tests.Facts; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs index c41e8ba0..5e2ba2bf 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Json; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs index 4e4ba7a1..5a69c50f 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs @@ -2,7 +2,7 @@ using System.Net; using System.Net.Http; -using FluentAssertions; +using AwesomeAssertions; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithMultiPart.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithMultiPart.cs index 4fb1ce31..ec9b98a3 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithMultiPart.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithMultiPart.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs index 87609a72..c9c03b77 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Net; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.Server; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs index ad3b1d58..58504480 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Net.Http; -using FluentAssertions; +using AwesomeAssertions; using WireMock.Server; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.cs b/test/WireMock.Net.Tests/WireMockServerTests.cs index c3e9a74e..77231ff2 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.cs @@ -7,7 +7,7 @@ using System.Net.Http.Headers; using System.Net.NetworkInformation; using System.Net.Sockets; using System.Text; -using FluentAssertions; +using AwesomeAssertions; using Newtonsoft.Json; using NFluent; using WireMock.Admin.Mappings; @@ -333,7 +333,7 @@ public partial class WireMockServerTests watch.Stop(); // Assert - watch.ElapsedMilliseconds.Should().BeGreaterOrEqualTo(0); + watch.ElapsedMilliseconds.Should().BeGreaterThanOrEqualTo(0); server.Stop(); } @@ -387,7 +387,7 @@ public partial class WireMockServerTests watch.Stop(); // Assert - watch.ElapsedMilliseconds.Should().BeGreaterOrEqualTo(0); + watch.ElapsedMilliseconds.Should().BeGreaterThanOrEqualTo(0); server.Stop(); } diff --git a/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs b/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs index 2d55c48f..f0a00544 100644 --- a/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs +++ b/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using FluentAssertions; +using AwesomeAssertions; using WireMock.Admin.Mappings; using WireMock.Server;