Version 2.x (#1359)

* Version 2.x

* Setup .NET 9

* 12

* cleanup some #if for NETSTANDARD1_3

* cleanup + fix tests for net8

* openapi

* NO ConfigureAwait(false) + cleanup

* .

* #endif

* HashSet

* WireMock.Net.NUnit

* HttpContext

* Add WebSockets (#1423)

* Add WebSockets

* Add tests

* fix

* more tests

* Add tests

* ...

* remove IOwin

* -

* tests

* fluent

* ok

* match

* .

* byte[]

* x

* func

* func

* byte

* trans

* ...

* frameworks.........

* jmes

* xxx

* sc

* using var httpClient = new HttpClient();

* usings

* maxRetries

* up

* xunit v3

* ct

* ---

* ct

* ct2

* T Unit

* WireMock.Net.TUnitTests / 10

* t unit first

* --project

* no tunit

* t2

* --project

* --project

* ci -  --project

* publish ./test/wiremock-coverage.xml

* windows

* .

* log

* ...

* log

* goed

* BodyType

* .

* .

* --scenario

* ...

* pact

* ct

* .

* WireMock.Net.RestClient.AwesomeAssertions (#1427)

* WireMock.Net.RestClient.AwesomeAssertions

* ok

* atpath

* fix test

* sonar fixes

* ports

* proxy test

* FIX?

* ---

* await Task.Delay(100, _ct);

* ?

* --project

* Aspire: use IDistributedApplicationEventingSubscriber (#1428)

* broadcast

* ok

* more tsts

* .

* Collection

* up

* .

* 2

* remove nfluent

* <VersionPrefix>2.0.0-preview-02</VersionPrefix>

* ...

* .

* nuget icon

* .

* <PackageReference Include="JmesPath.Net" Version="1.1.0" />

* x

* 500

* .

* fix some warnings

* ws

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs

@@ -1,14 +1,12 @@
 // Copyright © WireMock.Net
 
-using NFluent;
-using System.Collections.Generic;
+
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Owin;
 using WireMock.RequestBuilders;
 using WireMock.Types;
 using WireMock.Util;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -27,7 +25,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
 
     [Fact]
@@ -46,7 +44,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
 
     [Fact]
@@ -65,7 +63,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
 
     [Fact]
@@ -84,7 +82,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -103,7 +101,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -122,7 +120,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(0.0);
     }
 
     [Fact]
@@ -141,7 +139,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -160,7 +158,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(0.0);
     }
 
     [Fact]
@@ -179,7 +177,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -198,7 +196,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
 
     [Fact]
@@ -212,7 +210,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -230,7 +228,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -244,7 +242,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -258,6 +256,7 @@ public class RequestBuilderTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
-}
+}
+

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs

@@ -1,10 +1,8 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-using NFluent;
+
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -18,8 +16,8 @@ public class RequestBuilderUsingMethodTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("CONNECT");
+        matchers.Count.Should().Be(1);
+        (matchers[0] as RequestMessageMethodMatcher).Methods.Should().ContainSingle("CONNECT");
     }
 
     [Fact]
@@ -30,8 +28,8 @@ public class RequestBuilderUsingMethodTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("OPTIONS");
+        matchers.Count.Should().Be(1);
+        (matchers[0] as RequestMessageMethodMatcher).Methods.Should().ContainSingle("OPTIONS");
     }
 
     [Fact]
@@ -42,8 +40,8 @@ public class RequestBuilderUsingMethodTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("PATCH");
+        matchers.Count.Should().Be(1);
+        (matchers[0] as RequestMessageMethodMatcher).Methods.Should().ContainSingle("PATCH");
     }
 
     [Fact]
@@ -54,8 +52,8 @@ public class RequestBuilderUsingMethodTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("TRACE");
+        matchers.Count.Should().Be(1);
+        (matchers[0] as RequestMessageMethodMatcher).Methods.Should().ContainSingle("TRACE");
     }
 
     [Fact]
@@ -66,14 +64,14 @@ public class RequestBuilderUsingMethodTests
 
         // Assert 1
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageMethodMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageMethodMatcher>();
 
         // Act
         requestBuilder.UsingAnyMethod();
 
         // Assert 2
         matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(0);
+        matchers.Count.Should().Be(0);
     }
 }

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs

@@ -1,20 +1,15 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using FluentAssertions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using NFluent;
+
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.Types;
 using WireMock.Util;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -69,7 +64,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -90,7 +85,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Theory]
@@ -113,7 +108,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(expected);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(expected);
     }
 
     [Fact]
@@ -134,7 +129,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(0.0);
     }
 
     private class FuncType
@@ -161,7 +156,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -180,7 +175,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -199,7 +194,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -218,7 +213,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -281,7 +276,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -305,7 +300,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
 
     [Fact]
@@ -324,7 +319,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -343,7 +338,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
 
     [Fact]
@@ -366,7 +361,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -389,7 +384,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -413,7 +408,7 @@ public class RequestBuilderWithBodyTests
         // Assert
         var requestMatchResult = new RequestMatchResult();
         double result = spec.GetMatchingScore(request, requestMatchResult);
-        Check.That(result).IsEqualTo(1.0);
+        result.Should().Be(1.0);
     }
 
     [Fact]
@@ -434,7 +429,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -458,7 +453,7 @@ public class RequestBuilderWithBodyTests
 
         // Assert
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Theory]
@@ -484,4 +479,5 @@ public class RequestBuilderWithBodyTests
         var requestMatchResult = new RequestMatchResult();
         requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
