---

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;

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;

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;

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;

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;

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)
         {

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)
     {

test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs

@@ -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<WireMockAssertions, string> 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<WireMockAssertions, string>(assertions, absoluteUrl);
-    }
-}

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 AwesomeAssertions;
-using WireMock.FluentAssertions;
+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);
 

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;

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;

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;

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;

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;

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;

test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs

@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net
 
-using FluentAssertions;
+using AwesomeAssertions;
 using NFluent;
 using WireMock.Matchers;
 

test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs

@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net
 
-using FluentAssertions;
+using AwesomeAssertions;
 using NFluent;
 using WireMock.Matchers;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

test/WireMock.Net.Tests/Matchers/MatcherTests.cs

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using WireMock.Matchers;
 
 namespace WireMock.Net.Tests.Matchers;

test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs

@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net
 
-using FluentAssertions;
+using AwesomeAssertions;
 using WireMock.Matchers;
 using WireMock.Util;
 

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;

test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs

@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net
 
-using FluentAssertions;
+using AwesomeAssertions;
 using NFluent;
 using WireMock.Matchers;
 

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;

test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs

@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net
 
-using FluentAssertions;
+using AwesomeAssertions;
 using NFluent;
 using WireMock.Matchers;
 

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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("<hello>world</hello>");

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs

@@ -1,8 +1,8 @@
 // Copyright © WireMock.Net
 
 using AnyOfTypes;
-using FluentAssertions;
+using AwesomeAssertions;
-using FluentAssertions.Execution;
+using AwesomeAssertions.Execution;
 using Moq;
 using Newtonsoft.Json;
 using NFluent;

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;

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;

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;

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;

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;

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;

test/WireMock.Net.Tests/Testcontainers/TestcontainersTestsGrpc.cs

@@ -2,8 +2,8 @@
 
 #if NET6_0_OR_GREATER
 using System.Text;
-using FluentAssertions;
+using AwesomeAssertions;
-using FluentAssertions.Execution;
+using AwesomeAssertions.Execution;
 using Greet;
 using Grpc.Net.Client;
 using Meziantou.Extensions.Logging.Xunit.v3;

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;

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;

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;

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;

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;
 

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;

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;

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;

test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs

@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net
 
-using FluentAssertions;
+using AwesomeAssertions;
 using System.Net;
 using WireMock.Util;
 

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;

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;

test/WireMock.Net.Tests/Util/QueryStringParserTests.cs

@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net
 
-using FluentAssertions;
+using AwesomeAssertions;
 using WireMock.Types;
 using WireMock.Util;
 

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;

test/WireMock.Net.Tests/Util/StringUtilsTests.cs

@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net
 
-using FluentAssertions;
+using AwesomeAssertions;
 using WireMock.Matchers;
 using WireMock.Util;
 

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;

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;

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;

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;

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -48,7 +48,7 @@
     </ItemGroup>-->
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj" />
+        <ProjectReference Include="..\..\src\WireMock.Net.AwesomeAssertions\WireMock.Net.AwesomeAssertions.csproj" />
         <ProjectReference Include="..\..\src\WireMock.Net.Matchers.CSharpCode\WireMock.Net.Matchers.CSharpCode.csproj" />
         <ProjectReference Include="..\..\src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
         <ProjectReference Include="..\..\src\WireMock.Net.xUnit.v3\WireMock.Net.xUnit.v3.csproj" />

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;

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;

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;

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