-}
+}
+

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs

@@ -1,11 +1,9 @@
 // Copyright © WireMock.Net
 
-using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.RequestBuilders;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -22,7 +20,7 @@ public class RequestBuilderWithClientIPTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -36,7 +34,7 @@ public class RequestBuilderWithClientIPTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(0.0);
     }
 
     [Fact]
@@ -50,7 +48,7 @@ public class RequestBuilderWithClientIPTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -64,6 +62,6 @@ public class RequestBuilderWithClientIPTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 }

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs

@@ -1,11 +1,8 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -19,8 +16,8 @@ public class RequestBuilderWithCookieTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageCookieMatcher>();
     }
 
     [Fact]
@@ -31,8 +28,8 @@ public class RequestBuilderWithCookieTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageCookieMatcher>();
     }
 
     [Fact]
@@ -43,7 +40,7 @@ public class RequestBuilderWithCookieTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageCookieMatcher>();
     }
 }

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs

@@ -1,13 +1,9 @@
 // Copyright © WireMock.Net
 
-#if GRAPHQL
-using System.Collections.Generic;
-using FluentAssertions;
 using GraphQL.Types;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -69,5 +65,4 @@ public class RequestBuilderWithGraphQLSchemaTests
         matchers.Should().HaveCount(1);
         ((RequestMessageGraphQLMatcher)matchers[0]).Matchers.Should().ContainItemsAssignableTo<GraphQLMatcher>();
     }
-}
-#endif
+}

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs

@@ -1,11 +1,9 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-using NFluent;
+
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -19,8 +17,8 @@ public class RequestBuilderWithHeaderTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageHeaderMatcher>();
     }
 
     [Fact]
@@ -31,8 +29,8 @@ public class RequestBuilderWithHeaderTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageHeaderMatcher>();
     }
 
     [Fact]
@@ -43,8 +41,8 @@ public class RequestBuilderWithHeaderTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageHeaderMatcher>();
     }
 
     [Fact]
@@ -55,8 +53,8 @@ public class RequestBuilderWithHeaderTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageHeaderMatcher>();
     }
 
     [Fact]
@@ -67,8 +65,8 @@ public class RequestBuilderWithHeaderTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageHeaderMatcher>();
     }
 
     [Fact]
@@ -79,7 +77,7 @@ public class RequestBuilderWithHeaderTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageHeaderMatcher>();
     }
 }

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/RequestBuilderWithParamTests.cs

@@ -1,11 +1,8 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -19,8 +16,8 @@ public class RequestBuilderWithParamTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageParamMatcher>();
     }
 
     [Fact]
@@ -31,8 +28,8 @@ public class RequestBuilderWithParamTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageParamMatcher>();
     }
 
     [Fact]
@@ -43,8 +40,8 @@ public class RequestBuilderWithParamTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageParamMatcher>();
     }
 
     [Fact]
@@ -55,7 +52,7 @@ public class RequestBuilderWithParamTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageParamMatcher>();
     }
 }

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs

@@ -1,9 +1,7 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-using NFluent;
+
 using WireMock.Matchers;
-using Xunit;
 using WireMock.RequestBuilders;
 using WireMock.Matchers.Request;
 using WireMock.Models;
@@ -27,7 +25,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -45,7 +43,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -59,7 +57,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -71,8 +69,8 @@ public class RequestBuilderWithPathTests
         var request2 = new RequestMessage(new UrlDetails("http://localhost/x2"), "blabla", ClientIp);
 
         var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request1, requestMatchResult)).IsEqualTo(1.0);
-        Check.That(requestBuilder.GetMatchingScore(request2, requestMatchResult)).IsEqualTo(1.0);
+        requestBuilder.GetMatchingScore(request1, requestMatchResult).Should().Be(1.0);
+        requestBuilder.GetMatchingScore(request2, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -86,7 +84,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -100,7 +98,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -114,7 +112,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
 
     [Fact]
@@ -133,7 +131,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -151,7 +149,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -165,7 +163,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -179,7 +177,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -193,7 +191,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -207,7 +205,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -221,7 +219,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
     }
 
     [Fact]
@@ -235,6 +233,7 @@ public class RequestBuilderWithPathTests
 
         // then
         var requestMatchResult = new RequestMatchResult();
-        Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0);
     }
-}
+}
+

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs

@@ -1,12 +1,8 @@
 // Copyright © WireMock.Net
 
-#if PROTOBUF
-using System.Collections.Generic;
-using FluentAssertions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -63,5 +59,4 @@ message HelloReply {
         protoBufMatcher.MessageType.Should().Be(MessageType);
         protoBufMatcher.Matcher.Should().BeOfType<JsonMatcher>();
     }
-}
-#endif
+}

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs

@@ -1,11 +1,8 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
-using Xunit;
 
 namespace WireMock.Net.Tests.RequestBuilders;
 
@@ -19,8 +16,8 @@ public class RequestBuilderWithUrlTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageUrlMatcher>();
     }
 
     [Fact]
@@ -31,8 +28,8 @@ public class RequestBuilderWithUrlTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageUrlMatcher>();
     }
 
     [Fact]
@@ -43,8 +40,8 @@ public class RequestBuilderWithUrlTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageUrlMatcher>();
     }
 
     [Fact]
@@ -55,7 +52,7 @@ public class RequestBuilderWithUrlTests
 
         // Assert
         var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+        matchers.Count.Should().Be(1);
+        matchers[0].Should().BeOfType<RequestMessageUrlMatcher>();
     }
 }