Add NUnit test project

.gitignore

@@ -255,5 +255,3 @@ paket-files/
 /test/WireMock.Net.Tests/coverage.opencover.xml
 /test/WireMock.Net.Tests/coverage.netcoreapp3.1.opencover.xml
 /test/WireMock.Net.Tests/coverage.net5.0.opencover.xml
-
-*.received.*

CHANGELOG.md

@@ -1,14 +1,3 @@
-# 1.5.14 (24 January 2023)
-- [#842](https://github.com/WireMock-Net/WireMock.Net/pull/842) - Generate C# code from Mapping [feature] contributed by [StefH](https://github.com/StefH)
-- [#869](https://github.com/WireMock-Net/WireMock.Net/pull/869) - Add MappingBuilder to build mappings in code and export to Models or JSON [feature] contributed by [StefH](https://github.com/StefH)
-- [#871](https://github.com/WireMock-Net/WireMock.Net/pull/871) - Add UseWebhooksFireAndForget to Server ConvertMapping [bug] contributed by [ggradnig](https://github.com/ggradnig)
-- [#872](https://github.com/WireMock-Net/WireMock.Net/pull/872) - Fix unsubscribe from LogEntriesChanged event handler [bug] contributed by [StefH](https://github.com/StefH)
-- [#875](https://github.com/WireMock-Net/WireMock.Net/pull/875) - Fix Self referencing loop detected for property [bug] contributed by [eseneckiy](https://github.com/eseneckiy)
-- [#877](https://github.com/WireMock-Net/WireMock.Net/pull/877) - Add unit test example for Transformer Handlebars String.Append String.Join [test] contributed by [StefH](https://github.com/StefH)
-- [#701](https://github.com/WireMock-Net/WireMock.Net/issues/701) - Allow to create MappingModel from c# to be able to configure local and remote mocks similarly [feature]
-- [#867](https://github.com/WireMock-Net/WireMock.Net/issues/867) - Can I build mappings with code and save them to JSON-file without starting server [feature]
-- [#870](https://github.com/WireMock-Net/WireMock.Net/issues/870) - Can not unsubscribe from LogEntriesChanged event. [bug]
-
 # 1.5.13 (11 December 2022)
 - [#858](https://github.com/WireMock-Net/WireMock.Net/pull/858) - Update Transformer functionality to return value instead of string [feature] contributed by [StefH](https://github.com/StefH)
 - [#859](https://github.com/WireMock-Net/WireMock.Net/pull/859) - Add UpdatedAt property to Mapping [feature] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.14</VersionPrefix>
+        <VersionPrefix>1.5.13</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.5.14
+SET version=1.5.13
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,12 +1,9 @@
-# 1.5.14 (24 January 2023)
-- #842 Generate C# code from Mapping [feature]
-- #869 Add MappingBuilder to build mappings in code and export to Models or JSON [feature]
-- #871 Add UseWebhooksFireAndForget to Server ConvertMapping [bug]
-- #872 Fix unsubscribe from LogEntriesChanged event handler [bug]
-- #875 Fix Self referencing loop detected for property [bug]
-- #877 Add unit test example for Transformer Handlebars String.Append String.Join [test]
-- #701 Allow to create MappingModel from c# to be able to configure local and remote mocks similarly [feature]
-- #867 Can I build mappings with code and save them to JSON-file without starting server [feature]
-- #870 Can not unsubscribe from LogEntriesChanged event. [bug]
+# 1.5.13 (11 December 2022)
+- #858 Update Transformer functionality to return value instead of string [feature]
+- #859 Add UpdatedAt property to Mapping [feature]
+- #861 Add extra functionality for issue 55
+- #862 Add client certificate support [feature]
+- #863 Update WireMockServer.CreateClient/CreateClients to include handlers [feature]
+- #856 Inconsistent result with overlapping (duplicate) request [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

WireMock.Net Solution.sln

@@ -110,6 +110,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueExample",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{ADB557D8-D66B-4387-912B-3F73E290B478}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.NUnitTests", "test\WireMock.Net.NUnitTests\WireMock.Net.NUnitTests.csproj", "{2F919763-60C0-434B-A263-077AA19B3BE6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -264,6 +266,10 @@ Global
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F919763-60C0-434B-A263-077AA19B3BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F919763-60C0-434B-A263-077AA19B3BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F919763-60C0-434B-A263-077AA19B3BE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F919763-60C0-434B-A263-077AA19B3BE6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -308,6 +314,7 @@ Global
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{ADB557D8-D66B-4387-912B-3F73E290B478} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{2F919763-60C0-434B-A263-077AA19B3BE6} = {0BB8B634-407A-4610-A91F-11586990767A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -21,10 +21,10 @@
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
     <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -33,10 +33,10 @@
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
     <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -30,10 +30,10 @@
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
     <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

examples/WireMock.Net.Console.Net452.Classic/MainApp.cs

@@ -37,20 +37,6 @@ namespace WireMock.Net.ConsoleApplication
     {
         public static void Run()
         {
-            var mappingBuilder = new MappingBuilder();
-            mappingBuilder
-                .Given(Request
-                    .Create()
-                    .WithPath(new WildcardMatcher("/param2", true))
-                    .WithParam("key", "test")
-                    .UsingGet())
-                .RespondWith(Response.Create()
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBodyAsJson(new { result = "param2" }));
-
-            var json = mappingBuilder.ToJson();
-            System.Console.WriteLine("mappingBuilder : Json = {0}", json);
-
             var s = WireMockServer.Start();
             s.Stop();
 
@@ -387,7 +373,7 @@ namespace WireMock.Net.ConsoleApplication
                     .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
                     .WithHeader("xyz_{{request.headers.Postman-Token}}", "token is {{request.headers.Postman-Token}}")
                     .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, add={{Math.Add request.query.start.[0] 42}} bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
-                    .WithTransformer(TransformerType.Handlebars, true, ReplaceNodeOptions.EvaluateAndTryToConvert)
+                    .WithTransformer(TransformerType.Handlebars, true, ReplaceNodeOptions.None)
                     .WithDelay(TimeSpan.FromMilliseconds(100))
                 );
 

examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj

@@ -42,11 +42,11 @@
     <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net452\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>

examples/WireMock.Net.Console.Net452.Classic/packages.config

@@ -2,8 +2,8 @@
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net452" />
   <package id="Handlebars.Net" version="2.1.2" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net452" />
   <package id="log4net" version="2.0.15" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />

examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj

@@ -41,11 +41,11 @@
     <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>

examples/WireMock.Net.Console.Net461.Classic/packages.config

@@ -2,8 +2,8 @@
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net461" />
   <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net461" />
   <package id="log4net" version="2.0.15" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />

examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj

@@ -49,29 +49,29 @@
     <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.12\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.10\lib\net452\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Json.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Random.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.12\lib\net46\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.10\lib\net452\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
     </Reference>
     <Reference Include="Humanizer, Version=2.14.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Humanizer.Core.2.14.1\lib\netstandard2.0\Humanizer.dll</HintPath>

examples/WireMock.Net.Console.Net472.Classic/packages.config

@@ -3,14 +3,14 @@
   <package id="AnyOf" version="0.3.0" targetFramework="net472" />
   <package id="Fare" version="2.2.1" targetFramework="net472" />
   <package id="Handlebars.Net" version="2.1.2" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Json" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Random" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.XPath" version="2.3.12" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Json" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Random" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.XPath" version="2.3.10" targetFramework="net472" />
   <package id="Humanizer" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core.af" version="2.14.1" targetFramework="net472" />

examples/WireMock.Net.Console.Proxy.Net452/Program.cs

@@ -1,6 +1,6 @@
-using System;
-using System.Collections.Specialized;
+using System;
 using System.Net.Http;
+using Newtonsoft.Json;
 using WireMock.Server;
 using WireMock.Settings;
 
@@ -26,8 +26,10 @@ namespace WireMock.Net.Console.Proxy.Net452
                 }
             });
 
-            System.Console.WriteLine("Subscribing to LogEntriesChanged");
-            server.LogEntriesChanged += Server_LogEntriesChanged;
+            server.LogEntriesChanged += (sender, eventRecordArgs) =>
+            {
+                System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
+            };
 
             var uri = new Uri(urls[0]);
             var form = new MultipartFormDataContent
@@ -36,23 +38,9 @@ namespace WireMock.Net.Console.Proxy.Net452
             };
             new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
 
-            System.Console.WriteLine("Unsubscribing to LogEntriesChanged");
-            server.LogEntriesChanged -= Server_LogEntriesChanged;
-
-            form = new MultipartFormDataContent
-            {
-                { new StringContent("data2"), "test2", "test2.txt" }
-            };
-            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
-
             System.Console.WriteLine("Press any key to stop the server");
             System.Console.ReadKey();
             server.Stop();
         }
-
-        private static void Server_LogEntriesChanged(object sender, NotifyCollectionChangedEventArgs eventRecordArgs)
-        {
-            System.Console.WriteLine("Server_LogEntriesChanged : {0}", eventRecordArgs.NewItems.Count);
-        }
     }
 }

src/WireMock.Net.Abstractions/Types/MappingConverterType.cs

@@ -1,11 +0,0 @@
-namespace WireMock.Types;
-
-/// <summary>
-/// 
-/// </summary>
-public enum MappingConverterType
-{
-    Server,
-
-    Builder
-}

src/WireMock.Net.Abstractions/Types/WireMockList.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 
 namespace WireMock.Types;
 
@@ -64,8 +63,7 @@ public class WireMockList<T> : List<T>
                 return this[0]?.ToString();
 
             default:
-                var strings = this.Select(x => x as string ?? x?.ToString());
-                return string.Join(", ", strings);
+                return base.ToString();
         }
     }
 }

src/WireMock.Net/Extensions/EnumExtensions.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Reflection;
-
-namespace WireMock.Extensions;
-
-internal static class EnumExtensions
-{
-    public static string GetFullyQualifiedEnumValue<T>(this T enumValue)
-        where T : struct, IConvertible
-    {
-        var type = typeof(T);
-
-        if (!type.GetTypeInfo().IsEnum)
-        {
-            throw new ArgumentException("T must be an enum");
-        }
-
-        return $"{type.Namespace}.{type.Name}.{enumValue}";
-    }
-}

src/WireMock.Net/IMappingBuilder.cs

@@ -1,43 +0,0 @@
-using WireMock.Admin.Mappings;
-using WireMock.Matchers.Request;
-using WireMock.Server;
-
-namespace WireMock;
-
-/// <summary>
-/// IMappingBuilder
-/// </summary>
-public interface IMappingBuilder
-{
-    /// <summary>
-    /// The given.
-    /// </summary>
-    /// <param name="requestMatcher">The request matcher.</param>
-    /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
-    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-    IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false);
-
-    /// <summary>
-    /// Gets all the mappings as a list.
-    /// </summary>
-    /// <returns>A list from <see cref="MappingModel"/>s.</returns>
-    MappingModel[] GetMappings();
-
-    /// <summary>
-    /// Convert all mappings to JSON.
-    /// </summary>
-    /// <returns>JSON</returns>
-    string ToJson();
-
-    /// <summary>
-    /// Save all mappings as a single JSON to a file.
-    /// </summary>
-    /// <param name="path">The file to write to.</param>
-    void SaveMappingsToFile(string path);
-
-    /// <summary>
-    /// Save all mappings as multiple JSON files (each file is 1 mapping).
-    /// </summary>
-    /// <param name="folder">The folder to write the files to.</param>
-    void SaveMappingsToFolder(string folder);
-}

src/WireMock.Net/MappingBuilder.cs

@@ -1,124 +0,0 @@
-using System.Linq;
-using Newtonsoft.Json;
-using Stef.Validation;
-using WireMock.Admin.Mappings;
-using WireMock.Matchers.Request;
-using WireMock.Owin;
-using WireMock.Serialization;
-using WireMock.Server;
-using WireMock.Settings;
-using WireMock.Util;
-
-namespace WireMock;
-
-/// <summary>
-/// MappingBuilder
-/// </summary>
-public class MappingBuilder : IMappingBuilder
-{
-    private readonly WireMockServerSettings _settings;
-    private readonly IWireMockMiddlewareOptions _options;
-    private readonly MappingConverter _mappingConverter;
-    private readonly MappingToFileSaver _mappingToFileSaver;
-    private readonly IGuidUtils _guidUtils;
-    private readonly IDateTimeUtils _dateTimeUtils;
-
-    /// <summary>
-    /// Create a MappingBuilder
-    /// </summary>
-    /// <param name="settings">The optional <see cref="WireMockServerSettings"/>.</param>
-    public MappingBuilder(WireMockServerSettings? settings = null)
-    {
-        _settings = settings ?? new WireMockServerSettings();
-        _options = WireMockMiddlewareOptionsHelper.InitFromSettings(_settings);
-
-        var matcherMapper = new MatcherMapper(_settings);
-        _mappingConverter = new MappingConverter(matcherMapper);
-        _mappingToFileSaver = new MappingToFileSaver(_settings, _mappingConverter);
-
-        _guidUtils = new GuidUtils();
-        _dateTimeUtils = new DateTimeUtils();
-    }
-
-    internal MappingBuilder(
-        WireMockServerSettings settings,
-        IWireMockMiddlewareOptions options,
-        MappingConverter mappingConverter,
-        MappingToFileSaver mappingToFileSaver,
-        IGuidUtils guidUtils,
-        IDateTimeUtils dateTimeUtils
-    )
-    {
-        _settings = Guard.NotNull(settings);
-        _options = Guard.NotNull(options);
-        _mappingConverter = Guard.NotNull(mappingConverter);
-        _mappingToFileSaver = Guard.NotNull(mappingToFileSaver);
-        _guidUtils = Guard.NotNull(guidUtils);
-        _dateTimeUtils = Guard.NotNull(dateTimeUtils);
-    }
-
-    /// <inheritdoc />
-    public IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false)
-    {
-        return new RespondWithAProvider(RegisterMapping, Guard.NotNull(requestMatcher), _settings, _guidUtils, _dateTimeUtils, saveToFile);
-    }
-
-    /// <inheritdoc />
-    public MappingModel[] GetMappings()
-    {
-        return _options.Mappings.Values.ToArray()
-            .Where(m => !m.IsAdminInterface)
-            .Select(_mappingConverter.ToMappingModel)
-            .ToArray();
-    }
-
-    /// <inheritdoc />
-    public string ToJson()
-    {
-        return ToJson(GetMappings());
-    }
-
-    /// <inheritdoc />
-    public void SaveMappingsToFile(string path)
-    {
-        _mappingToFileSaver.SaveMappingsToFile(GetNonAdminMappings(), path);
-    }
-
-    /// <inheritdoc />
-    public void SaveMappingsToFolder(string? folder)
-    {
-        foreach (var mapping in GetNonAdminMappings().Where(m => !m.IsAdminInterface))
-        {
-            _mappingToFileSaver.SaveMappingToFile(mapping, folder);
-        }
-    }
-
-    private IMapping[] GetNonAdminMappings()
-    {
-        return _options.Mappings.Values.ToArray();
-    }
-
-    private void RegisterMapping(IMapping mapping, bool saveToFile)
-    {
-        // Check a mapping exists with the same Guid. If so, update the datetime and replace it.
-        if (_options.Mappings.ContainsKey(mapping.Guid))
-        {
-            mapping.UpdatedAt = _dateTimeUtils.UtcNow;
-            _options.Mappings[mapping.Guid] = mapping;
-        }
-        else
-        {
-            _options.Mappings.TryAdd(mapping.Guid, mapping);
-        }
-
-        if (saveToFile)
-        {
-            _mappingToFileSaver.SaveMappingToFile(mapping);
-        }
-    }
-
-    private static string ToJson(object value)
-    {
-        return JsonConvert.SerializeObject(value, JsonSerializationConstants.JsonSerializerSettingsDefault);
-    }
-}

src/WireMock.Net/Owin/WireMockMiddlewareOptionsHelper.cs

@@ -1,35 +0,0 @@
-using Stef.Validation;
-using WireMock.Settings;
-
-namespace WireMock.Owin;
-
-internal static class WireMockMiddlewareOptionsHelper
-{
-    public static IWireMockMiddlewareOptions InitFromSettings(WireMockServerSettings settings, IWireMockMiddlewareOptions? options = null)
-    {
-        Guard.NotNull(settings);
-
-        options ??= new WireMockMiddlewareOptions();
-
-        options.FileSystemHandler = settings.FileSystemHandler;
-        options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
-        options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
-        options.Logger = settings.Logger;
-        options.DisableJsonBodyParsing = settings.DisableJsonBodyParsing;
-        options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
-        options.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
-        options.DoNotSaveDynamicResponseInLogEntry = settings.DoNotSaveDynamicResponseInLogEntry;
-        options.QueryParameterMultipleValueSupport = settings.QueryParameterMultipleValueSupport;
-
-        if (settings.CustomCertificateDefined)
-        {
-            options.X509StoreName = settings.CertificateSettings!.X509StoreName;
-            options.X509StoreLocation = settings.CertificateSettings.X509StoreLocation;
-            options.X509ThumbprintOrSubjectName = settings.CertificateSettings.X509StoreThumbprintOrSubjectName;
-            options.X509CertificateFilePath = settings.CertificateSettings.X509CertificateFilePath;
-            options.X509CertificatePassword = settings.CertificateSettings.X509CertificatePassword;
-        }
-
-        return options;
-    }
-}

src/WireMock.Net/RequestBuilders/ICookiesRequestBuilder.cs

@@ -1,83 +1,85 @@
+using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 
-namespace WireMock.RequestBuilders;
-
-/// <summary>
-/// The CookieRequestBuilder interface.
-/// </summary>
-public interface ICookiesRequestBuilder : IParamsRequestBuilder
+namespace WireMock.RequestBuilders
 {
     /// <summary>
-    /// WithCookie: matching based on name, pattern and matchBehaviour.
+    /// The CookieRequestBuilder interface.
     /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="pattern">The pattern.</param>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithCookie(string name, string pattern, MatchBehaviour matchBehaviour);
+    public interface ICookiesRequestBuilder : IParamsRequestBuilder
+    {
+        /// <summary>
+        /// WithCookie: matching based on name, pattern and matchBehaviour.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithCookie([NotNull] string name, string pattern, MatchBehaviour matchBehaviour);
 
-    /// <summary>
-    /// WithCookie: matching based on name, pattern, ignoreCase and matchBehaviour.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="pattern">The pattern.</param>
-    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithCookie(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+        /// <summary>
+        /// WithCookie: matching based on name, pattern, ignoreCase and matchBehaviour.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithCookie([NotNull] string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-    /// <summary>
-    /// WithCookie: matching based on name, patterns and matchBehaviour.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="patterns">The patterns.</param>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithCookie(string name, string[] patterns, MatchBehaviour matchBehaviour);
+        /// <summary>
+        /// WithCookie: matching based on name, patterns and matchBehaviour.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithCookie([NotNull] string name, string[] patterns, MatchBehaviour matchBehaviour);
 
-    /// <summary>
-    /// WithCookie: matching based on name, patterns, ignoreCase and matchBehaviour.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="patterns">The patterns.</param>
-    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithCookie(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+        /// <summary>
+        /// WithCookie: matching based on name, patterns, ignoreCase and matchBehaviour.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithCookie([NotNull] string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-    /// <summary>
-    /// WithCookie: matching based on name and IStringMatcher[].
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="matchers">The matchers.</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithCookie(string name, params IStringMatcher[] matchers);
+        /// <summary>
+        /// WithCookie: matching based on name and IStringMatcher[].
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithCookie([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
 
-    /// <summary>
-    /// WithCookie: matching based on name, ignoreCase and IStringMatcher[].
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="ignoreCase">Ignore the case from the cookie-keys.</param>
-    /// <param name="matchers">The matchers.</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithCookie(string name, bool ignoreCase, params IStringMatcher[] matchers);
+        /// <summary>
+        /// WithCookie: matching based on name, ignoreCase and IStringMatcher[].
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="ignoreCase">Ignore the case from the cookie-keys.</param>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithCookie([NotNull] string name, bool ignoreCase, [NotNull] params IStringMatcher[] matchers);
 
-    /// <summary>
-    /// WithCookie: matching based on name, ignoreCase, matchBehaviour and IStringMatcher[].
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="ignoreCase">Ignore the case from the cookie-keys.</param>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="matchers">The matchers.</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithCookie(string name, bool ignoreCase, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers);
+        /// <summary>
+        /// WithCookie: matching based on name, ignoreCase, matchBehaviour and IStringMatcher[].
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="ignoreCase">Ignore the case from the cookie-keys.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithCookie([NotNull] string name, bool ignoreCase, MatchBehaviour matchBehaviour, [NotNull] params IStringMatcher[] matchers);
 
-    /// <summary>
-    /// WithCookie: matching based on functions.
-    /// </summary>
-    /// <param name="funcs">The cookies funcs.</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithCookie(params Func<IDictionary<string, string>, bool>[] funcs);
+        /// <summary>
+        /// WithCookie: matching based on functions.
+        /// </summary>
+        /// <param name="funcs">The cookies funcs.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithCookie([NotNull] params Func<IDictionary<string, string>, bool>[] funcs);
+    }
 }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
-using WireMock.Constants;
-using WireMock.Extensions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
@@ -19,8 +16,6 @@ namespace WireMock.Serialization;
 
 internal class MappingConverter
 {
-    private static readonly string AcceptOnMatch = MatchBehaviour.AcceptOnMatch.GetFullyQualifiedEnumValue();
-
     private readonly MatcherMapper _mapper;
 
     public MappingConverter(MatcherMapper mapper)
@@ -28,133 +23,6 @@ internal class MappingConverter
         _mapper = Guard.NotNull(mapper);
     }
 
-    public string ToCSharpCode(IMapping mapping, MappingConverterSettings? settings = null)
-    {
-        settings ??= new MappingConverterSettings();
-
-        var request = (Request)mapping.RequestMatcher;
-        var response = (Response)mapping.Provider;
-
-        var clientIPMatcher = request.GetRequestMessageMatcher<RequestMessageClientIPMatcher>();
-        var pathMatcher = request.GetRequestMessageMatcher<RequestMessagePathMatcher>();
-        var urlMatcher = request.GetRequestMessageMatcher<RequestMessageUrlMatcher>();
-        var headerMatchers = request.GetRequestMessageMatchers<RequestMessageHeaderMatcher>();
-        var cookieMatchers = request.GetRequestMessageMatchers<RequestMessageCookieMatcher>();
-        var paramsMatchers = request.GetRequestMessageMatchers<RequestMessageParamMatcher>();
-        var methodMatcher = request.GetRequestMessageMatcher<RequestMessageMethodMatcher>();
-        var bodyMatcher = request.GetRequestMessageMatcher<RequestMessageBodyMatcher>();
-
-        var sb = new StringBuilder();
-
-        if (settings.ConverterType == MappingConverterType.Server)
-        {
-            if (settings.AddStart)
-            {
-                sb.AppendLine("var server = WireMockServer.Start();");
-            }
-            sb.AppendLine("server");
-        }
-        else
-        {
-            if (settings.AddStart)
-            {
-                sb.AppendLine("var builder = new MappingBuilder();");
-            }
-            sb.AppendLine("builder");
-        }
-
-        // Request
-        sb.AppendLine("    .Given(Request.Create()");
-        sb.AppendLine($"        .UsingMethod({To1Or2Or3Arguments(methodMatcher?.MatchBehaviour, methodMatcher?.MatchOperator, methodMatcher?.Methods, HttpRequestMethod.GET)})");
-
-        if (pathMatcher is { Matchers: { } })
-        {
-            sb.AppendLine($"        .WithPath({To1Or2Arguments(pathMatcher.MatchOperator, pathMatcher.Matchers)})");
-        }
-        else if (urlMatcher is { Matchers: { } })
-        {
-            sb.AppendLine($"        .WithUrl({To1Or2Arguments(urlMatcher.MatchOperator, urlMatcher.Matchers)})");
-        }
-
-        foreach (var paramsMatcher in paramsMatchers)
-        {
-            sb.AppendLine($"        .WithParam({To1Or2Or3Arguments(paramsMatcher.Key, paramsMatcher.MatchBehaviour, paramsMatcher.Matchers!)})");
-        }
-
-        if (clientIPMatcher is { Matchers: { } })
-        {
-            sb.AppendLine($"        .WithClientIP({ToValueArguments(GetStringArray(clientIPMatcher.Matchers))})");
-        }
-
-        foreach (var headerMatcher in headerMatchers.Where(h => h.Matchers is { }))
-        {
-            var headerBuilder = new StringBuilder($"\"{headerMatcher.Name}\", {ToValueArguments(GetStringArray(headerMatcher.Matchers!))}, true");
-            if (headerMatcher.MatchOperator != MatchOperator.Or)
-            {
-                headerBuilder.Append($"{AcceptOnMatch}, {headerMatcher.MatchOperator.GetFullyQualifiedEnumValue()}");
-            }
-            sb.AppendLine($"        .WithHeader({headerBuilder})");
-        }
-
-        foreach (var cookieMatcher in cookieMatchers.Where(h => h.Matchers is { }))
-        {
-            sb.AppendLine($"        .WithCookie(\"{cookieMatcher.Name}\", {ToValueArguments(GetStringArray(cookieMatcher.Matchers!))}, true)");
-        }
-
-        if (bodyMatcher is { Matchers: { } })
-        {
-            var wildcardMatcher = bodyMatcher.Matchers.OfType<WildcardMatcher>().FirstOrDefault();
-            if (wildcardMatcher is { } && wildcardMatcher.GetPatterns().Any())
-            {
-                sb.AppendLine($"        .WithBody({GetString(wildcardMatcher)})");
-            }
-        }
-
-        sb.AppendLine(@"    )");
-
-        // Guid
-        sb.AppendLine($"    .WithGuid(\"{mapping.Guid}\")");
-
-        // Response
-        sb.AppendLine("    .RespondWith(Response.Create()");
-
-        if (response.ResponseMessage.Headers is { })
-        {
-            foreach (var header in response.ResponseMessage.Headers)
-            {
-                sb.AppendLine($"        .WithHeader(\"{header.Key})\", {ToValueArguments(header.Value.ToArray())})");
-            }
-        }
-
-        if (response.ResponseMessage.BodyData is { })
-        {
-            switch (response.ResponseMessage.BodyData.DetectedBodyType)
-            {
-                case BodyType.String:
-                    sb.AppendLine($"        .WithBody(\"{response.ResponseMessage.BodyData.BodyAsString}\")");
-                    break;
-            }
-        }
-
-        if (response.Delay is { })
-        {
-            sb.AppendLine($"        .WithDelay({response.Delay.Value.TotalMilliseconds})");
-        }
-        else if (response.MinimumDelayMilliseconds > 0 && response.MaximumDelayMilliseconds > 0)
-        {
-            sb.AppendLine($"        .WithRandomDelay({response.MinimumDelayMilliseconds}, {response.MaximumDelayMilliseconds})");
-        }
-
-        if (response.UseTransformer)
-        {
-            var transformerArgs = response.TransformerType != TransformerType.Handlebars ? response.TransformerType.GetFullyQualifiedEnumValue() : string.Empty;
-            sb.AppendLine($"        .WithTransformer({transformerArgs})");
-        }
-        sb.AppendLine(@"    );");
-
-        return sb.ToString();
-    }
-
     public MappingModel ToMappingModel(IMapping mapping)
     {
         var request = (Request)mapping.RequestMatcher;
@@ -369,64 +237,6 @@ internal class MappingConverter
         return mappingModel;
     }
 
-    private static string GetString(IStringMatcher stringMatcher)
-    {
-        return stringMatcher.GetPatterns().Select(p => $"\"{p.GetPattern()}\"").First();
-    }
-
-    private static string[] GetStringArray(IReadOnlyList<IStringMatcher> stringMatchers)
-    {
-        return stringMatchers.SelectMany(m => m.GetPatterns()).Select(p => p.GetPattern()).ToArray();
-    }
-
-    private static string To1Or2Or3Arguments(string key, MatchBehaviour? matchBehaviour, IReadOnlyList<IStringMatcher> matchers)
-    {
-        var sb = new StringBuilder($"\"{key}\", ");
-
-        if (matchBehaviour.HasValue && matchBehaviour != MatchBehaviour.AcceptOnMatch)
-        {
-            sb.AppendFormat("{0}, ", matchBehaviour.Value.GetFullyQualifiedEnumValue());
-        }
-
-        sb.AppendFormat("{0}", ToValueArguments(GetStringArray(matchers), string.Empty));
-
-        return sb.ToString();
-    }
-
-    private static string To1Or2Or3Arguments(MatchBehaviour? matchBehaviour, MatchOperator? matchOperator, string[]? values, string defaultValue)
-    {
-        var sb = new StringBuilder();
-
-        if (matchBehaviour.HasValue && matchBehaviour != MatchBehaviour.AcceptOnMatch)
-        {
-            sb.AppendFormat("{0}, ", matchBehaviour.Value.GetFullyQualifiedEnumValue());
-        }
-
-        return To1Or2Arguments(matchOperator, values, defaultValue);
-    }
-
-    private static string To1Or2Arguments(MatchOperator? matchOperator, IReadOnlyList<IStringMatcher> matchers)
-    {
-        return To1Or2Arguments(matchOperator, GetStringArray(matchers), string.Empty);
-    }
-
-    private static string To1Or2Arguments(MatchOperator? matchOperator, string[]? values, string defaultValue)
-    {
-        var sb = new StringBuilder();
-
-        if (matchOperator.HasValue && matchOperator != MatchOperator.Or)
-        {
-            sb.AppendFormat("{0}, ", matchOperator.Value.GetFullyQualifiedEnumValue());
-        }
-
-        return sb.Append(ToValueArguments(values, defaultValue)).ToString();
-    }
-
-    private static string ToValueArguments(string[]? values, string defaultValue = "")
-    {
-        return values is { } ? string.Join(", ", values.Select(v => $"\"{v}\"")) : $"\"{defaultValue}\"";
-    }
-
     private static WebProxyModel? MapWebProxy(WebProxySettings? settings)
     {
         return settings != null ? new WebProxyModel

src/WireMock.Net/Serialization/MappingConverterSettings.cs

@@ -1,25 +0,0 @@
-using WireMock.Types;
-
-namespace WireMock.Serialization;
-
-/// <summary>
-/// MappingConverterSettings
-/// </summary>
-public class MappingConverterSettings
-{
-    /// <summary>
-    /// Use 'Server' or 'Builder'.
-    ///
-    /// Default is Server
-    /// </summary>
-    public MappingConverterType ConverterType { get; set; }
-
-    /// <summary>
-    /// Add "var server = WireMockServer.Start();"
-    /// or
-    /// Add "var builder = new MappingBuilder();"
-    ///
-    /// Default it's false.
-    /// </summary>
-    public bool AddStart { get; set; }
-}

src/WireMock.Net/Serialization/MappingToFileSaver.cs

@@ -17,20 +17,6 @@ internal class MappingToFileSaver
         _mappingConverter = Guard.NotNull(mappingConverter);
     }
 
-    public void SaveMappingsToFile(IMapping[] mappings, string? folder = null)
-    {
-        folder ??= _settings.FileSystemHandler.GetMappingFolder();
-
-        if (!_settings.FileSystemHandler.FolderExists(folder))
-        {
-            _settings.FileSystemHandler.CreateFolder(folder);
-        }
-
-        var models = mappings.Select(_mappingConverter.ToMappingModel).ToArray();
-
-        Save(models, folder);
-    }
-
     public void SaveMappingToFile(IMapping mapping, string? folder = null)
     {
         folder ??= _settings.FileSystemHandler.GetMappingFolder();
@@ -45,14 +31,9 @@ internal class MappingToFileSaver
         var filename = BuildSanitizedFileName(mapping);
         var path = Path.Combine(folder, filename);
 
-        Save(model, path);
-    }
-
-    private void Save(object value, string path)
-    {
         _settings.Logger.Info("Saving Mapping file {0}", path);
 
-        _settings.FileSystemHandler.WriteMappingFile(path, JsonConvert.SerializeObject(value, JsonSerializationConstants.JsonSerializerSettingsDefault));
+        _settings.FileSystemHandler.WriteMappingFile(path, JsonConvert.SerializeObject(model, JsonSerializationConstants.JsonSerializerSettingsDefault));
     }
 
     private string BuildSanitizedFileName(IMapping mapping, char replaceChar = '_')

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using AnyOfTypes;
 using SimMetrics.Net;
-using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Extensions;
 using WireMock.Matchers;
@@ -20,7 +19,7 @@ internal class MatcherMapper
 
     public MatcherMapper(WireMockServerSettings settings)
     {
-        _settings = Guard.NotNull(settings);
+        _settings = settings ?? throw new ArgumentNullException(nameof(settings));
     }
 
     public IMatcher[]? Map(IEnumerable<MatcherModel>? matchers)

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -28,8 +28,9 @@ internal class RespondWithAProvider : IRespondWithAProvider
     private readonly RegistrationCallback _registrationCallback;
     private readonly IRequestMatcher _requestMatcher;
     private readonly WireMockServerSettings _settings;
-    private readonly IDateTimeUtils _dateTimeUtils;
     private readonly bool _saveToFile;
+    private readonly IGuidUtils _guidUtils = new GuidUtils();
+    private readonly IDateTimeUtils _dateTimeUtils = new DateTimeUtils();
 
     private bool _useWebhookFireAndForget;
 
@@ -45,25 +46,20 @@ internal class RespondWithAProvider : IRespondWithAProvider
     /// <param name="registrationCallback">The registration callback.</param>
     /// <param name="requestMatcher">The request matcher.</param>
     /// <param name="settings">The WireMockServerSettings.</param>
-    /// <param name="guidUtils">GuidUtils to make unit testing possible.</param>
-    /// <param name="dateTimeUtils">DateTimeUtils to make unit testing possible.</param>
     /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
     public RespondWithAProvider(
         RegistrationCallback registrationCallback,
         IRequestMatcher requestMatcher,
         WireMockServerSettings settings,
-        IGuidUtils guidUtils,
-        IDateTimeUtils dateTimeUtils,
         bool saveToFile = false
     )
     {
         _registrationCallback = Guard.NotNull(registrationCallback);
         _requestMatcher = Guard.NotNull(requestMatcher);
         _settings = Guard.NotNull(settings);
-        _dateTimeUtils = Guard.NotNull(dateTimeUtils);
-        _saveToFile = saveToFile;
+        _saveToFile = Guard.NotNull(saveToFile);
 
-        Guid = guidUtils.NewGuid();
+        Guid = _guidUtils.NewGuid();
     }
 
     /// <summary>

src/WireMock.Net/Server/WireMockServer.Admin.cs

@@ -111,7 +111,10 @@ public partial class WireMockServer
     [PublicAPI]
     public void SaveStaticMappings(string? folder = null)
     {
-        _mappingBuilder.SaveMappingsToFolder(folder);
+        foreach (var mapping in Mappings.Where(m => !m.IsAdminInterface))
+        {
+            _mappingToFileSaver.SaveMappingToFile(mapping, folder);
+        }
     }
 
     /// <inheritdoc cref="IWireMockServer.ReadStaticMappings" />
@@ -350,9 +353,9 @@ public partial class WireMockServer
         return ResponseMessageBuilder.Create("Mappings saved to disk");
     }
 
-    private MappingModel[] ToMappingModels()
+    private IEnumerable<MappingModel> ToMappingModels()
     {
-        return _mappingBuilder.GetMappings();
+        return Mappings.Where(m => !m.IsAdminInterface).Select(_mappingConverter.ToMappingModel);
     }
 
     private IResponseMessage MappingsGet(IRequestMessage requestMessage)
@@ -415,15 +418,18 @@ public partial class WireMockServer
         try
         {
             var mappingModels = DeserializeRequestMessageToArray<MappingModel>(requestMessage);
-            foreach (var guid in mappingModels.Where(mm => mm.Guid.HasValue).Select(mm => mm.Guid!.Value))
+            foreach (var mappingModel in mappingModels)
             {
-                if (DeleteMapping(guid))
+                if (mappingModel.Guid.HasValue)
                 {
-                    deletedGuids.Add(guid);
-                }
-                else
-                {
-                    _settings.Logger.Debug($"Did not find/delete mapping with GUID: {guid}.");
+                    if (DeleteMapping(mappingModel.Guid.Value))
+                    {
+                        deletedGuids.Add(mappingModel.Guid.Value);
+                    }
+                    else
+                    {
+                        _settings.Logger.Debug($"Did not find/delete mapping with GUID: {mappingModel.Guid.Value}.");
+                    }
                 }
             }
         }
@@ -691,7 +697,7 @@ public partial class WireMockServer
     {
         return requestMessage.BodyData?.DetectedBodyType switch
         {
-            BodyType.String => JsonUtils.DeserializeObject<T>(requestMessage.BodyData.BodyAsString!),
+            BodyType.String => JsonUtils.DeserializeObject<T>(requestMessage.BodyData.BodyAsString),
 
             BodyType.Json when requestMessage.BodyData?.BodyAsJson != null => ((JObject)requestMessage.BodyData.BodyAsJson).ToObject<T>()!,
 
@@ -720,7 +726,7 @@ public partial class WireMockServer
     {
         if (value is JArray jArray)
         {
-            return jArray.ToObject<T[]>()!;
+            return jArray.ToObject<T[]>();
         }
 
         var singleResult = ((JObject)value).ToObject<T>();

src/WireMock.Net/Server/WireMockServer.ConvertMapping.cs

@@ -102,8 +102,6 @@ public partial class WireMockServer
             respondProvider = respondProvider.WithWebhook(webhooks);
         }
 
-        respondProvider.WithWebhookFireAndForget(mappingModel.UseWebhooksFireAndForget ?? false);
-
         var responseBuilder = InitResponseBuilder(mappingModel.Response);
         respondProvider.RespondWith(responseBuilder);
 

src/WireMock.Net/Server/WireMockServer.LogEntries.cs

@@ -14,12 +14,26 @@ namespace WireMock.Server;
 
 public partial class WireMockServer
 {
-    /// <inheritdoc />
+    /// <inheritdoc cref="IWireMockServer.LogEntriesChanged" />
     [PublicAPI]
     public event NotifyCollectionChangedEventHandler LogEntriesChanged
     {
-        add => _logEntriesChanged += value;
-        remove => _logEntriesChanged -= value;
+        add
+        {
+            _options.LogEntries.CollectionChanged += (sender, eventRecordArgs) =>
+            {
+                try
+                {
+                    value(sender, eventRecordArgs);
+                }
+                catch (Exception exception)
+                {
+                    _options.Logger.Error("Error calling the LogEntriesChanged event handler: {0}", exception.Message);
+                }
+            };
+        }
+
+        remove => _options.LogEntries.CollectionChanged -= value;
     }
 
     /// <inheritdoc cref="IWireMockServer.LogEntries" />
@@ -76,24 +90,4 @@ public partial class WireMockServer
 
         return false;
     }
-
-    private NotifyCollectionChangedEventHandler? _logEntriesChanged;
-
-    private void LogEntries_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-    {
-        if (_logEntriesChanged is { })
-        {
-            foreach (var handler in _logEntriesChanged.GetInvocationList())
-            {
-                try
-                {
-                    handler.DynamicInvoke(this, e);
-                }
-                catch (Exception exception)
-                {
-                    _options.Logger.Error("Error calling the LogEntriesChanged event handler: {0}", exception.Message);
-                }
-            }
-        }
-    }
 }

src/WireMock.Net/Server/WireMockServer.cs

@@ -22,7 +22,6 @@ using WireMock.ResponseProviders;
 using WireMock.Serialization;
 using WireMock.Settings;
 using WireMock.Types;
-using WireMock.Util;
 
 namespace WireMock.Server;
 
@@ -39,9 +38,6 @@ public partial class WireMockServer : IWireMockServer
     private readonly MappingConverter _mappingConverter;
     private readonly MatcherMapper _matcherMapper;
     private readonly MappingToFileSaver _mappingToFileSaver;
-    private readonly MappingBuilder _mappingBuilder;
-    private readonly IGuidUtils _guidUtils = new GuidUtils();
-    private readonly IDateTimeUtils _dateTimeUtils = new DateTimeUtils();
 
     /// <inheritdoc cref="IWireMockServer.IsStarted" />
     [PublicAPI]
@@ -93,8 +89,6 @@ public partial class WireMockServer : IWireMockServer
     /// </summary>
     public void Dispose()
     {
-        _options.LogEntries.CollectionChanged -= LogEntries_CollectionChanged;
-
         Dispose(true);
         GC.SuppressFinalize(this);
     }
@@ -252,7 +246,7 @@ public partial class WireMockServer : IWireMockServer
     [PublicAPI]
     public static WireMockServer StartWithAdminInterfaceAndReadStaticMappings(params string[] urls)
     {
-        Guard.NotNullOrEmpty(urls);
+        Guard.NotNullOrEmpty(urls, nameof(urls));
 
         return new WireMockServer(new WireMockServerSettings
         {
@@ -274,7 +268,7 @@ public partial class WireMockServer : IWireMockServer
     /// <exception cref="TimeoutException">Service start timed out after {TimeSpan.FromMilliseconds(settings.StartTimeout)}</exception>
     protected WireMockServer(WireMockServerSettings settings)
     {
-        _settings = Guard.NotNull(settings);
+        _settings = settings;
 
         // Set default values if not provided
         _settings.Logger = settings.Logger ?? new WireMockNullLogger();
@@ -311,21 +305,28 @@ public partial class WireMockServer : IWireMockServer
             }
         }
 
-        WireMockMiddlewareOptionsHelper.InitFromSettings(settings, _options);
+        _options.FileSystemHandler = _settings.FileSystemHandler;
+        _options.PreWireMockMiddlewareInit = _settings.PreWireMockMiddlewareInit;
+        _options.PostWireMockMiddlewareInit = _settings.PostWireMockMiddlewareInit;
+        _options.Logger = _settings.Logger;
+        _options.DisableJsonBodyParsing = _settings.DisableJsonBodyParsing;
+        _options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
+        _options.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
+        _options.DoNotSaveDynamicResponseInLogEntry = settings.DoNotSaveDynamicResponseInLogEntry;
+        _options.QueryParameterMultipleValueSupport = settings.QueryParameterMultipleValueSupport;
 
-        _options.LogEntries.CollectionChanged += LogEntries_CollectionChanged;
+        if (settings.CustomCertificateDefined)
+        {
+            _options.X509StoreName = settings.CertificateSettings!.X509StoreName;
+            _options.X509StoreLocation = settings.CertificateSettings.X509StoreLocation;
+            _options.X509ThumbprintOrSubjectName = settings.CertificateSettings.X509StoreThumbprintOrSubjectName;
+            _options.X509CertificateFilePath = settings.CertificateSettings.X509CertificateFilePath;
+            _options.X509CertificatePassword = settings.CertificateSettings.X509CertificatePassword;
+        }
 
         _matcherMapper = new MatcherMapper(_settings);
         _mappingConverter = new MappingConverter(_matcherMapper);
         _mappingToFileSaver = new MappingToFileSaver(_settings, _mappingConverter);
-        _mappingBuilder = new MappingBuilder(
-            settings,
-            _options,
-            _mappingConverter,
-            _mappingToFileSaver,
-            _guidUtils,
-            _dateTimeUtils
-        );
 
 #if USE_ASPNETCORE
         _options.AdditionalServiceRegistration = _settings.AdditionalServiceRegistration;
@@ -537,7 +538,26 @@ public partial class WireMockServer : IWireMockServer
     [PublicAPI]
     public IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false)
     {
-        return _mappingBuilder.Given(requestMatcher, saveToFile);
+        return new RespondWithAProvider(RegisterMapping, requestMatcher, _settings, saveToFile);
+    }
+
+    private void RegisterMapping(IMapping mapping, bool saveToFile)
+    {
+        // Check a mapping exists with the same Guid. If so, update the datetime and replace it.
+        if (_options.Mappings.ContainsKey(mapping.Guid))
+        {
+            mapping.UpdatedAt = DateTime.UtcNow;
+            _options.Mappings[mapping.Guid] = mapping;
+        }
+        else
+        {
+            _options.Mappings.TryAdd(mapping.Guid, mapping);
+        }
+
+        if (saveToFile)
+        {
+            _mappingToFileSaver.SaveMappingToFile(mapping);
+        }
     }
 
     private void InitSettings(WireMockServerSettings settings)

src/WireMock.Net/Settings/WireMockServerSettings.cs

@@ -297,6 +297,5 @@ public class WireMockServerSettings
     /// Currently used for:
     /// - Handlebars Transformer
     /// </summary>
-	[JsonIgnore]
     public CultureInfo Culture { get; set; } = CultureInfo.CurrentCulture;
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -177,13 +177,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Handlebars.Net.Helpers" Version="2.3.12" />
-        <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.3.12" />
-        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.3.12" />
-        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.12" />
-        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.12" />
-        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.3.12" />
-        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.12" />
+        <PackageReference Include="Handlebars.Net.Helpers" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.11" />
     </ItemGroup>
 
     <ItemGroup>

src/WireMock.Org.Abstractions/WireMock.Org.Abstractions.csproj

@@ -23,7 +23,6 @@
         <!--<DelaySign>true</DelaySign>-->
         <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <Nullable>disable</Nullable>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

test/WireMock.Net.NUnitTests/UnitTest1.cs

@@ -0,0 +1,27 @@
+using WireMock.Server;
+
+namespace WireMock.Net.NUnitTests;
+
+[TestFixture]
+public class Test
+{
+    private WireMockServer server;
+
+    [SetUp]
+    public void Setup()
+    {
+        server = WireMockServer.Start();
+    }
+
+    [Test]
+    public void SomeTest()
+    {
+        Assert.Pass();
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        server.Stop();
+    }
+}

test/WireMock.Net.NUnitTests/Usings.cs

@@ -0,0 +1 @@
+global using NUnit.Framework;

test/WireMock.Net.NUnitTests/WireMock.Net.NUnitTests.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="WireMock.Net" Version="1.5.13" />
+  </ItemGroup>
+
+</Project>

test/WireMock.Net.Tests/.filenesting.json

@@ -1,18 +0,0 @@
-{
-    "help": "https://go.microsoft.com/fwlink/?linkid=866610",
-    "root": true,
-
-    "dependentFileProviders": {
-        "add": {
-            "addedExtension": {},
-            "pathSegment": {},
-            "fileSuffixToExtension": {
-                "add": {
-                    ".verified.txt": [
-                        ".cs"
-                    ]
-                }
-            }
-        }
-    }
-}

test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs

@@ -4,102 +4,103 @@ using NFluent;
 using WireMock.Handlers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Handlers;
-
-public class LocalFileSystemHandlerTests
+namespace WireMock.Net.Tests.Handlers
 {
-    private readonly LocalFileSystemHandler _sut = new();
-
-    [Fact]
-    public void LocalFileSystemHandler_GetMappingFolder()
+    public class LocalFileSystemHandlerTests
     {
-        // Act
-        string result = _sut.GetMappingFolder();
+        private readonly LocalFileSystemHandler _sut = new LocalFileSystemHandler();
 
-        // Assert
-        Check.That(result).EndsWith(Path.Combine("__admin", "mappings"));
-    }
+        [Fact]
+        public void LocalFileSystemHandler_GetMappingFolder()
+        {
+            // Act
+            string result = _sut.GetMappingFolder();
 
-    [Fact]
-    public void LocalFileSystemHandler_CreateFolder_ThrowsArgumentNullException()
-    {
-        // Act
-        Check.ThatCode(() => _sut.CreateFolder(null)).Throws<ArgumentNullException>();
-    }
+            // Assert
+            Check.That(result).EndsWith(Path.Combine("__admin", "mappings"));
+        }
 
-    [Fact]
-    public void LocalFileSystemHandler_WriteMappingFile_ThrowsArgumentNullException()
-    {
-        // Act
-        Check.ThatCode(() => _sut.WriteMappingFile(null, null)).Throws<ArgumentNullException>();
-    }
+        [Fact]
+        public void LocalFileSystemHandler_CreateFolder_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.CreateFolder(null)).Throws<ArgumentNullException>();
+        }
 
-    [Fact]
-    public void LocalFileSystemHandler_ReadResponseBodyAsFile_ThrowsArgumentNullException()
-    {
-        // Act
-        Check.ThatCode(() => _sut.ReadResponseBodyAsFile(null)).Throws<ArgumentNullException>();
-    }
+        [Fact]
+        public void LocalFileSystemHandler_WriteMappingFile_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.WriteMappingFile(null, null)).Throws<ArgumentNullException>();
+        }
 
-    [Fact]
-    public void LocalFileSystemHandler_FileExists_ReturnsFalse()
-    {
-        // Act
-        var result = _sut.FileExists("x.x");
+        [Fact]
+        public void LocalFileSystemHandler_ReadResponseBodyAsFile_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.ReadResponseBodyAsFile(null)).Throws<ArgumentNullException>();
+        }
 
-        // Assert
-        Check.That(result).IsFalse();
-    }
+        [Fact]
+        public void LocalFileSystemHandler_FileExists_ReturnsFalse()
+        {
+            // Act
+            var result = _sut.FileExists("x.x");
 
-    [Fact]
-    public void LocalFileSystemHandler_FileExists_ThrowsArgumentNullException()
-    {
-        // Act
-        Check.ThatCode(() => _sut.FileExists(null)).Throws<ArgumentNullException>();
-    }
+            // Assert
+            Check.That(result).IsFalse();
+        }
 
-    [Fact]
-    public void LocalFileSystemHandler_ReadFile_ThrowsArgumentNullException()
-    {
-        // Act
-        Check.ThatCode(() => _sut.ReadFile(null)).Throws<ArgumentNullException>();
-    }
+        [Fact]
+        public void LocalFileSystemHandler_FileExists_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.FileExists(null)).Throws<ArgumentNullException>();
+        }
 
-    [Fact]
-    public void LocalFileSystemHandler_ReadFileAsString_ThrowsArgumentNullException()
-    {
-        // Act
-        Check.ThatCode(() => _sut.ReadFileAsString(null)).Throws<ArgumentNullException>();
-    }
+        [Fact]
+        public void LocalFileSystemHandler_ReadFile_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.ReadFile(null)).Throws<ArgumentNullException>();
+        }
 
-    [Fact]
-    public void LocalFileSystemHandler_WriteFile_ThrowsArgumentNullException()
-    {
-        // Act
-        Check.ThatCode(() => _sut.WriteFile(null, null)).Throws<ArgumentNullException>();
-    }
+        [Fact]
+        public void LocalFileSystemHandler_ReadFileAsString_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.ReadFileAsString(null)).Throws<ArgumentNullException>();
+        }
 
-    [Fact]
-    public void LocalFileSystemHandler_DeleteFile_ThrowsArgumentNullException()
-    {
-        // Act
-        Check.ThatCode(() => _sut.DeleteFile(null)).Throws<ArgumentNullException>();
-    }
+        [Fact]
+        public void LocalFileSystemHandler_WriteFile_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.WriteFile(null, null)).Throws<ArgumentNullException>();
+        }
 
-    [Fact]
-    public void LocalFileSystemHandler_GetUnmatchedRequestsFolder()
-    {
-        // Act
-        string result = _sut.GetUnmatchedRequestsFolder();
+        [Fact]
+        public void LocalFileSystemHandler_DeleteFile_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.DeleteFile(null)).Throws<ArgumentNullException>();
+        }
 
-        // Assert
-        Check.That(result).EndsWith(Path.Combine("requests", "unmatched"));
-    }
+        [Fact]
+        public void LocalFileSystemHandler_GetUnmatchedRequestsFolder()
+        {
+            // Act
+            string result = _sut.GetUnmatchedRequestsFolder();
 
-    [Fact]
-    public void LocalFileSystemHandler_WriteUnmatchedRequest()
-    {
-        // Act
-        Check.ThatCode(() => _sut.WriteUnmatchedRequest(null, null)).Throws<ArgumentNullException>();
+            // Assert
+            Check.That(result).EndsWith(Path.Combine("requests", "unmatched"));
+        }
+
+        [Fact]
+        public void LocalFileSystemHandler_WriteUnmatchedRequest()
+        {
+            // Act
+            Check.ThatCode(() => _sut.WriteUnmatchedRequest(null, null)).Throws<ArgumentNullException>();
+        }
     }
 }

test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs

@@ -5,39 +5,40 @@ using FluentAssertions;
 using WireMock.Http;
 using Xunit;
 
-namespace WireMock.Net.Tests.Http;
-
-public class ByteArrayContentHelperTests
+namespace WireMock.Net.Tests.Http
 {
-    [Fact]
-    public async Task ByteArrayContentHelperTests_Create_WithNullContentType()
+    public class ByteArrayContentHelperTests
     {
-        // Arrange
-        var content = Encoding.UTF8.GetBytes("test");
+        [Fact]
+        public async Task ByteArrayContentHelperTests_Create_WithNullContentType()
+        {
+            // Arrange
+            var content = Encoding.UTF8.GetBytes("test");
 
-        // Act
-        var result = ByteArrayContentHelper.Create(content, null);
+            // Act
+            var result = ByteArrayContentHelper.Create(content, null);
 
-        // Assert
-        result.Headers.ContentType.Should().BeNull();
-        (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
+            // Assert
+            result.Headers.ContentType.Should().BeNull();
+            (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
+        }
+
+        [Theory]
+        [InlineData("application/octet-stream", "application/octet-stream")]
+        [InlineData("application/soap+xml", "application/soap+xml")]
+        [InlineData("multipart/form-data; boundary=------------------------x", "multipart/form-data; boundary=------------------------x")]
+        public async Task ByteArrayContentHelperTests_Create(string test, string expected)
+        {
+            // Arrange
+            var content = Encoding.UTF8.GetBytes("test");
+            var contentType = MediaTypeHeaderValue.Parse(test);
+
+            // Act
+            var result = ByteArrayContentHelper.Create(content, contentType);
+
+            // Assert
+            result.Headers.ContentType.ToString().Should().Be(expected);
+            (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
+        }
     }
-
-    [Theory]
-    [InlineData("application/octet-stream", "application/octet-stream")]
-    [InlineData("application/soap+xml", "application/soap+xml")]
-    [InlineData("multipart/form-data; boundary=------------------------x", "multipart/form-data; boundary=------------------------x")]
-    public async Task ByteArrayContentHelperTests_Create(string test, string expected)
-    {
-        // Arrange
-        var content = Encoding.UTF8.GetBytes("test");
-        var contentType = MediaTypeHeaderValue.Parse(test);
-
-        // Act
-        var result = ByteArrayContentHelper.Create(content, contentType);
-
-        // Assert
-        result.Headers.ContentType.ToString().Should().Be(expected);
-        (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
-    }
-}
+}

test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs

@@ -1,163 +1,164 @@
 using NFluent;
 using System.Collections.Generic;
 using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using WireMock.Http;
 using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Http;
-
-public class HttpRequestMessageHelperTests
+namespace WireMock.Net.Tests.Http
 {
-    private const string ClientIp = "::1";
-
-    [Fact]
-    public void HttpRequestMessageHelper_Create()
+    public class HttpRequestMessageHelperTests
     {
-        // Assign
-        var headers = new Dictionary<string, string[]> { { "x", new[] { "value-1" } } };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, null, headers);
+        private const string ClientIp = "::1";
 
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
-
-        // Assert
-        Check.That(message.Headers.GetValues("x")).ContainsExactly("value-1");
-    }
-
-    [Fact]
-    public async Task HttpRequestMessageHelper_Create_Bytes()
-    {
-        // Assign
-        var body = new BodyData
+        [Fact]
+        public void HttpRequestMessageHelper_Create()
         {
-            BodyAsBytes = Encoding.UTF8.GetBytes("hi"),
-            DetectedBodyType = BodyType.Bytes
-        };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body);
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "x", new[] { "value-1" } } };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, null, headers);
 
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
 
-        // Assert
-        Check.That(await message.Content.ReadAsByteArrayAsync().ConfigureAwait(false)).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
-    }
+            // Assert
+            Check.That(message.Headers.GetValues("x")).ContainsExactly("value-1");
+        }
 
-    [Fact]
-    public async Task HttpRequestMessageHelper_Create_Json()
-    {
-        // Assign
-        var body = new BodyData
+        [Fact]
+        public async Task HttpRequestMessageHelper_Create_Bytes()
         {
-            BodyAsJson = new { x = 42 },
-            DetectedBodyType = BodyType.Json
-        };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body);
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsBytes = Encoding.UTF8.GetBytes("hi"),
+                DetectedBodyType = BodyType.Bytes
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body);
 
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
 
-        // Assert
-        Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
-    }
+            // Assert
+            Check.That(await message.Content.ReadAsByteArrayAsync().ConfigureAwait(false)).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
+        }
 
-    [Fact]
-    public async Task HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson()
-    {
-        // Assign
-        var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/json" } } };
-        var body = new BodyData
+        [Fact]
+        public async Task HttpRequestMessageHelper_Create_Json()
         {
-            BodyAsJson = new { x = 42 },
-            DetectedBodyType = BodyType.Json
-        };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body, headers);
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new { x = 42 },
+                DetectedBodyType = BodyType.Json
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body);
 
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
 
-        // Assert
-        Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
-        Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json");
-    }
+            // Assert
+            Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
+        }
 
-    [Fact]
-    public async Task HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson_UTF8()
-    {
-        // Assign
-        var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/json; charset=utf-8" } } };
-        var body = new BodyData
+        [Fact]
+        public async Task HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson()
         {
-            BodyAsJson = new { x = 42 },
-            DetectedBodyType = BodyType.Json
-        };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body, headers);
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/json" } } };
+            var body = new BodyData
+            {
+                BodyAsJson = new { x = 42 },
+                DetectedBodyType = BodyType.Json
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body, headers);
 
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
 
-        // Assert
-        Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
-        Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
-    }
+            // Assert
+            Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json");
+        }
 
-    [Fact]
-    public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml()
-    {
-        // Assign
-        var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml" } } };
-        var body = new BodyData
+        [Fact]
+        public async Task HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson_UTF8()
         {
-            BodyAsString = "<xml>hello</xml>",
-            DetectedBodyType = BodyType.String
-        };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/json; charset=utf-8" } } };
+            var body = new BodyData
+            {
+                BodyAsJson = new { x = 42 },
+                DetectedBodyType = BodyType.Json
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body, headers);
 
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
 
-        // Assert
-        Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml");
-    }
+            // Assert
+            Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
+        }
 
-    [Fact]
-    public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml_UTF8()
-    {
-        // Assign
-        var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml; charset=UTF-8" } } };
-        var body = new BodyData
+        [Fact]
+        public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml()
         {
-            BodyAsString = "<xml>hello</xml>",
-            DetectedBodyType = BodyType.String
-        };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml" } } };
+            var body = new BodyData
+            {
+                BodyAsString = "<xml>hello</xml>",
+                DetectedBodyType = BodyType.String
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
 
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
 
-        // Assert
-        Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=UTF-8");
-    }
+            // Assert
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml");
+        }
 
-    [Fact]
-    public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml_ASCII()
-    {
-        // Assign
-        var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml; charset=Ascii" } } };
-        var body = new BodyData
+        [Fact]
+        public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml_UTF8()
         {
-            BodyAsString = "<xml>hello</xml>",
-            DetectedBodyType = BodyType.String
-        };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml; charset=UTF-8" } } };
+            var body = new BodyData
+            {
+                BodyAsString = "<xml>hello</xml>",
+                DetectedBodyType = BodyType.String
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
 
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
 
-        // Assert
-        Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=Ascii");
+            // Assert
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=UTF-8");
+        }
+
+        [Fact]
+        public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml_ASCII()
+        {
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml; charset=Ascii" } } };
+            var body = new BodyData
+            {
+                BodyAsString = "<xml>hello</xml>",
+                DetectedBodyType = BodyType.String
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
+
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+            // Assert
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=Ascii");
+        }
     }
 }

test/WireMock.Net.Tests/Http/StringContentHelperTests.cs

@@ -1,38 +1,39 @@
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using FluentAssertions;
 using WireMock.Http;
 using Xunit;
 
-namespace WireMock.Net.Tests.Http;
-
-public class StringContentHelperTests
+namespace WireMock.Net.Tests.Http
 {
-    [Fact]
-    public void StringContentHelper_Create_WithNullContentType()
+    public class StringContentHelperTests
     {
-        // Act
-        var result = StringContentHelper.Create("test", null);
+        [Fact]
+        public void StringContentHelper_Create_WithNullContentType()
+        {
+            // Act
+            var result = StringContentHelper.Create("test", null);
 
-        // Assert
-        result.Headers.ContentType.Should().BeNull();
-        result.ReadAsStringAsync().Result.Should().Be("test");
+            // Assert
+            result.Headers.ContentType.Should().BeNull();
+            result.ReadAsStringAsync().Result.Should().Be("test");
+        }
+
+        [Theory]
+        [InlineData("application/json", "application/json")]
+        [InlineData("application/soap+xml", "application/soap+xml")]
+        [InlineData("application/soap+xml;charset=UTF-8", "application/soap+xml; charset=UTF-8")]
+        [InlineData("application/soap+xml;charset=UTF-8;action=\"http://myCompany.Customer.Contract/ICustomerService/GetSomeConfiguration\"", "application/soap+xml; charset=UTF-8; action=\"http://myCompany.Customer.Contract/ICustomerService/GetSomeConfiguration\"")]
+        public void StringContentHelper_Create(string test, string expected)
+        {
+            // Arrange
+            var contentType = MediaTypeHeaderValue.Parse(test);
+
+            // Act
+            var result = StringContentHelper.Create("test", contentType);
+
+            // Assert
+            result.Headers.ContentType.ToString().Should().Be(expected);
+            result.ReadAsStringAsync().Result.Should().Be("test");
+        }
     }
-
-    [Theory]
-    [InlineData("application/json", "application/json")]
-    [InlineData("application/soap+xml", "application/soap+xml")]
-    [InlineData("application/soap+xml;charset=UTF-8", "application/soap+xml; charset=UTF-8")]
-    [InlineData("application/soap+xml;charset=UTF-8;action=\"http://myCompany.Customer.Contract/ICustomerService/GetSomeConfiguration\"", "application/soap+xml; charset=UTF-8; action=\"http://myCompany.Customer.Contract/ICustomerService/GetSomeConfiguration\"")]
-    public void StringContentHelper_Create(string test, string expected)
-    {
-        // Arrange
-        var contentType = MediaTypeHeaderValue.Parse(test);
-
-        // Act
-        var result = StringContentHelper.Create("test", contentType);
-
-        // Assert
-        result.Headers.ContentType.ToString().Should().Be(expected);
-        result.ReadAsStringAsync().Result.Should().Be("test");
-    }
-}
+}

test/WireMock.Net.Tests/MappingBuilderTests.GetMappings.verified.txt

@@ -1,25 +0,0 @@
-[
-  {
-    Guid: 41372914-1838-4c67-916b-b9aacdd096ce,
-    UpdatedAt: 2023-01-14 15:16:17,
-    Request: {
-      Path: {
-        Matchers: [
-          {
-            Name: WildcardMatcher,
-            Pattern: /foo,
-            IgnoreCase: false
-          }
-        ]
-      },
-      Methods: [
-        GET
-      ]
-    },
-    Response: {
-      BodyDestination: SameAsSource,
-      Body: { msg: "Hello world!"}
-    },
-    UseWebhooksFireAndForget: false
-  }
-]

test/WireMock.Net.Tests/MappingBuilderTests.ToJson.verified.txt

@@ -1,25 +0,0 @@
-[
-  {
-    Guid: 41372914-1838-4c67-916b-b9aacdd096ce,
-    UpdatedAt: 2023-01-14T15:16:17,
-    Request: {
-      Path: {
-        Matchers: [
-          {
-            Name: WildcardMatcher,
-            Pattern: /foo,
-            IgnoreCase: false
-          }
-        ]
-      },
-      Methods: [
-        GET
-      ]
-    },
-    Response: {
-      BodyDestination: SameAsSource,
-      Body: { msg: "Hello world!"}
-    },
-    UseWebhooksFireAndForget: false
-  }
-]

test/WireMock.Net.Tests/MappingBuilderTests.cs

@@ -1,166 +0,0 @@
-#if !(NET452 || NET461 || NETCOREAPP3_1)
-using System;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using Moq;
-using VerifyTests;
-using VerifyXunit;
-using WireMock.Handlers;
-using WireMock.Logging;
-using WireMock.Owin;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Serialization;
-using WireMock.Settings;
-using WireMock.Util;
-using Xunit;
-
-namespace WireMock.Net.Tests;
-
-[UsesVerify]
-public class MappingBuilderTests
-{
-    private static readonly Guid NewGuid = new("98fae52e-76df-47d9-876f-2ee32e931d9b");
-    private const string MappingGuid = "41372914-1838-4c67-916b-b9aacdd096ce";
-    private static readonly DateTime UtcNow = new(2023, 1, 14, 15, 16, 17);
-
-    private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock;
-
-    private readonly MappingBuilder _sut;
-
-    public MappingBuilderTests()
-    {
-        _fileSystemHandlerMock = new Mock<IFileSystemHandler>();
-
-        var guidUtilsMock = new Mock<IGuidUtils>();
-        guidUtilsMock.Setup(g => g.NewGuid()).Returns(NewGuid);
-
-        var dateTimeUtilsMock = new Mock<IDateTimeUtils>();
-        dateTimeUtilsMock.SetupGet(d => d.UtcNow).Returns(UtcNow);
-
-        var settings = new WireMockServerSettings
-        {
-            FileSystemHandler = _fileSystemHandlerMock.Object,
-            Logger = Mock.Of<IWireMockLogger>()
-        };
-        var options = new WireMockMiddlewareOptions();
-        var matcherMapper = new MatcherMapper(settings);
-        var mappingConverter = new MappingConverter(matcherMapper);
-        var mappingToFileSaver = new MappingToFileSaver(settings, mappingConverter);
-
-        _sut = new MappingBuilder(
-            settings,
-            options,
-            mappingConverter,
-            mappingToFileSaver,
-            guidUtilsMock.Object,
-            dateTimeUtilsMock.Object
-        );
-
-        _sut.Given(Request.Create()
-            .WithPath("/foo")
-            .UsingGet()
-        )
-        .WithGuid(MappingGuid)
-        .RespondWith(Response.Create()
-            .WithBody(@"{ msg: ""Hello world!""}")
-        );
-    }
-
-    [ModuleInitializer]
-    public static void ModuleInitializer()
-    {
-        VerifierSettings.DontScrubGuids();
-        VerifierSettings.DontScrubDateTimes();
-    }
-
-    [Fact]
-    public Task GetMappings()
-    {
-        // Act
-        var mappings = _sut.GetMappings();
-
-        // Verify
-        return Verifier.Verify(mappings);
-    }
-
-    [Fact]
-    public Task ToJson()
-    {
-        // Act
-        var json = _sut.ToJson();
-
-        // Verify
-        return Verifier.VerifyJson(json);
-    }
-
-    [Fact]
-    public void SaveMappingsToFile_FolderExists_IsFalse()
-    {
-        // Arrange
-        var path = "path";
-
-        // Act
-        _sut.SaveMappingsToFile(path);
-
-        // Verify
-        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Never);
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.CreateFolder(path), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(path, It.IsAny<string>()), Times.Once);
-        _fileSystemHandlerMock.VerifyNoOtherCalls();
-    }
-
-    [Fact]
-    public void SaveMappingsToFile_FolderExists_IsTrue()
-    {
-        // Arrange
-        var path = "path";
-        _fileSystemHandlerMock.Setup(fs => fs.FolderExists(It.IsAny<string>())).Returns(true);
-
-        // Act
-        _sut.SaveMappingsToFile(path);
-
-        // Verify
-        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Never);
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(path, It.IsAny<string>()), Times.Once);
-        _fileSystemHandlerMock.VerifyNoOtherCalls();
-    }
-
-    [Fact]
-    public void SaveMappingsToFolder_FolderIsNull()
-    {
-        // Arrange
-        var mappingFolder = "mapping-folder";
-        _fileSystemHandlerMock.Setup(fs => fs.GetMappingFolder()).Returns(mappingFolder);
-        _fileSystemHandlerMock.Setup(fs => fs.FolderExists(It.IsAny<string>())).Returns(true);
-
-        // Act
-        _sut.SaveMappingsToFolder(null);
-
-        // Verify
-        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
-        _fileSystemHandlerMock.VerifyNoOtherCalls();
-    }
-
-    [Fact]
-    public void SaveMappingsToFolder_FolderExists_IsTrue()
-    {
-        // Arrange
-        var path = "path";
-        _fileSystemHandlerMock.Setup(fs => fs.FolderExists(It.IsAny<string>())).Returns(true);
-
-        // Act
-        _sut.SaveMappingsToFolder(path);
-
-        // Verify
-        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Never);
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
-        _fileSystemHandlerMock.VerifyNoOtherCalls();
-    }
-}
-#endif

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

@@ -2,90 +2,91 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class CSharpCodeMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void CSharpCodeMatcher_For_String_SinglePattern_IsMatch_Positive()
+    public class CSharpCodeMatcherTests
     {
-        // Assign
-        string input = "x";
-
-        // Act
-        var matcher = new CSharpCodeMatcher("return it == \"x\";");
-
-        // Assert
-        Check.That(matcher.IsMatch(input)).IsEqualTo(1.0d);
-    }
-
-    [Fact]
-    public void CSharpCodeMatcher_For_String_IsMatch_Negative()
-    {
-        // Assign
-        string input = "y";
-
-        // Act
-        var matcher = new CSharpCodeMatcher("return it == \"x\";");
-
-        // Assert
-        Check.That(matcher.IsMatch(input)).IsEqualTo(0.0d);
-    }
-
-    [Fact]
-    public void CSharpCodeMatcher_For_String_IsMatch_RejectOnMatch()
-    {
-        // Assign
-        string input = "x";
-
-        // Act
-        var matcher = new CSharpCodeMatcher(MatchBehaviour.RejectOnMatch, MatchOperator.Or, "return it == \"x\";");
-
-        // Assert
-        Check.That(matcher.IsMatch(input)).IsEqualTo(0.0d);
-    }
-
-    [Fact]
-    public void CSharpCodeMatcher_For_Object_IsMatch()
-    {
-        // Assign
-        var input = new
+        [Fact]
+        public void CSharpCodeMatcher_For_String_SinglePattern_IsMatch_Positive()
         {
-            Id = 9,
-            Name = "Test"
-        };
+            // Assign
+            string input = "x";
 
-        // Act
-        var matcher = new CSharpCodeMatcher("return it.Id > 1 && it.Name == \"Test\";");
-        double match = matcher.IsMatch(input);
+            // Act
+            var matcher = new CSharpCodeMatcher("return it == \"x\";");
 
-        // Assert
-        Assert.Equal(1.0, match);
-    }
+            // Assert
+            Check.That(matcher.IsMatch(input)).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void CSharpCodeMatcher_GetName()
-    {
-        // Assign
-        var matcher = new CSharpCodeMatcher("x");
+        [Fact]
+        public void CSharpCodeMatcher_For_String_IsMatch_Negative()
+        {
+            // Assign
+            string input = "y";
 
-        // Act
-        string name = matcher.Name;
+            // Act
+            var matcher = new CSharpCodeMatcher("return it == \"x\";");
 
-        // Assert
-        Check.That(name).Equals("CSharpCodeMatcher");
-    }
+            // Assert
+            Check.That(matcher.IsMatch(input)).IsEqualTo(0.0d);
+        }
 
-    [Fact]
-    public void CSharpCodeMatcher_GetPatterns()
-    {
-        // Assign
-        var matcher = new CSharpCodeMatcher("x");
+        [Fact]
+        public void CSharpCodeMatcher_For_String_IsMatch_RejectOnMatch()
+        {
+            // Assign
+            string input = "x";
 
-        // Act
-        var patterns = matcher.GetPatterns();
+            // Act
+            var matcher = new CSharpCodeMatcher(MatchBehaviour.RejectOnMatch, MatchOperator.Or, "return it == \"x\";");
 
-        // Assert
-        Check.That(patterns).ContainsExactly("x");
+            // Assert
+            Check.That(matcher.IsMatch(input)).IsEqualTo(0.0d);
+        }
+
+        [Fact]
+        public void CSharpCodeMatcher_For_Object_IsMatch()
+        {
+            // Assign
+            var input = new
+            {
+                Id = 9,
+                Name = "Test"
+            };
+
+            // Act
+            var matcher = new CSharpCodeMatcher("return it.Id > 1 && it.Name == \"Test\";");
+            double match = matcher.IsMatch(input);
+
+            // Assert
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void CSharpCodeMatcher_GetName()
+        {
+            // Assign
+            var matcher = new CSharpCodeMatcher("x");
+
+            // Act
+            string name = matcher.Name;
+
+            // Assert
+            Check.That(name).Equals("CSharpCodeMatcher");
+        }
+
+        [Fact]
+        public void CSharpCodeMatcher_GetPatterns()
+        {
+            // Assign
+            var matcher = new CSharpCodeMatcher("x");
+
+            // Act
+            var patterns = matcher.GetPatterns();
+
+            // Assert
+            Check.That(patterns).ContainsExactly("x");
+        }
     }
 }

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

@@ -1,57 +1,59 @@
+using AnyOfTypes;
 using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class ContentTypeMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Theory]
-    [InlineData("application/json")]
-    [InlineData("application/json; charset=ascii")]
-    [InlineData("application/json; charset=utf-8")]
-    [InlineData("application/json; charset=UTF-8")]
-    public void ContentTypeMatcher_IsMatchWithIgnoreCaseFalse_Positive(string contentType)
+    public class ContentTypeMatcherTests
     {
-        var matcher = new ContentTypeMatcher("application/json");
-        Check.That(matcher.IsMatch(contentType)).IsEqualTo(1.0d);
-    }
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("application/json; charset=ascii")]
+        [InlineData("application/json; charset=utf-8")]
+        [InlineData("application/json; charset=UTF-8")]
+        public void ContentTypeMatcher_IsMatchWithIgnoreCaseFalse_Positive(string contentType)
+        {
+            var matcher = new ContentTypeMatcher("application/json");
+            Check.That(matcher.IsMatch(contentType)).IsEqualTo(1.0d);
+        }
 
-    [Theory]
-    [InlineData("application/json")]
-    [InlineData("application/JSON")]
-    [InlineData("application/json; CharSet=ascii")]
-    [InlineData("application/json; charset=utf-8")]
-    [InlineData("application/json; charset=UTF-8")]
-    public void ContentTypeMatcher_IsMatchWithIgnoreCaseTrue_Positive(string contentType)
-    {
-        var matcher = new ContentTypeMatcher("application/json", true);
-        Check.That(matcher.IsMatch(contentType)).IsEqualTo(1.0d);
-    }
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("application/JSON")]
+        [InlineData("application/json; CharSet=ascii")]
+        [InlineData("application/json; charset=utf-8")]
+        [InlineData("application/json; charset=UTF-8")]
+        public void ContentTypeMatcher_IsMatchWithIgnoreCaseTrue_Positive(string contentType)
+        {
+            var matcher = new ContentTypeMatcher("application/json", true);
+            Check.That(matcher.IsMatch(contentType)).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void ContentTypeMatcher_GetName()
-    {
-        // Assign
-        var matcher = new ContentTypeMatcher("x");
+        [Fact]
+        public void ContentTypeMatcher_GetName()
+        {
+            // Assign
+            var matcher = new ContentTypeMatcher("x");
 
-        // Act
-        string name = matcher.Name;
+            // Act
+            string name = matcher.Name;
 
-        // Assert
-        Check.That(name).Equals("ContentTypeMatcher");
-    }
+            // Assert
+            Check.That(name).Equals("ContentTypeMatcher");
+        }
 
-    [Fact]
-    public void ContentTypeMatcher_GetPatterns()
-    {
-        // Assign
-        var matcher = new ContentTypeMatcher("x");
+        [Fact]
+        public void ContentTypeMatcher_GetPatterns()
+        {
+            // Assign
+            var matcher = new ContentTypeMatcher("x");
 
-        // Act
-        var patterns = matcher.GetPatterns();
+            // Act
+            var patterns = matcher.GetPatterns();
 
-        // Assert
-        Check.That(patterns).ContainsExactly("x");
+            // Assert
+            Check.That(patterns).ContainsExactly("x");
+        }
     }
 }

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

@@ -1,64 +1,65 @@
-using NFluent;
+using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class ExactObjectMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void ExactObjectMatcher_GetName()
+    public class ExactObjectMatcherTests
     {
-        // Assign
-        object obj = 1;
+        [Fact]
+        public void ExactObjectMatcher_GetName()
+        {
+            // Assign
+            object obj = 1;
 
-        // Act
-        var matcher = new ExactObjectMatcher(obj);
-        string name = matcher.Name;
+            // Act
+            var matcher = new ExactObjectMatcher(obj);
+            string name = matcher.Name;
 
-        // Assert
-        Check.That(name).Equals("ExactObjectMatcher");
-    }
+            // Assert
+            Check.That(name).Equals("ExactObjectMatcher");
+        }
 
-    [Fact]
-    public void ExactObjectMatcher_IsMatch_ByteArray()
-    {
-        // Assign
-        object checkValue = new byte[] { 1, 2 };
+        [Fact]
+        public void ExactObjectMatcher_IsMatch_ByteArray()
+        {
+            // Assign
+            object checkValue = new byte[] { 1, 2 };
 
-        // Act
-        var matcher = new ExactObjectMatcher(new byte[] { 1, 2 });
-        double result = matcher.IsMatch(checkValue);
+            // Act
+            var matcher = new ExactObjectMatcher(new byte[] { 1, 2 });
+            double result = matcher.IsMatch(checkValue);
 
-        // Assert
-        Check.That(result).IsEqualTo(1.0);
-    }
+            // Assert
+            Check.That(result).IsEqualTo(1.0);
+        }
 
-    [Fact]
-    public void ExactObjectMatcher_IsMatch_AcceptOnMatch()
-    {
-        // Assign
-        object obj = new { x = 500, s = "s" };
+        [Fact]
+        public void ExactObjectMatcher_IsMatch_AcceptOnMatch()
+        {
+            // Assign
+            object obj = new { x = 500, s = "s" };
 
-        // Act
-        var matcher = new ExactObjectMatcher(obj);
-        double result = matcher.IsMatch(new { x = 500, s = "s" });
+            // Act
+            var matcher = new ExactObjectMatcher(obj);
+            double result = matcher.IsMatch(new { x = 500, s = "s" });
 
-        // Assert
-        Check.That(result).IsEqualTo(1.0);
-    }
+            // Assert
+            Check.That(result).IsEqualTo(1.0);
+        }
 
-    [Fact]
-    public void ExactObjectMatcher_IsMatch_RejectOnMatch()
-    {
-        // Assign
-        object obj = new { x = 500, s = "s" };
+        [Fact]
+        public void ExactObjectMatcher_IsMatch_RejectOnMatch()
+        {
+            // Assign
+            object obj = new { x = 500, s = "s" };
 
-        // Act
-        var matcher = new ExactObjectMatcher(MatchBehaviour.RejectOnMatch, obj);
-        double result = matcher.IsMatch(new { x = 500, s = "s" });
+            // Act
+            var matcher = new ExactObjectMatcher(MatchBehaviour.RejectOnMatch, obj);
+            double result = matcher.IsMatch(new { x = 500, s = "s" });
 
-        // Assert
-        Check.That(result).IsEqualTo(0.0);
+            // Assert
+            Check.That(result).IsEqualTo(0.0);
+        }
     }
 }

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

@@ -3,163 +3,164 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class JmesPathMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void JmesPathMatcher_GetName()
+    public class JmesPathMatcherTests
     {
-        // Assign
-        var matcher = new JmesPathMatcher("X");
-
-        // Act
-        string name = matcher.Name;
-
-        // Assert
-        Check.That(name).Equals("JmesPathMatcher");
-    }
-
-    [Fact]
-    public void JmesPathMatcher_GetPatterns()
-    {
-        // Assign
-        var matcher = new JmesPathMatcher("X");
-
-        // Act
-        var patterns = matcher.GetPatterns();
-
-        // Assert
-        Check.That(patterns).ContainsExactly("X");
-    }
-
-    [Fact]
-    public void JmesPathMatcher_IsMatch_ByteArray()
-    {
-        // Assign
-        var bytes = new byte[0];
-        var matcher = new JmesPathMatcher("");
-
-        // Act 
-        double match = matcher.IsMatch(bytes);
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JmesPathMatcher_IsMatch_NullString()
-    {
-        // Assign
-        string? s = null;
-        var matcher = new JmesPathMatcher("");
-
-        // Act 
-        double match = matcher.IsMatch(s);
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JmesPathMatcher_IsMatch_NullObject()
-    {
-        // Assign
-        object? o = null;
-        var matcher = new JmesPathMatcher("");
-
-        // Act 
-        double match = matcher.IsMatch(o);
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JmesPathMatcher_IsMatch_String_Exception_Mismatch()
-    {
-        // Assign
-        var matcher = new JmesPathMatcher("xxx");
-
-        // Act 
-        double match = matcher.IsMatch("");
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JmesPathMatcher_IsMatch_Object_Exception_Mismatch()
-    {
-        // Assign
-        var matcher = new JmesPathMatcher("");
-
-        // Act 
-        double match = matcher.IsMatch("x");
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JmesPathMatcher_IsMatch_AnonymousObject()
-    {
-        // Assign 
-        var matcher = new JmesPathMatcher("things.name == 'RequiredThing'");
-
-        // Act
-        double match = matcher.IsMatch(new { things = new { name = "RequiredThing" } });
-
-        // Assert 
-        Check.That(match).IsEqualTo(1);
-    }
-
-    [Fact]
-    public void JmesPathMatcher_IsMatch_JObject()
-    {
-        // Assign 
-        string[] patterns = { "things.x == 'RequiredThing'" };
-        var matcher = new JmesPathMatcher(patterns);
-
-        // Act
-        var sub = new JObject
+        [Fact]
+        public void JmesPathMatcher_GetName()
         {
-            { "x", new JValue("RequiredThing") }
-        };
-        var jobject = new JObject
+            // Assign
+            var matcher = new JmesPathMatcher("X");
+
+            // Act
+            string name = matcher.Name;
+
+            // Assert
+            Check.That(name).Equals("JmesPathMatcher");
+        }
+
+        [Fact]
+        public void JmesPathMatcher_GetPatterns()
         {
-            { "Id", new JValue(1) },
-            { "things", sub }
-        };
-        double match = matcher.IsMatch(jobject);
+            // Assign
+            var matcher = new JmesPathMatcher("X");
 
-        // Assert 
-        Check.That(match).IsEqualTo(1);
-    }
+            // Act
+            var patterns = matcher.GetPatterns();
 
-    [Fact]
-    public void JmesPathMatcher_IsMatch_JObject_Parsed()
-    {
-        // Assign 
-        var matcher = new JmesPathMatcher("things.x == 'RequiredThing'");
+            // Assert
+            Check.That(patterns).ContainsExactly("X");
+        }
 
-        // Act 
-        double match = matcher.IsMatch(JObject.Parse("{ \"things\": { \"x\": \"RequiredThing\" } }"));
+        [Fact]
+        public void JmesPathMatcher_IsMatch_ByteArray()
+        {
+            // Assign
+            var bytes = new byte[0];
+            var matcher = new JmesPathMatcher("");
 
-        // Assert 
-        Check.That(match).IsEqualTo(1);
-    }
+            // Act 
+            double match = matcher.IsMatch(bytes);
 
-    [Fact]
-    public void JmesPathMatcher_IsMatch_RejectOnMatch()
-    {
-        // Assign
-        var matcher = new JmesPathMatcher(MatchBehaviour.RejectOnMatch, false, MatchOperator.Or, "things.x == 'RequiredThing'");
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
 
-        // Act
-        double match = matcher.IsMatch(JObject.Parse("{ \"things\": { \"x\": \"RequiredThing\" } }"));
+        [Fact]
+        public void JmesPathMatcher_IsMatch_NullString()
+        {
+            // Assign
+            string? s = null;
+            var matcher = new JmesPathMatcher("");
 
-        // Assert
-        Check.That(match).IsEqualTo(0.0);
+            // Act 
+            double match = matcher.IsMatch(s);
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JmesPathMatcher_IsMatch_NullObject()
+        {
+            // Assign
+            object? o = null;
+            var matcher = new JmesPathMatcher("");
+
+            // Act 
+            double match = matcher.IsMatch(o);
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JmesPathMatcher_IsMatch_String_Exception_Mismatch()
+        {
+            // Assign
+            var matcher = new JmesPathMatcher("xxx");
+
+            // Act 
+            double match = matcher.IsMatch("");
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JmesPathMatcher_IsMatch_Object_Exception_Mismatch()
+        {
+            // Assign
+            var matcher = new JmesPathMatcher("");
+
+            // Act 
+            double match = matcher.IsMatch("x");
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JmesPathMatcher_IsMatch_AnonymousObject()
+        {
+            // Assign 
+            var matcher = new JmesPathMatcher("things.name == 'RequiredThing'");
+
+            // Act
+            double match = matcher.IsMatch(new { things = new { name = "RequiredThing" } });
+
+            // Assert 
+            Check.That(match).IsEqualTo(1);
+        }
+
+        [Fact]
+        public void JmesPathMatcher_IsMatch_JObject()
+        {
+            // Assign 
+            string[] patterns = { "things.x == 'RequiredThing'" };
+            var matcher = new JmesPathMatcher(patterns);
+
+            // Act
+            var sub = new JObject
+            {
+                { "x", new JValue("RequiredThing") }
+            };
+            var jobject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "things", sub }
+            };
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Check.That(match).IsEqualTo(1);
+        }
+
+        [Fact]
+        public void JmesPathMatcher_IsMatch_JObject_Parsed()
+        {
+            // Assign 
+            var matcher = new JmesPathMatcher("things.x == 'RequiredThing'");
+
+            // Act 
+            double match = matcher.IsMatch(JObject.Parse("{ \"things\": { \"x\": \"RequiredThing\" } }"));
+
+            // Assert 
+            Check.That(match).IsEqualTo(1);
+        }
+
+        [Fact]
+        public void JmesPathMatcher_IsMatch_RejectOnMatch()
+        {
+            // Assign
+            var matcher = new JmesPathMatcher(MatchBehaviour.RejectOnMatch, false, MatchOperator.Or, "things.x == 'RequiredThing'");
+
+            // Act
+            double match = matcher.IsMatch(JObject.Parse("{ \"things\": { \"x\": \"RequiredThing\" } }"));
+
+            // Assert
+            Check.That(match).IsEqualTo(0.0);
+        }
     }
 }

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

@@ -7,415 +7,416 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class JsonPartialMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void JsonPartialMatcher_GetName()
+    public class JsonPartialMatcherTests
     {
-        // Assign
-        var matcher = new JsonPartialMatcher("{}");
-
-        // Act
-        string name = matcher.Name;
-
-        // Assert
-        Check.That(name).Equals("JsonPartialMatcher");
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_GetValue()
-    {
-        // Assign
-        var matcher = new JsonPartialMatcher("{}");
-
-        // Act
-        object value = matcher.Value;
-
-        // Assert
-        Check.That(value).Equals("{}");
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_WithInvalidStringValue_Should_ThrowException()
-    {
-        // Act
-        // ReSharper disable once ObjectCreationAsStatement
-        Action action = () => new JsonPartialMatcher(MatchBehaviour.AcceptOnMatch, "{ \"Id\"");
-
-        // Assert
-        action.Should().Throw<JsonException>();
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_WithInvalidObjectValue_Should_ThrowException()
-    {
-        // Act
-        // ReSharper disable once ObjectCreationAsStatement
-        Action action = () => new JsonPartialMatcher(MatchBehaviour.AcceptOnMatch, new MemoryStream());
-
-        // Assert
-        action.Should().Throw<JsonException>();
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_WithInvalidValue_And_ThrowExceptionIsFalse_Should_ReturnMismatch()
-    {
-        // Assign
-        var matcher = new JsonPartialMatcher("");
-
-        // Act
-        double match = matcher.IsMatch(new MemoryStream());
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_WithInvalidValue_And_ThrowExceptionIsTrue_Should_ReturnMismatch()
-    {
-        // Assign
-        var matcher = new JsonPartialMatcher("", false, true);
-
-        // Act
-        Action action = () => matcher.IsMatch(new MemoryStream());
-
-        // Assert 
-        action.Should().Throw<JsonException>();
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_ByteArray()
-    {
-        // Assign
-        var bytes = new byte[0];
-        var matcher = new JsonPartialMatcher("");
-
-        // Act 
-        double match = matcher.IsMatch(bytes);
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_NullString()
-    {
-        // Assign
-        string? s = null;
-        var matcher = new JsonPartialMatcher("");
-
-        // Act 
-        double match = matcher.IsMatch(s);
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_NullObject()
-    {
-        // Assign
-        object? o = null;
-        var matcher = new JsonPartialMatcher("");
-
-        // Act 
-        double match = matcher.IsMatch(o);
-
-        // Assert 
-        Check.That(match).IsEqualTo(0);
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_JArray()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher(new[] { "x", "y" });
-
-        // Act 
-        var jArray = new JArray
+        [Fact]
+        public void JsonPartialMatcher_GetName()
         {
-            "x",
-            "y"
-        };
-        double match = matcher.IsMatch(jArray);
+            // Assign
+            var matcher = new JsonPartialMatcher("{}");
 
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
+            // Act
+            string name = matcher.Name;
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_JObject()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher(new { Id = 1, Name = "Test" });
+            // Assert
+            Check.That(name).Equals("JsonPartialMatcher");
+        }
 
-        // Act 
-        var jObject = new JObject
+        [Fact]
+        public void JsonPartialMatcher_GetValue()
         {
-            { "Id", new JValue(1) },
-            { "Name", new JValue("Test") }
-        };
-        double match = matcher.IsMatch(jObject);
+            // Assign
+            var matcher = new JsonPartialMatcher("{}");
 
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
+            // Act
+            object value = matcher.Value;
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_WithRegexTrue()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher(new { Id = "^\\d+$", Name = "Test" }, false, false, true);
+            // Assert
+            Check.That(value).Equals("{}");
+        }
 
-        // Act 
-        var jObject = new JObject
+        [Fact]
+        public void JsonPartialMatcher_WithInvalidStringValue_Should_ThrowException()
         {
-            { "Id", new JValue(1) },
-            { "Name", new JValue("Test") }
-        };
-        double match = matcher.IsMatch(jObject);
+            // Act
+            // ReSharper disable once ObjectCreationAsStatement
+            Action action = () => new JsonPartialMatcher(MatchBehaviour.AcceptOnMatch, "{ \"Id\"");
 
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
+            // Assert
+            action.Should().Throw<JsonException>();
+        }
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_WithRegexFalse()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher(new { Id = "^\\d+$", Name = "Test" });
-
-        // Act 
-        var jObject = new JObject
+        [Fact]
+        public void JsonPartialMatcher_WithInvalidObjectValue_Should_ThrowException()
         {
-            { "Id", new JValue(1) },
-            { "Name", new JValue("Test") }
-        };
-        double match = matcher.IsMatch(jObject);
+            // Act
+            // ReSharper disable once ObjectCreationAsStatement
+            Action action = () => new JsonPartialMatcher(MatchBehaviour.AcceptOnMatch, new MemoryStream());
 
-        // Assert 
-        Assert.Equal(0.0, match);
-    }
+            // Assert
+            action.Should().Throw<JsonException>();
+        }
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_WithIgnoreCaseTrue_JObject()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher(new { id = 1, Name = "test" }, true);
-
-        // Act 
-        var jObject = new JObject
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_WithInvalidValue_And_ThrowExceptionIsFalse_Should_ReturnMismatch()
         {
-            { "Id", new JValue(1) },
-            { "NaMe", new JValue("Test") }
-        };
-        double match = matcher.IsMatch(jObject);
+            // Assign
+            var matcher = new JsonPartialMatcher("");
 
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
+            // Act
+            double match = matcher.IsMatch(new MemoryStream());
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_JObjectParsed()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher(new { Id = 1, Name = "Test" });
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
 
-        // Act 
-        var jObject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
-        double match = matcher.IsMatch(jObject);
-
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_WithIgnoreCaseTrue_JObjectParsed()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher(new { Id = 1, Name = "TESt" }, true);
-
-        // Act 
-        var jObject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
-        double match = matcher.IsMatch(jObject);
-
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
-
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_JArrayAsString()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher("[ \"x\", \"y\" ]");
-
-        // Act 
-        var jArray = new JArray
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_WithInvalidValue_And_ThrowExceptionIsTrue_Should_ReturnMismatch()
         {
-            "x",
-            "y"
-        };
-        double match = matcher.IsMatch(jArray);
+            // Assign
+            var matcher = new JsonPartialMatcher("", false, true);
 
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
+            // Act
+            Action action = () => matcher.IsMatch(new MemoryStream());
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_JObjectAsString()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher("{ \"Id\" : 1, \"Name\" : \"Test\" }");
+            // Assert 
+            action.Should().Throw<JsonException>();
+        }
 
-        // Act 
-        var jObject = new JObject
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_ByteArray()
         {
-            { "Id", new JValue(1) },
-            { "Name", new JValue("Test") }
-        };
-        double match = matcher.IsMatch(jObject);
+            // Assign
+            var bytes = new byte[0];
+            var matcher = new JsonPartialMatcher("");
 
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
+            // Act 
+            double match = matcher.IsMatch(bytes);
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_WithIgnoreCaseTrue_JObjectAsString()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher("{ \"Id\" : 1, \"Name\" : \"test\" }", true);
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
 
-        // Act 
-        var jObject = new JObject
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_NullString()
         {
-            { "Id", new JValue(1) },
-            { "Name", new JValue("Test") }
-        };
-        double match = matcher.IsMatch(jObject);
+            // Assign
+            string? s = null;
+            var matcher = new JsonPartialMatcher("");
 
-        // Assert 
-        Assert.Equal(1.0, match);
-    }
+            // Act 
+            double match = matcher.IsMatch(s);
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_JObjectAsString_RejectOnMatch()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher(MatchBehaviour.RejectOnMatch, "{ \"Id\" : 1, \"Name\" : \"Test\" }");
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
 
-        // Act 
-        var jObject = new JObject
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_NullObject()
         {
-            { "Id", new JValue(1) },
-            { "Name", new JValue("Test") }
-        };
-        double match = matcher.IsMatch(jObject);
+            // Assign
+            object? o = null;
+            var matcher = new JsonPartialMatcher("");
 
-        // Assert 
-        Assert.Equal(0.0, match);
-    }
+            // Act 
+            double match = matcher.IsMatch(o);
 
-    [Fact]
-    public void JsonPartialMatcher_IsMatch_JObjectWithDateTimeOffsetAsString()
-    {
-        // Assign 
-        var matcher = new JsonPartialMatcher("{ \"preferredAt\" : \"2019-11-21T10:32:53.2210009+00:00\" }");
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
 
-        // Act 
-        var jObject = new JObject
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_JArray()
         {
-            { "preferredAt", new JValue("2019-11-21T10:32:53.2210009+00:00") }
-        };
-        double match = matcher.IsMatch(jObject);
+            // Assign 
+            var matcher = new JsonPartialMatcher(new[] { "x", "y" });
 
-        // Assert 
-        Assert.Equal(1.0, match);
+            // Act 
+            var jArray = new JArray
+            {
+                "x",
+                "y"
+            };
+            double match = matcher.IsMatch(jArray);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_JObject()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher(new { Id = 1, Name = "Test" });
+
+            // Act 
+            var jObject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_WithRegexTrue()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher(new { Id = "^\\d+$", Name = "Test" }, false, false, true);
+
+            // Act 
+            var jObject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_WithRegexFalse()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher(new { Id = "^\\d+$", Name = "Test" });
+
+            // Act 
+            var jObject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(0.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_WithIgnoreCaseTrue_JObject()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher(new { id = 1, Name = "test" }, true);
+
+            // Act 
+            var jObject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "NaMe", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_JObjectParsed()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher(new { Id = 1, Name = "Test" });
+
+            // Act 
+            var jObject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_WithIgnoreCaseTrue_JObjectParsed()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher(new { Id = 1, Name = "TESt" }, true);
+
+            // Act 
+            var jObject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_JArrayAsString()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher("[ \"x\", \"y\" ]");
+
+            // Act 
+            var jArray = new JArray
+            {
+                "x",
+                "y"
+            };
+            double match = matcher.IsMatch(jArray);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_JObjectAsString()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher("{ \"Id\" : 1, \"Name\" : \"Test\" }");
+
+            // Act 
+            var jObject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_WithIgnoreCaseTrue_JObjectAsString()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher("{ \"Id\" : 1, \"Name\" : \"test\" }", true);
+
+            // Act 
+            var jObject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_JObjectAsString_RejectOnMatch()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher(MatchBehaviour.RejectOnMatch, "{ \"Id\" : 1, \"Name\" : \"Test\" }");
+
+            // Act 
+            var jObject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(0.0, match);
+        }
+
+        [Fact]
+        public void JsonPartialMatcher_IsMatch_JObjectWithDateTimeOffsetAsString()
+        {
+            // Assign 
+            var matcher = new JsonPartialMatcher("{ \"preferredAt\" : \"2019-11-21T10:32:53.2210009+00:00\" }");
+
+            // Act 
+            var jObject = new JObject
+            {
+                { "preferredAt", new JValue("2019-11-21T10:32:53.2210009+00:00") }
+            };
+            double match = matcher.IsMatch(jObject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Theory]
+        [InlineData("{\"test\":\"abc\"}", "{\"test\":\"abc\",\"other\":\"xyz\"}")]
+        [InlineData("\"test\"", "\"test\"")]
+        [InlineData("123", "123")]
+        [InlineData("[\"test\"]", "[\"test\"]")]
+        [InlineData("[\"test\"]", "[\"test\", \"other\"]")]
+        [InlineData("[123]", "[123]")]
+        [InlineData("[123]", "[123, 456]")]
+        [InlineData("{ \"test\":\"value\" }", "{\"test\":\"value\",\"other\":123}")]
+        [InlineData("{ \"test\":\"value\" }", "{\"test\":\"value\"}")]
+        [InlineData("{\"test\":{\"nested\":\"value\"}}", "{\"test\":{\"nested\":\"value\"}}")]
+        public void JsonPartialMatcher_IsMatch_StringInputValidMatch(string value, string input)
+        {
+            // Assign
+            var matcher = new JsonPartialMatcher(value);
+
+            // Act
+            double match = matcher.IsMatch(input);
+
+            // Assert
+            Assert.Equal(1.0, match);
+        }
+
+        [Theory]
+        [InlineData("\"test\"", null)]
+        [InlineData("\"test1\"", "\"test2\"")]
+        [InlineData("123", "1234")]
+        [InlineData("[\"test\"]", "[\"test1\"]")]
+        [InlineData("[\"test\"]", "[\"test1\", \"test2\"]")]
+        [InlineData("[123]", "[1234]")]
+        [InlineData("{}", "\"test\"")]
+        [InlineData("{ \"test\":\"value\" }", "{\"test\":\"value2\"}")]
+        [InlineData("{ \"test.nested\":\"value\" }", "{\"test\":{\"nested\":\"value1\"}}")]
+        [InlineData("{\"test\":{\"test1\":\"value\"}}", "{\"test\":{\"test1\":\"value1\"}}")]
+        [InlineData("[{ \"test.nested\":\"value\" }]", "[{\"test\":{\"nested\":\"value1\"}}]")]
+        public void JsonPartialMatcher_IsMatch_StringInputWithInvalidMatch(string value, string input)
+        {
+            // Assign
+            var matcher = new JsonPartialMatcher(value);
+
+            // Act
+            double match = matcher.IsMatch(input);
+
+            // Assert
+            Assert.Equal(0.0, match);
+        }
+
+        [Theory]
+        [InlineData("{ \"test.nested\":123 }", "{\"test\":{\"nested\":123}}")]
+        [InlineData("{ \"test.nested\":[123, 456] }", "{\"test\":{\"nested\":[123, 456]}}")]
+        [InlineData("{ \"test.nested\":\"value\" }", "{\"test\":{\"nested\":\"value\"}}")]
+        [InlineData("{ \"['name.with.dot']\":\"value\" }", "{\"name.with.dot\":\"value\"}")]
+        [InlineData("[{ \"test.nested\":\"value\" }]", "[{\"test\":{\"nested\":\"value\"}}]")]
+        [InlineData("[{ \"['name.with.dot']\":\"value\" }]", "[{\"name.with.dot\":\"value\"}]")]
+        public void JsonPartialMatcher_IsMatch_ValueAsJPathValidMatch(string value, string input)
+        {
+            // Assign
+            var matcher = new JsonPartialMatcher(value);
+
+            // Act
+            double match = matcher.IsMatch(input);
+
+            // Assert
+            Assert.Equal(1.0, match);
+        }
+
+        [Theory]
+        [InlineData("{ \"test.nested\":123 }", "{\"test\":{\"nested\":456}}")]
+        [InlineData("{ \"test.nested\":[123, 456] }", "{\"test\":{\"nested\":[1, 2]}}")]
+        [InlineData("{ \"test.nested\":\"value\" }", "{\"test\":{\"nested\":\"value1\"}}")]
+        [InlineData("{ \"['name.with.dot']\":\"value\" }", "{\"name.with.dot\":\"value1\"}")]
+        [InlineData("[{ \"test.nested\":\"value\" }]", "[{\"test\":{\"nested\":\"value1\"}}]")]
+        [InlineData("[{ \"['name.with.dot']\":\"value\" }]", "[{\"name.with.dot\":\"value1\"}]")]
+        public void JsonPartialMatcher_IsMatch_ValueAsJPathInvalidMatch(string value, string input)
+        {
+            // Assign
+            var matcher = new JsonPartialMatcher(value);
+
+            // Act
+            double match = matcher.IsMatch(input);
+
+            // Assert
+            Assert.Equal(0.0, match);
+        }
     }
-
-    [Theory]
-    [InlineData("{\"test\":\"abc\"}", "{\"test\":\"abc\",\"other\":\"xyz\"}")]
-    [InlineData("\"test\"", "\"test\"")]
-    [InlineData("123", "123")]
-    [InlineData("[\"test\"]", "[\"test\"]")]
-    [InlineData("[\"test\"]", "[\"test\", \"other\"]")]
-    [InlineData("[123]", "[123]")]
-    [InlineData("[123]", "[123, 456]")]
-    [InlineData("{ \"test\":\"value\" }", "{\"test\":\"value\",\"other\":123}")]
-    [InlineData("{ \"test\":\"value\" }", "{\"test\":\"value\"}")]
-    [InlineData("{\"test\":{\"nested\":\"value\"}}", "{\"test\":{\"nested\":\"value\"}}")]
-    public void JsonPartialMatcher_IsMatch_StringInputValidMatch(string value, string input)
-    {
-        // Assign
-        var matcher = new JsonPartialMatcher(value);
-
-        // Act
-        double match = matcher.IsMatch(input);
-
-        // Assert
-        Assert.Equal(1.0, match);
-    }
-
-    [Theory]
-    [InlineData("\"test\"", null)]
-    [InlineData("\"test1\"", "\"test2\"")]
-    [InlineData("123", "1234")]
-    [InlineData("[\"test\"]", "[\"test1\"]")]
-    [InlineData("[\"test\"]", "[\"test1\", \"test2\"]")]
-    [InlineData("[123]", "[1234]")]
-    [InlineData("{}", "\"test\"")]
-    [InlineData("{ \"test\":\"value\" }", "{\"test\":\"value2\"}")]
-    [InlineData("{ \"test.nested\":\"value\" }", "{\"test\":{\"nested\":\"value1\"}}")]
-    [InlineData("{\"test\":{\"test1\":\"value\"}}", "{\"test\":{\"test1\":\"value1\"}}")]
-    [InlineData("[{ \"test.nested\":\"value\" }]", "[{\"test\":{\"nested\":\"value1\"}}]")]
-    public void JsonPartialMatcher_IsMatch_StringInputWithInvalidMatch(string value, string input)
-    {
-        // Assign
-        var matcher = new JsonPartialMatcher(value);
-
-        // Act
-        double match = matcher.IsMatch(input);
-
-        // Assert
-        Assert.Equal(0.0, match);
-    }
-
-    [Theory]
-    [InlineData("{ \"test.nested\":123 }", "{\"test\":{\"nested\":123}}")]
-    [InlineData("{ \"test.nested\":[123, 456] }", "{\"test\":{\"nested\":[123, 456]}}")]
-    [InlineData("{ \"test.nested\":\"value\" }", "{\"test\":{\"nested\":\"value\"}}")]
-    [InlineData("{ \"['name.with.dot']\":\"value\" }", "{\"name.with.dot\":\"value\"}")]
-    [InlineData("[{ \"test.nested\":\"value\" }]", "[{\"test\":{\"nested\":\"value\"}}]")]
-    [InlineData("[{ \"['name.with.dot']\":\"value\" }]", "[{\"name.with.dot\":\"value\"}]")]
-    public void JsonPartialMatcher_IsMatch_ValueAsJPathValidMatch(string value, string input)
-    {
-        // Assign
-        var matcher = new JsonPartialMatcher(value);
-
-        // Act
-        double match = matcher.IsMatch(input);
-
-        // Assert
-        Assert.Equal(1.0, match);
-    }
-
-    [Theory]
-    [InlineData("{ \"test.nested\":123 }", "{\"test\":{\"nested\":456}}")]
-    [InlineData("{ \"test.nested\":[123, 456] }", "{\"test\":{\"nested\":[1, 2]}}")]
-    [InlineData("{ \"test.nested\":\"value\" }", "{\"test\":{\"nested\":\"value1\"}}")]
-    [InlineData("{ \"['name.with.dot']\":\"value\" }", "{\"name.with.dot\":\"value1\"}")]
-    [InlineData("[{ \"test.nested\":\"value\" }]", "[{\"test\":{\"nested\":\"value1\"}}]")]
-    [InlineData("[{ \"['name.with.dot']\":\"value\" }]", "[{\"name.with.dot\":\"value1\"}]")]
-    public void JsonPartialMatcher_IsMatch_ValueAsJPathInvalidMatch(string value, string input)
-    {
-        // Assign
-        var matcher = new JsonPartialMatcher(value);
-
-        // Act
-        double match = matcher.IsMatch(input);
-
-        // Assert
-        Assert.Equal(0.0, match);
-    }
-}
+}

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

@@ -3,109 +3,110 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class LinqMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void LinqMatcher_For_String_SinglePattern_IsMatch_Positive()
+    public class LinqMatcherTests
     {
-        // Assign
-        string input = "2018-08-31 13:59:59";
-
-        // Act
-        var matcher = new LinqMatcher("DateTime.Parse(it) > \"2018-08-01 13:50:00\"");
-
-        // Assert
-        Check.That(matcher.IsMatch(input)).IsEqualTo(1.0d);
-    }
-
-    [Fact]
-    public void LinqMatcher_For_String_IsMatch_Negative()
-    {
-        // Assign
-        string input = "2018-08-31 13:59:59";
-
-        // Act
-        var matcher = new LinqMatcher("DateTime.Parse(it) > \"2019-01-01 00:00:00\"");
-
-        // Assert
-        Check.That(matcher.IsMatch(input)).IsEqualTo(0.0d);
-    }
-
-    [Fact]
-    public void LinqMatcher_For_String_IsMatch_RejectOnMatch()
-    {
-        // Assign
-        string input = "2018-08-31 13:59:59";
-
-        // Act
-        var matcher = new LinqMatcher(MatchBehaviour.RejectOnMatch, "DateTime.Parse(it) > \"2018-08-01 13:50:00\"");
-
-        // Assert
-        Check.That(matcher.IsMatch(input)).IsEqualTo(0.0d);
-    }
-
-    [Fact]
-    public void LinqMatcher_For_Object_IsMatch()
-    {
-        // Assign
-        var input = new
+        [Fact]
+        public void LinqMatcher_For_String_SinglePattern_IsMatch_Positive()
         {
-            Id = 9,
-            Name = "Test"
-        };
+            // Assign
+            string input = "2018-08-31 13:59:59";
 
-        // Act
-        var matcher = new LinqMatcher("Id > 1 AND Name == \"Test\"");
-        double match = matcher.IsMatch(input);
+            // Act
+            var matcher = new LinqMatcher("DateTime.Parse(it) > \"2018-08-01 13:50:00\"");
 
-        // Assert
-        Assert.Equal(1.0, match);
-    }
+            // Assert
+            Check.That(matcher.IsMatch(input)).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void LinqMatcher_For_JObject_IsMatch()
-    {
-        // Assign
-        var input = new JObject
+        [Fact]
+        public void LinqMatcher_For_String_IsMatch_Negative()
         {
-            { "IntegerId", new JValue(9) },
-            { "LongId", new JValue(long.MaxValue) },
-            { "Name", new JValue("Test") }
-        };
+            // Assign
+            string input = "2018-08-31 13:59:59";
 
-        // Act
-        var matcher = new LinqMatcher("IntegerId > 1 AND LongId > 1 && Name == \"Test\"");
-        double match = matcher.IsMatch(input);
+            // Act
+            var matcher = new LinqMatcher("DateTime.Parse(it) > \"2019-01-01 00:00:00\"");
 
-        // Assert
-        Assert.Equal(1.0, match);
-    }
+            // Assert
+            Check.That(matcher.IsMatch(input)).IsEqualTo(0.0d);
+        }
 
-    [Fact]
-    public void LinqMatcher_GetName()
-    {
-        // Assign
-        var matcher = new LinqMatcher("x");
+        [Fact]
+        public void LinqMatcher_For_String_IsMatch_RejectOnMatch()
+        {
+            // Assign
+            string input = "2018-08-31 13:59:59";
 
-        // Act
-        string name = matcher.Name;
+            // Act
+            var matcher = new LinqMatcher(MatchBehaviour.RejectOnMatch, "DateTime.Parse(it) > \"2018-08-01 13:50:00\"");
 
-        // Assert
-        Check.That(name).Equals("LinqMatcher");
-    }
+            // Assert
+            Check.That(matcher.IsMatch(input)).IsEqualTo(0.0d);
+        }
 
-    [Fact]
-    public void LinqMatcher_GetPatterns()
-    {
-        // Assign
-        var matcher = new LinqMatcher("x");
+        [Fact]
+        public void LinqMatcher_For_Object_IsMatch()
+        {
+            // Assign
+            var input = new
+            {
+                Id = 9,
+                Name = "Test"
+            };
 
-        // Act
-        var patterns = matcher.GetPatterns();
+            // Act
+            var matcher = new LinqMatcher("Id > 1 AND Name == \"Test\"");
+            double match = matcher.IsMatch(input);
 
-        // Assert
-        Check.That(patterns).ContainsExactly("x");
+            // Assert
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void LinqMatcher_For_JObject_IsMatch()
+        {
+            // Assign
+            var input = new JObject
+            {
+                { "IntegerId", new JValue(9) },
+                { "LongId", new JValue(long.MaxValue) },
+                { "Name", new JValue("Test") }
+            };
+
+            // Act
+            var matcher = new LinqMatcher("IntegerId > 1 AND LongId > 1 && Name == \"Test\"");
+            double match = matcher.IsMatch(input);
+
+            // Assert
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void LinqMatcher_GetName()
+        {
+            // Assign
+            var matcher = new LinqMatcher("x");
+
+            // Act
+            string name = matcher.Name;
+
+            // Assert
+            Check.That(name).Equals("LinqMatcher");
+        }
+
+        [Fact]
+        public void LinqMatcher_GetPatterns()
+        {
+            // Assign
+            var matcher = new LinqMatcher("x");
+
+            // Act
+            var patterns = matcher.GetPatterns();
+
+            // Assert
+            Check.That(patterns).ContainsExactly("x");
+        }
     }
 }

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

@@ -1,24 +1,25 @@
-using NFluent;
+using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class MatchBehaviourHelperTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void MatchBehaviourHelper_Convert_AcceptOnMatch()
+    public class MatchBehaviourHelperTests
     {
-        Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 0.0)).IsEqualTo(0.0);
-        Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 0.5)).IsEqualTo(0.5);
-        Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 1.0)).IsEqualTo(1.0);
-    }
+        [Fact]
+        public void MatchBehaviourHelper_Convert_AcceptOnMatch()
+        {
+            Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 0.0)).IsEqualTo(0.0);
+            Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 0.5)).IsEqualTo(0.5);
+            Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 1.0)).IsEqualTo(1.0);
+        }
 
-    [Fact]
-    public void MatchBehaviourHelper_Convert_RejectOnMatch()
-    {
-        Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 0.0)).IsEqualTo(1.0);
-        Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 0.5)).IsEqualTo(0.0);
-        Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 1.0)).IsEqualTo(0.0);
+        [Fact]
+        public void MatchBehaviourHelper_Convert_RejectOnMatch()
+        {
+            Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 0.0)).IsEqualTo(1.0);
+            Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 0.5)).IsEqualTo(0.0);
+            Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 1.0)).IsEqualTo(0.0);
+        }
     }
-}
+}

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

@@ -3,81 +3,82 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class NotNullOrEmptyMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void NotNullOrEmptyMatcher_GetName()
+    public class NotNullOrEmptyMatcherTests
     {
-        // Act
-        var matcher = new NotNullOrEmptyMatcher();
-        string name = matcher.Name;
+        [Fact]
+        public void NotNullOrEmptyMatcher_GetName()
+        {
+            // Act
+            var matcher = new NotNullOrEmptyMatcher();
+            string name = matcher.Name;
 
-        // Assert
-        Check.That(name).Equals("NotNullOrEmptyMatcher");
-    }
+            // Assert
+            Check.That(name).Equals("NotNullOrEmptyMatcher");
+        }
 
-    [Theory]
-    [InlineData(null, 0.0)]
-    [InlineData(new byte[0], 0.0)]
-    [InlineData(new byte[] { 48 }, 1.0)]
-    public void NotNullOrEmptyMatcher_IsMatch_ByteArray(byte[] data, double expected)
-    {
-        // Act
-        var matcher = new NotNullOrEmptyMatcher();
-        double result = matcher.IsMatch(data);
+        [Theory]
+        [InlineData(null, 0.0)]
+        [InlineData(new byte[0], 0.0)]
+        [InlineData(new byte[] { 48 }, 1.0)]
+        public void NotNullOrEmptyMatcher_IsMatch_ByteArray(byte[] data, double expected)
+        {
+            // Act
+            var matcher = new NotNullOrEmptyMatcher();
+            double result = matcher.IsMatch(data);
 
-        // Assert
-        result.Should().Be(expected);
-    }
+            // Assert
+            result.Should().Be(expected);
+        }
 
-    [Theory]
-    [InlineData(null, 0.0)]
-    [InlineData("", 0.0)]
-    [InlineData("x", 1.0)]
-    public void NotNullOrEmptyMatcher_IsMatch_String(string @string, double expected)
-    {
-        // Act
-        var matcher = new NotNullOrEmptyMatcher();
-        double result = matcher.IsMatch(@string);
+        [Theory]
+        [InlineData(null, 0.0)]
+        [InlineData("", 0.0)]
+        [InlineData("x", 1.0)]
+        public void NotNullOrEmptyMatcher_IsMatch_String(string @string, double expected)
+        {
+            // Act
+            var matcher = new NotNullOrEmptyMatcher();
+            double result = matcher.IsMatch(@string);
 
-        // Assert
-        result.Should().Be(expected);
-    }
+            // Assert
+            result.Should().Be(expected);
+        }
 
-    [Theory]
-    [InlineData(null, 0.0)]
-    [InlineData("", 0.0)]
-    [InlineData("x", 1.0)]
-    public void NotNullOrEmptyMatcher_IsMatch_StringAsObject(string @string, double expected)
-    {
-        // Act
-        var matcher = new NotNullOrEmptyMatcher();
-        double result = matcher.IsMatch((object)@string);
+        [Theory]
+        [InlineData(null, 0.0)]
+        [InlineData("", 0.0)]
+        [InlineData("x", 1.0)]
+        public void NotNullOrEmptyMatcher_IsMatch_StringAsObject(string @string, double expected)
+        {
+            // Act
+            var matcher = new NotNullOrEmptyMatcher();
+            double result = matcher.IsMatch((object)@string);
 
-        // Assert
-        result.Should().Be(expected);
-    }
+            // Assert
+            result.Should().Be(expected);
+        }
 
-    [Fact]
-    public void NotNullOrEmptyMatcher_IsMatch_Json()
-    {
-        // Act
-        var matcher = new NotNullOrEmptyMatcher();
-        double result = matcher.IsMatch(new { x = "x" });
+        [Fact]
+        public void NotNullOrEmptyMatcher_IsMatch_Json()
+        {
+            // Act
+            var matcher = new NotNullOrEmptyMatcher();
+            double result = matcher.IsMatch(new { x = "x" });
 
-        // Assert
-        result.Should().Be(1.0);
-    }
+            // Assert
+            result.Should().Be(1.0);
+        }
 
-    [Fact]
-    public void NotNullOrEmptyMatcher_GetPatterns_Should_Return_EmptyArray()
-    {
-        // Act
-        var patterns = new NotNullOrEmptyMatcher().GetPatterns();
+        [Fact]
+        public void NotNullOrEmptyMatcher_GetPatterns_Should_Return_EmptyArray()
+        {
+            // Act
+            var patterns = new NotNullOrEmptyMatcher().GetPatterns();
 
-        // Assert
-        patterns.Should().BeEmpty();
+            // Assert
+            patterns.Should().BeEmpty();
+        }
     }
 }

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

@@ -4,123 +4,124 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class RegexMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void RegexMatcher_GetName()
+    public class RegexMatcherTests
     {
-        // Assign
-        var matcher = new RegexMatcher("");
+        [Fact]
+        public void RegexMatcher_GetName()
+        {
+            // Assign
+            var matcher = new RegexMatcher("");
 
-        // Act
-        string name = matcher.Name;
+            // Act
+            string name = matcher.Name;
 
-        // Assert
-        Check.That(name).Equals("RegexMatcher");
-    }
+            // Assert
+            Check.That(name).Equals("RegexMatcher");
+        }
 
-    [Fact]
-    public void RegexMatcher_GetPatterns()
-    {
-        // Assign
-        var matcher = new RegexMatcher("X");
+        [Fact]
+        public void RegexMatcher_GetPatterns()
+        {
+            // Assign
+            var matcher = new RegexMatcher("X");
 
-        // Act
-        var patterns = matcher.GetPatterns();
+            // Act
+            var patterns = matcher.GetPatterns();
 
-        // Assert
-        Check.That(patterns).ContainsExactly("X");
-    }
+            // Assert
+            Check.That(patterns).ContainsExactly("X");
+        }
 
-    [Fact]
-    public void RegexMatcher_GetIgnoreCase()
-    {
-        // Act
-        bool case1 = new RegexMatcher("X").IgnoreCase;
-        bool case2 = new RegexMatcher("X", true).IgnoreCase;
+        [Fact]
+        public void RegexMatcher_GetIgnoreCase()
+        {
+            // Act
+            bool case1 = new RegexMatcher("X").IgnoreCase;
+            bool case2 = new RegexMatcher("X", true).IgnoreCase;
 
-        // Assert
-        Check.That(case1).IsFalse();
-        Check.That(case2).IsTrue();
-    }
+            // Assert
+            Check.That(case1).IsFalse();
+            Check.That(case2).IsTrue();
+        }
 
-    [Fact]
-    public void RegexMatcher_IsMatch()
-    {
-        // Assign
-        var matcher = new RegexMatcher("H.*o");
+        [Fact]
+        public void RegexMatcher_IsMatch()
+        {
+            // Assign
+            var matcher = new RegexMatcher("H.*o");
 
-        // Act
-        double result = matcher.IsMatch("Hello world!");
+            // Act
+            double result = matcher.IsMatch("Hello world!");
 
-        // Assert
-        Check.That(result).IsEqualTo(1.0d);
-    }
+            // Assert
+            Check.That(result).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void RegexMatcher_IsMatch_NullInput()
-    {
-        // Assign
-        var matcher = new RegexMatcher("H.*o");
+        [Fact]
+        public void RegexMatcher_IsMatch_NullInput()
+        {
+            // Assign
+            var matcher = new RegexMatcher("H.*o");
 
-        // Act
-        double result = matcher.IsMatch(null);
+            // Act
+            double result = matcher.IsMatch(null);
 
-        // Assert
-        Check.That(result).IsEqualTo(0.0d);
-    }
+            // Assert
+            Check.That(result).IsEqualTo(0.0d);
+        }
 
-    [Fact]
-    public void RegexMatcher_IsMatch_RegexExtended_Guid()
-    {
-        // Assign
-        var matcher = new RegexMatcher(@"\GUIDB", true);
+        [Fact]
+        public void RegexMatcher_IsMatch_RegexExtended_Guid()
+        {
+            // Assign
+            var matcher = new RegexMatcher(@"\GUIDB", true);
 
-        // Act
-        double result = matcher.IsMatch(Guid.NewGuid().ToString("B"));
+            // Act
+            double result = matcher.IsMatch(Guid.NewGuid().ToString("B"));
 
-        // Assert
-        result.Should().Be(1.0);
-    }
+            // Assert
+            result.Should().Be(1.0);
+        }
 
-    [Fact]
-    public void RegexMatcher_IsMatch_Regex_Guid()
-    {
-        // Assign
-        var matcher = new RegexMatcher(@"\GUIDB", true, false, false);
+        [Fact]
+        public void RegexMatcher_IsMatch_Regex_Guid()
+        {
+            // Assign
+            var matcher = new RegexMatcher(@"\GUIDB", true, false, false);
 
-        // Act
-        double result = matcher.IsMatch(Guid.NewGuid().ToString("B"));
+            // Act
+            double result = matcher.IsMatch(Guid.NewGuid().ToString("B"));
 
-        // Assert
-        result.Should().Be(0);
-    }
+            // Assert
+            result.Should().Be(0);
+        }
 
-    [Fact]
-    public void RegexMatcher_IsMatch_IgnoreCase()
-    {
-        // Assign
-        var matcher = new RegexMatcher("H.*o", true);
+        [Fact]
+        public void RegexMatcher_IsMatch_IgnoreCase()
+        {
+            // Assign
+            var matcher = new RegexMatcher("H.*o", true);
 
-        // Act
-        double result = matcher.IsMatch("hello");
+            // Act
+            double result = matcher.IsMatch("hello");
 
-        // Assert
-        Check.That(result).IsEqualTo(1.0d);
-    }
+            // Assert
+            Check.That(result).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void RegexMatcher_IsMatch_RejectOnMatch()
-    {
-        // Assign
-        var matcher = new RegexMatcher(MatchBehaviour.RejectOnMatch, "h.*o");
+        [Fact]
+        public void RegexMatcher_IsMatch_RejectOnMatch()
+        {
+            // Assign
+            var matcher = new RegexMatcher(MatchBehaviour.RejectOnMatch, "h.*o");
 
-        // Act
-        double result = matcher.IsMatch("hello");
+            // Act
+            double result = matcher.IsMatch("hello");
 
-        // Assert
-        Check.That(result).IsEqualTo(0.0);
+            // Assert
+            Check.That(result).IsEqualTo(0.0);
+        }
     }
 }

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

@@ -1,53 +1,54 @@
-using System.Linq;
+using System.Linq;
 using FluentAssertions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class RequestMatchResultTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void CompareTo_WithDifferentAverageScore_ReturnsBestMatch()
+    public class RequestMatchResultTests
     {
-        // Arrange
-        var result1 = new RequestMatchResult();
-        result1.AddScore(typeof(WildcardMatcher), 1);
-        result1.AddScore(typeof(WildcardMatcher), 0.9);
+        [Fact]
+        public void CompareTo_WithDifferentAverageScore_ReturnsBestMatch()
+        {
+            // Arrange
+            var result1 = new RequestMatchResult();
+            result1.AddScore(typeof(WildcardMatcher), 1);
+            result1.AddScore(typeof(WildcardMatcher), 0.9);
 
-        var result2 = new RequestMatchResult();
-        result2.AddScore(typeof(LinqMatcher), 1);
-        result2.AddScore(typeof(LinqMatcher), 1);
+            var result2 = new RequestMatchResult();
+            result2.AddScore(typeof(LinqMatcher), 1);
+            result2.AddScore(typeof(LinqMatcher), 1);
 
-        var results = new[] { result1, result2 };
+            var results = new[] { result1, result2 };
 
-        // Act
-        var best = results.OrderBy(x => x).First();
+            // Act
+            var best = results.OrderBy(x => x).First();
 
-        // Assert
-        best.Should().Be(result2);
-    }
+            // Assert
+            best.Should().Be(result2);
+        }
 
-    [Fact]
-    public void CompareTo_WithSameAverageScoreButMoreMatchers_ReturnsMatchWithMoreMatchers()
-    {
-        // Arrange
-        var result1 = new RequestMatchResult();
-        result1.AddScore(typeof(WildcardMatcher), 1);
-        result1.AddScore(typeof(WildcardMatcher), 1);
+        [Fact]
+        public void CompareTo_WithSameAverageScoreButMoreMatchers_ReturnsMatchWithMoreMatchers()
+        {
+            // Arrange
+            var result1 = new RequestMatchResult();
+            result1.AddScore(typeof(WildcardMatcher), 1);
+            result1.AddScore(typeof(WildcardMatcher), 1);
 
-        var result2 = new RequestMatchResult();
-        result2.AddScore(typeof(LinqMatcher), 1);
-        result2.AddScore(typeof(LinqMatcher), 1);
-        result2.AddScore(typeof(LinqMatcher), 1);
+            var result2 = new RequestMatchResult();
+            result2.AddScore(typeof(LinqMatcher), 1);
+            result2.AddScore(typeof(LinqMatcher), 1);
+            result2.AddScore(typeof(LinqMatcher), 1);
 
-        var results = new[] { result1, result2 };
+            var results = new[] { result1, result2 };
 
-        // Act
-        var best = results.OrderBy(x => x).First();
+            // Act
+            var best = results.OrderBy(x => x).First();
 
-        // Assert
-        best.Should().Be(result2);
+            // Assert
+            best.Should().Be(result2);
+        }
     }
 }

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

@@ -2,85 +2,86 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class SimMetricsMatcherTests
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void SimMetricsMatcher_GetName()
+    public class SimMetricsMatcherTests
     {
-        // Assign
-        var matcher = new SimMetricsMatcher("X");
+        [Fact]
+        public void SimMetricsMatcher_GetName()
+        {
+            // Assign
+            var matcher = new SimMetricsMatcher("X");
 
-        // Act
-        string name = matcher.Name;
+            // Act
+            string name = matcher.Name;
 
-        // Assert
-        Check.That(name).Equals("SimMetricsMatcher.Levenstein");
-    }
+            // Assert
+            Check.That(name).Equals("SimMetricsMatcher.Levenstein");
+        }
 
-    [Fact]
-    public void SimMetricsMatcher_GetPatterns()
-    {
-        // Assign
-        var matcher = new SimMetricsMatcher("X");
+        [Fact]
+        public void SimMetricsMatcher_GetPatterns()
+        {
+            // Assign
+            var matcher = new SimMetricsMatcher("X");
 
-        // Act
-        var patterns = matcher.GetPatterns();
+            // Act
+            var patterns = matcher.GetPatterns();
 
-        // Assert
-        Check.That(patterns).ContainsExactly("X");
-    }
+            // Assert
+            Check.That(patterns).ContainsExactly("X");
+        }
 
-    [Fact]
-    public void SimMetricsMatcher_IsMatch_1()
-    {
-        // Assign
-        var matcher = new SimMetricsMatcher("The cat walks in the street.");
+        [Fact]
+        public void SimMetricsMatcher_IsMatch_1()
+        {
+            // Assign
+            var matcher = new SimMetricsMatcher("The cat walks in the street.");
 
-        // Act
-        double result = matcher.IsMatch("The car drives in the street.");
+            // Act
+            double result = matcher.IsMatch("The car drives in the street.");
 
-        // Assert
-        Check.That(result).IsStrictlyLessThan(1.0).And.IsStrictlyGreaterThan(0.5);
-    }
+            // Assert
+            Check.That(result).IsStrictlyLessThan(1.0).And.IsStrictlyGreaterThan(0.5);
+        }
 
-    [Fact]
-    public void SimMetricsMatcher_IsMatch_2()
-    {
-        // Assign
-        var matcher = new SimMetricsMatcher("The cat walks in the street.");
+        [Fact]
+        public void SimMetricsMatcher_IsMatch_2()
+        {
+            // Assign
+            var matcher = new SimMetricsMatcher("The cat walks in the street.");
 
-        // Act
-        double result = matcher.IsMatch("Hello");
+            // Act
+            double result = matcher.IsMatch("Hello");
 
-        // Assert
-        Check.That(result).IsStrictlyLessThan(0.1).And.IsStrictlyGreaterThan(0.05);
-    }
+            // Assert
+            Check.That(result).IsStrictlyLessThan(0.1).And.IsStrictlyGreaterThan(0.05);
+        }
 
-    [Fact]
-    public void SimMetricsMatcher_IsMatch_AcceptOnMatch()
-    {
-        // Assign
-        var matcher = new SimMetricsMatcher("test");
+        [Fact]
+        public void SimMetricsMatcher_IsMatch_AcceptOnMatch()
+        {
+            // Assign
+            var matcher = new SimMetricsMatcher("test");
 
-        // Act
-        double result = matcher.IsMatch("test");
+            // Act
+            double result = matcher.IsMatch("test");
 
-        // Assert
-        Check.That(result).IsEqualTo(1.0);
-    }
+            // Assert
+            Check.That(result).IsEqualTo(1.0);
+        }
 
-    [Fact]
-    public void SimMetricsMatcher_IsMatch_RejectOnMatch()
-    {
-        // Assign
-        var matcher = new SimMetricsMatcher(MatchBehaviour.RejectOnMatch, "test");
+        [Fact]
+        public void SimMetricsMatcher_IsMatch_RejectOnMatch()
+        {
+            // Assign
+            var matcher = new SimMetricsMatcher(MatchBehaviour.RejectOnMatch, "test");
 
-        // Act
-        double result = matcher.IsMatch("test");
+            // Act
+            double result = matcher.IsMatch("test");
 
-        // Assert
-        Check.That(result).IsEqualTo(0.0);
+            // Assert
+            Check.That(result).IsEqualTo(0.0);
+        }
     }
 }

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

@@ -5,134 +5,135 @@ using WireMock.Matchers;
 using WireMock.Models;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers;
-
-public class WildcardMatcherTest
+namespace WireMock.Net.Tests.Matchers
 {
-    [Fact]
-    public void WildcardMatcher_IsMatch_With_StringPattern()
+    public class WildcardMatcherTest
     {
-        // Arrange
-        var pattern = new StringPattern
+        [Fact]
+        public void WildcardMatcher_IsMatch_With_StringPattern()
         {
-            Pattern = "*",
-            PatternAsFile = "pf"
-        };
+            // Arrange
+            var pattern = new StringPattern
+            {
+                Pattern = "*",
+                PatternAsFile = "pf"
+            };
 
-        // Act
-        var matcher = new WildcardMatcher(pattern);
+            // Act
+            var matcher = new WildcardMatcher(pattern);
 
-        // Assert
-        matcher.IsMatch("a").Should().Be(1.0d);
-    }
-
-    [Fact]
-    public void WildcardMatcher_IsMatch_With_StringPatterns()
-    {
-        // Arrange
-        AnyOf<string, StringPattern> pattern1 = new StringPattern
-        {
-            Pattern = "a"
-        };
-        AnyOf<string, StringPattern> pattern2 = new StringPattern
-        {
-            Pattern = "b"
-        };
-
-        // Act
-        var matcher = new WildcardMatcher(new [] { pattern1, pattern2 });
-
-        // Assert
-        matcher.IsMatch("a").Should().Be(1.0d);
-    }
-
-    [Fact]
-    public void WildcardMatcher_IsMatch_Positive()
-    {
-        var tests = new[]
-        {
-            new { p = "*", i = "" },
-            new { p = "?", i = " "},
-            new { p = "*", i = "a "},
-            new { p = "*", i = "ab" },
-            new { p = "?", i = "a" },
-            new { p = "*?", i = "abc" },
-            new { p = "?*", i = "abc" },
-            new { p = "abc", i = "abc" },
-            new { p = "abc*", i = "abc" },
-            new { p = "abc*", i = "abcd" },
-            new { p = "*abc*", i = "abc" },
-            new { p = "*a*bc*", i = "abc" },
-            new { p = "*a*b?", i = "aXXXbc" }
-        };
-
-        foreach (var test in tests)
-        {
-            var matcher = new WildcardMatcher(test.p);
-            matcher.IsMatch(test.i).Should().Be(1.0d, $"Pattern '{test.p}' with value '{test.i}' should be 1.0");
+            // Assert
+            matcher.IsMatch("a").Should().Be(1.0d);
         }
-    }
 
-    [Fact]
-    public void WildcardMatcher_IsMatch_Negative()
-    {
-        var tests = new[]
+        [Fact]
+        public void WildcardMatcher_IsMatch_With_StringPatterns()
         {
-            new { p = "*a", i = "" },
-            new { p = "a*", i = "" },
-            new { p = "?", i = "" },
-            new { p = "*b*", i = "a" },
-            new { p = "b*a", i = "ab" },
-            new { p = "??", i = "a" },
-            new { p = "*?", i = "" },
-            new { p = "??*", i = "a" },
-            new { p = "*abc", i = "abX" },
-            new { p = "*abc*", i = "Xbc" },
-            new { p = "*a*bc*", i = "ac" }
-        };
+            // Arrange
+            AnyOf<string, StringPattern> pattern1 = new StringPattern
+            {
+                Pattern = "a"
+            };
+            AnyOf<string, StringPattern> pattern2 = new StringPattern
+            {
+                Pattern = "b"
+            };
 
-        foreach (var test in tests)
-        {
-            var matcher = new WildcardMatcher(test.p);
-            Check.That(matcher.IsMatch(test.i)).IsEqualTo(0.0);
+            // Act
+            var matcher = new WildcardMatcher(new [] { pattern1, pattern2 });
+
+            // Assert
+            matcher.IsMatch("a").Should().Be(1.0d);
         }
-    }
 
-    [Fact]
-    public void WildcardMatcher_GetName()
-    {
-        // Assign
-        var matcher = new WildcardMatcher("x");
+        [Fact]
+        public void WildcardMatcher_IsMatch_Positive()
+        {
+            var tests = new[]
+            {
+                new { p = "*", i = "" },
+                new { p = "?", i = " "},
+                new { p = "*", i = "a "},
+                new { p = "*", i = "ab" },
+                new { p = "?", i = "a" },
+                new { p = "*?", i = "abc" },
+                new { p = "?*", i = "abc" },
+                new { p = "abc", i = "abc" },
+                new { p = "abc*", i = "abc" },
+                new { p = "abc*", i = "abcd" },
+                new { p = "*abc*", i = "abc" },
+                new { p = "*a*bc*", i = "abc" },
+                new { p = "*a*b?", i = "aXXXbc" }
+            };
 
-        // Act
-        string name = matcher.Name;
+            foreach (var test in tests)
+            {
+                var matcher = new WildcardMatcher(test.p);
+                matcher.IsMatch(test.i).Should().Be(1.0d, $"Pattern '{test.p}' with value '{test.i}' should be 1.0");
+            }
+        }
 
-        // Assert
-        Check.That(name).Equals("WildcardMatcher");
-    }
+        [Fact]
+        public void WildcardMatcher_IsMatch_Negative()
+        {
+            var tests = new[]
+            {
+                new { p = "*a", i = "" },
+                new { p = "a*", i = "" },
+                new { p = "?", i = "" },
+                new { p = "*b*", i = "a" },
+                new { p = "b*a", i = "ab" },
+                new { p = "??", i = "a" },
+                new { p = "*?", i = "" },
+                new { p = "??*", i = "a" },
+                new { p = "*abc", i = "abX" },
+                new { p = "*abc*", i = "Xbc" },
+                new { p = "*a*bc*", i = "ac" }
+            };
 
-    [Fact]
-    public void WildcardMatcher_GetPatterns()
-    {
-        // Assign
-        var matcher = new WildcardMatcher("x");
+            foreach (var test in tests)
+            {
+                var matcher = new WildcardMatcher(test.p);
+                Check.That(matcher.IsMatch(test.i)).IsEqualTo(0.0);
+            }
+        }
 
-        // Act
-        var patterns = matcher.GetPatterns();
+        [Fact]
+        public void WildcardMatcher_GetName()
+        {
+            // Assign
+            var matcher = new WildcardMatcher("x");
 
-        // Assert
-        Check.That(patterns).ContainsExactly(new AnyOf<string, StringPattern>("x"));
-    }
+            // Act
+            string name = matcher.Name;
 
-    [Fact]
-    public void WildcardMatcher_IsMatch_RejectOnMatch()
-    {
-        // Assign
-        var matcher = new WildcardMatcher(MatchBehaviour.RejectOnMatch, "m");
+            // Assert
+            Check.That(name).Equals("WildcardMatcher");
+        }
 
-        // Act
-        double result = matcher.IsMatch("m");
+        [Fact]
+        public void WildcardMatcher_GetPatterns()
+        {
+            // Assign
+            var matcher = new WildcardMatcher("x");
 
-        Check.That(result).IsEqualTo(0.0);
+            // Act
+            var patterns = matcher.GetPatterns();
+
+            // Assert
+            Check.That(patterns).ContainsExactly(new AnyOf<string, StringPattern>("x"));
+        }
+
+        [Fact]
+        public void WildcardMatcher_IsMatch_RejectOnMatch()
+        {
+            // Assign
+            var matcher = new WildcardMatcher(MatchBehaviour.RejectOnMatch, "m");
+
+            // Act
+            double result = matcher.IsMatch("m");
+
+            Check.That(result).IsEqualTo(0.0);
+        }
     }
 }

test/WireMock.Net.Tests/ObservableLogEntriesTest.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using FluentAssertions;
 using Moq;
 using NFluent;
 using WireMock.Logging;
@@ -16,142 +14,101 @@ using WireMock.Server;
 using WireMock.Settings;
 using Xunit;
 
-namespace WireMock.Net.Tests;
-
-public class ObservableLogEntriesTest
+namespace WireMock.Net.Tests
 {
-    [Fact]
-    public async Task WireMockServer_LogEntriesChanged_WithException_Should_LogError()
+    public class ObservableLogEntriesTest
     {
-        // Assign
-        string path = $"/log_{Guid.NewGuid()}";
-        var loggerMock = new Mock<IWireMockLogger>();
-        loggerMock.Setup(l => l.Error(It.IsAny<string>(), It.IsAny<object[]>()));
-        var settings = new WireMockServerSettings
+        [Fact]
+        public async Task WireMockServer_LogEntriesChanged_WithException_Should_LogError()
         {
-            Logger = loggerMock.Object
-        };
-        var server = WireMockServer.Start(settings);
+            // Assign
+            string path = $"/log_{Guid.NewGuid()}";
+            var loggerMock = new Mock<IWireMockLogger>();
+            loggerMock.Setup(l => l.Error(It.IsAny<string>(), It.IsAny<object[]>()));
+            var settings = new WireMockServerSettings
+            {
+                Logger = loggerMock.Object
+            };
+            var server = WireMockServer.Start(settings);
 
-        server
-            .Given(Request.Create()
-                .WithPath(path)
-                .UsingGet())
-            .RespondWith(Response.Create()
-                .WithBody(@"{ msg: ""Hello world!""}"));
+            server
+                .Given(Request.Create()
+                    .WithPath(path)
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ msg: ""Hello world!""}"));
 
-        server.LogEntriesChanged += (sender, args) => throw new Exception();
+            server.LogEntriesChanged += (sender, args) => throw new Exception();
 
-        // Act
-        await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false);
+            // Act
+            await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false);
 
-        // Assert
-        loggerMock.Verify(l => l.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
-    }
-
-    [Fact]
-    public async Task WireMockServer_LogEntriesChanged()
-    {
-        // Assign
-        string path = $"/log_{Guid.NewGuid()}";
-        var server = WireMockServer.Start();
-
-        server
-            .Given(Request.Create()
-                .WithPath(path)
-                .UsingGet())
-            .RespondWith(Response.Create()
-                .WithBody(@"{ msg: ""Hello world!""}"));
-
-        int count = 0;
-        server.LogEntriesChanged += (sender, args) => count++;
-
-        // Act 1a
-        await server.CreateClient().GetAsync(path).ConfigureAwait(false);
-
-        // Act 1b
-        await server.CreateClient().GetAsync(path).ConfigureAwait(false);
-
-        // Assert
-        count.Should().Be(2);
-
-        server.Dispose();
-    }
-
-    [Fact]
-    public async Task WireMockServer_LogEntriesChanged_Add_And_Remove_EventHandler()
-    {
-        // Assign
-        string path = $"/log_{Guid.NewGuid()}";
-        var server = WireMockServer.Start();
-
-        server
-            .Given(Request.Create()
-                .WithPath(path)
-                .UsingGet())
-            .RespondWith(Response.Create()
-                .WithBody(@"{ msg: ""Hello world!""}"));
-
-        int count = 0;
-
-        void OnServerOnLogEntriesChanged(object sender, NotifyCollectionChangedEventArgs args) => count++;
-
-        // Add Handler
-        server.LogEntriesChanged += OnServerOnLogEntriesChanged;
-
-        // Act 1
-        await server.CreateClient().GetAsync(path).ConfigureAwait(false);
-
-        // Assert 1
-        count.Should().Be(1);
-
-        // Remove Handler
-        server.LogEntriesChanged -= OnServerOnLogEntriesChanged;
-
-        // Act 2
-        await server.CreateClient().GetAsync(path).ConfigureAwait(false);
-
-        // Assert 2
-        count.Should().Be(1);
-
-        server.Dispose();
-    }
-
-    [Fact]
-    public async Task WireMockServer_LogEntriesChanged_Parallel()
-    {
-        int expectedCount = 10;
-
-        // Assign
-        string path = $"/log_p_{Guid.NewGuid()}";
-        var server = WireMockServer.Start();
-
-        server
-            .Given(Request.Create()
-                .WithPath(path)
-                .UsingGet())
-            .RespondWith(Response.Create()
-                .WithSuccess());
-
-        int count = 0;
-        server.LogEntriesChanged += (sender, args) => count++;
-
-        var http = new HttpClient();
-
-        // Act
-        var listOfTasks = new List<Task<HttpResponseMessage>>();
-        for (var i = 0; i < expectedCount; i++)
-        {
-            Thread.Sleep(50);
-            listOfTasks.Add(http.GetAsync($"{server.Urls[0]}{path}"));
+            // Assert
+            loggerMock.Verify(l => l.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
         }
-        var responses = await Task.WhenAll(listOfTasks).ConfigureAwait(false);
-        var countResponsesWithStatusNotOk = responses.Count(r => r.StatusCode != HttpStatusCode.OK);
 
-        // Assert
-        Check.That(countResponsesWithStatusNotOk).Equals(0);
-        Check.That(count).Equals(expectedCount);
+        [Fact]
+        public async Task WireMockServer_LogEntriesChanged()
+        {
+            // Assign
+            string path = $"/log_{Guid.NewGuid()}";
+            var server = WireMockServer.Start();
 
-        server.Dispose();
+            server
+                .Given(Request.Create()
+                    .WithPath(path)
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ msg: ""Hello world!""}"));
+
+            int count = 0;
+            server.LogEntriesChanged += (sender, args) => count++;
+
+            // Act
+            await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false);
+
+            // Assert
+            Check.That(count).Equals(1);
+
+            server.Dispose();
+        }
+
+        [Fact]
+        public async Task WireMockServer_LogEntriesChanged_Parallel()
+        {
+            int expectedCount = 10;
+
+            // Assign
+            string path = $"/log_p_{Guid.NewGuid()}";
+            var server = WireMockServer.Start();
+
+            server
+                .Given(Request.Create()
+                    .WithPath(path)
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithSuccess());
+
+            int count = 0;
+            server.LogEntriesChanged += (sender, args) => count++;
+
+            var http = new HttpClient();
+
+            // Act
+            var listOfTasks = new List<Task<HttpResponseMessage>>();
+            for (var i = 0; i < expectedCount; i++)
+            {
+                Thread.Sleep(50);
+                listOfTasks.Add(http.GetAsync($"{server.Urls[0]}{path}"));
+            }
+            var responses = await Task.WhenAll(listOfTasks).ConfigureAwait(false);
+            var countResponsesWithStatusNotOk = responses.Count(r => r.StatusCode != HttpStatusCode.OK);
+
+            // Assert
+            Check.That(countResponsesWithStatusNotOk).Equals(0);
+            Check.That(count).Equals(expectedCount);
+
+            server.Dispose();
+        }
     }
 }

test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs

@@ -3,97 +3,98 @@ using NFluent;
 using WireMock.RegularExpressions;
 using Xunit;
 
-namespace WireMock.Net.Tests.RegularExpressions;
-
-public class RegexExtendedTests
+namespace WireMock.Net.Tests.RegularExpressions
 {
-    /// <summary>
-    /// Input guid used for testing
-    /// </summary>
-    public Guid InputGuid => Guid.NewGuid();
-
-    [Fact]
-    public void RegexExtended_GuidB_Pattern()
+    public class RegexExtendedTests
     {
-        var guidbUpper = @".*\GUIDB.*";
-        var guidbLower = @".*\guidb.*";
+        /// <summary>
+        /// Input guid used for testing
+        /// </summary>
+        public Guid InputGuid => Guid.NewGuid();
 
-        var inputLower = InputGuid.ToString("B");
-        var inputUpper = InputGuid.ToString("B").ToUpper();
-        var regexLower = new RegexExtended(guidbLower);
-        var regexUpper = new RegexExtended(guidbUpper);
+        [Fact]
+        public void RegexExtended_GuidB_Pattern()
+        {
+            var guidbUpper = @".*\GUIDB.*";
+            var guidbLower = @".*\guidb.*";
 
-        Check.That(regexLower.IsMatch(inputLower)).Equals(true);
-        Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
-        Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
-        Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+            var inputLower = InputGuid.ToString("B");
+            var inputUpper = InputGuid.ToString("B").ToUpper();
+            var regexLower = new RegexExtended(guidbLower);
+            var regexUpper = new RegexExtended(guidbUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+
+        [Fact]
+        public void RegexExtended_GuidD_Pattern()
+        {
+            var guiddUpper = @".*\GUIDD.*";
+            var guiddLower = @".*\guidd.*";
+
+            var inputLower = InputGuid.ToString("D");
+            var inputUpper = InputGuid.ToString("D").ToUpper();
+            var regexLower = new RegexExtended(guiddLower);
+            var regexUpper = new RegexExtended(guiddUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+
+        [Fact]
+        public void RegexExtended_GuidN_Pattern()
+        {
+            var guidnUpper = @".*\GUIDN.*";
+            var guidnLower = @".*\guidn.*";
+
+            var inputLower = InputGuid.ToString("N");
+            var inputUpper = InputGuid.ToString("N").ToUpper();
+            var regexLower = new RegexExtended(guidnLower);
+            var regexUpper = new RegexExtended(guidnUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+
+        [Fact]
+        public void RegexExtended_GuidP_Pattern()
+        {
+            var guidpUpper = @".*\GUIDP.*";
+            var guidpLower = @".*\guidp.*";
+
+            var inputLower = InputGuid.ToString("P");
+            var inputUpper = InputGuid.ToString("P").ToUpper();
+            var regexLower = new RegexExtended(guidpLower);
+            var regexUpper = new RegexExtended(guidpUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+
+        [Fact]
+        public void RegexExtended_GuidX_Pattern()
+        {
+            var guidxUpper = @".*\GUIDX.*";
+            var guidxLower = @".*\guidx.*";
+
+            var inputLower = InputGuid.ToString("X");
+            var inputUpper = InputGuid.ToString("X").ToUpper().Replace("X", "x");
+            var regexLower = new RegexExtended(guidxLower);
+            var regexUpper = new RegexExtended(guidxUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
     }
-
-    [Fact]
-    public void RegexExtended_GuidD_Pattern()
-    {
-        var guiddUpper = @".*\GUIDD.*";
-        var guiddLower = @".*\guidd.*";
-
-        var inputLower = InputGuid.ToString("D");
-        var inputUpper = InputGuid.ToString("D").ToUpper();
-        var regexLower = new RegexExtended(guiddLower);
-        var regexUpper = new RegexExtended(guiddUpper);
-
-        Check.That(regexLower.IsMatch(inputLower)).Equals(true);
-        Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
-        Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
-        Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
-    }
-
-    [Fact]
-    public void RegexExtended_GuidN_Pattern()
-    {
-        var guidnUpper = @".*\GUIDN.*";
-        var guidnLower = @".*\guidn.*";
-
-        var inputLower = InputGuid.ToString("N");
-        var inputUpper = InputGuid.ToString("N").ToUpper();
-        var regexLower = new RegexExtended(guidnLower);
-        var regexUpper = new RegexExtended(guidnUpper);
-
-        Check.That(regexLower.IsMatch(inputLower)).Equals(true);
-        Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
-        Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
-        Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
-    }
-
-    [Fact]
-    public void RegexExtended_GuidP_Pattern()
-    {
-        var guidpUpper = @".*\GUIDP.*";
-        var guidpLower = @".*\guidp.*";
-
-        var inputLower = InputGuid.ToString("P");
-        var inputUpper = InputGuid.ToString("P").ToUpper();
-        var regexLower = new RegexExtended(guidpLower);
-        var regexUpper = new RegexExtended(guidpUpper);
-
-        Check.That(regexLower.IsMatch(inputLower)).Equals(true);
-        Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
-        Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
-        Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
-    }
-
-    [Fact]
-    public void RegexExtended_GuidX_Pattern()
-    {
-        var guidxUpper = @".*\GUIDX.*";
-        var guidxLower = @".*\guidx.*";
-
-        var inputLower = InputGuid.ToString("X");
-        var inputUpper = InputGuid.ToString("X").ToUpper().Replace("X", "x");
-        var regexLower = new RegexExtended(guidxLower);
-        var regexUpper = new RegexExtended(guidxUpper);
-
-        Check.That(regexLower.IsMatch(inputLower)).Equals(true);
-        Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
-        Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
-        Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
-    }
-}
+}

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

@@ -1,77 +1,78 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders;
-
-public class RequestBuilderUsingMethodTests
+namespace WireMock.Net.Tests.RequestBuilders
 {
-    [Fact]
-    public void RequestBuilder_UsingConnect()
+    public class RequestBuilderUsingMethodTests
     {
-        // Act
-        var requestBuilder = (Request)Request.Create().UsingConnect();
+        [Fact]
+        public void RequestBuilder_UsingConnect()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().UsingConnect();
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("CONNECT");
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("CONNECT");
+        }
 
-    [Fact]
-    public void RequestBuilder_UsingOptions()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().UsingOptions();
+        [Fact]
+        public void RequestBuilder_UsingOptions()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().UsingOptions();
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("OPTIONS");
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("OPTIONS");
+        }
 
-    [Fact]
-    public void RequestBuilder_UsingPatch()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().UsingPatch();
+        [Fact]
+        public void RequestBuilder_UsingPatch()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().UsingPatch();
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("PATCH");
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("PATCH");
+        }
 
-    [Fact]
-    public void RequestBuilder_UsingTrace()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().UsingTrace();
+        [Fact]
+        public void RequestBuilder_UsingTrace()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().UsingTrace();
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("TRACE");
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("TRACE");
+        }
 
-    [Fact]
-    public void RequestBuilder_UsingAnyMethod_ClearsAllOtherMatches()
-    {
-        // Assign
-        var requestBuilder = (Request)Request.Create().UsingGet();
+        [Fact]
+        public void RequestBuilder_UsingAnyMethod_ClearsAllOtherMatches()
+        {
+            // Assign
+            var requestBuilder = (Request)Request.Create().UsingGet();
 
-        // Assert 1
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageMethodMatcher));
+            // Assert 1
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageMethodMatcher));
 
-        // Act
-        requestBuilder.UsingAnyMethod();
+            // Act
+            requestBuilder.UsingAnyMethod();
 
-        // Assert 2
-        matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(0);
+            // Assert 2
+            matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(0);
+        }
     }
 }

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using System.Collections.Generic;
 using System.Linq;
 using WireMock.Matchers;
@@ -6,38 +6,39 @@ using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders;
-
-public class RequestBuilderWithBodyTests
+namespace WireMock.Net.Tests.RequestBuilders
 {
-    [Fact]
-    public void RequestBuilder_WithBody_IMatcher()
+    public class RequestBuilderWithBodyTests
     {
-        // Assign
-        var matcher = new WildcardMatcher("x");
+        [Fact]
+        public void RequestBuilder_WithBody_IMatcher()
+        {
+            // Assign
+            var matcher = new WildcardMatcher("x");
 
-        // Act
-        var requestBuilder = (Request)Request.Create().WithBody(matcher);
+            // Act
+            var requestBuilder = (Request)Request.Create().WithBody(matcher);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        matchers.Should().HaveCount(1);
-        ((RequestMessageBodyMatcher)matchers[0]).Matchers.Should().Contain(matcher);
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            matchers.Should().HaveCount(1);
+            ((RequestMessageBodyMatcher)matchers[0]).Matchers.Should().Contain(matcher);
+        }
 
-    [Fact]
-    public void RequestBuilder_WithBody_IMatchers()
-    {
-        // Assign
-        var matcher1 = new WildcardMatcher("x");
-        var matcher2 = new WildcardMatcher("y");
+        [Fact]
+        public void RequestBuilder_WithBody_IMatchers()
+        {
+            // Assign
+            var matcher1 = new WildcardMatcher("x");
+            var matcher2 = new WildcardMatcher("y");
 
-        // Act
-        var requestBuilder = (Request)Request.Create().WithBody(new[] { matcher1, matcher2 }.Cast<IMatcher>().ToArray());
+            // Act
+            var requestBuilder = (Request)Request.Create().WithBody(new[] { matcher1, matcher2 }.Cast<IMatcher>().ToArray());
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        matchers.Should().HaveCount(1);
-        ((RequestMessageBodyMatcher)matchers[0]).Matchers.Should().Contain(new[] { matcher1, matcher2 });
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            matchers.Should().HaveCount(1);
+            ((RequestMessageBodyMatcher)matchers[0]).Matchers.Should().Contain(new[] { matcher1, matcher2 });
+        }
     }
 }

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

@@ -1,47 +1,48 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders;
-
-public class RequestBuilderWithCookieTests
+namespace WireMock.Net.Tests.RequestBuilders
 {
-    [Fact]
-    public void RequestBuilder_WithCookie_String_String_Bool_MatchBehaviour()
+    public class RequestBuilderWithCookieTests
     {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithCookie("c", "t", true, MatchBehaviour.AcceptOnMatch);
+        [Fact]
+        public void RequestBuilder_WithCookie_String_String_Bool_MatchBehaviour()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithCookie("c", "t", true, MatchBehaviour.AcceptOnMatch);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithCookie_String_IStringMatcher()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithCookie("c", new ExactMatcher("v"));
+        [Fact]
+        public void RequestBuilder_WithCookie_String_IStringMatcher()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithCookie("c", new ExactMatcher("v"));
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithCookie_FuncIDictionary()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithCookie((IDictionary<string, string> x) => true);
+        [Fact]
+        public void RequestBuilder_WithCookie_FuncIDictionary()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithCookie((IDictionary<string, string> x) => true);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
+        }
     }
 }

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

@@ -1,83 +1,84 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders;
-
-public class RequestBuilderWithHeaderTests
+namespace WireMock.Net.Tests.RequestBuilders
 {
-    [Fact]
-    public void RequestBuilder_WithHeader_String_String_MatchBehaviour()
+    public class RequestBuilderWithHeaderTests
     {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithHeader("h", "t", MatchBehaviour.AcceptOnMatch);
+        [Fact]
+        public void RequestBuilder_WithHeader_String_String_MatchBehaviour()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithHeader("h", "t", MatchBehaviour.AcceptOnMatch);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithHeader_String_String_Bool_MatchBehaviour()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithHeader("h", "t", true, MatchBehaviour.AcceptOnMatch);
+        [Fact]
+        public void RequestBuilder_WithHeader_String_String_Bool_MatchBehaviour()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithHeader("h", "t", true, MatchBehaviour.AcceptOnMatch);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithHeader_String_Strings_MatchBehaviour()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithHeader("h", new[] { "t1", "t2" }, MatchBehaviour.AcceptOnMatch);
+        [Fact]
+        public void RequestBuilder_WithHeader_String_Strings_MatchBehaviour()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithHeader("h", new[] { "t1", "t2" }, MatchBehaviour.AcceptOnMatch);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithHeader_String_Strings_Bool_MatchBehaviour()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithHeader("h", new[] { "t1", "t2" }, true, MatchBehaviour.AcceptOnMatch);
+        [Fact]
+        public void RequestBuilder_WithHeader_String_Strings_Bool_MatchBehaviour()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithHeader("h", new[] { "t1", "t2" }, true, MatchBehaviour.AcceptOnMatch);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithHeader_String_IStringMatcher()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithHeader("h", new ExactMatcher("v"));
+        [Fact]
+        public void RequestBuilder_WithHeader_String_IStringMatcher()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithHeader("h", new ExactMatcher("v"));
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithHeader_FuncIDictionary()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithHeader(x => true);
+        [Fact]
+        public void RequestBuilder_WithHeader_FuncIDictionary()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithHeader(x => true);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
+        }
     }
 }

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

@@ -1,59 +1,60 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders;
-
-public class RequestBuilderWithParamTests
+namespace WireMock.Net.Tests.RequestBuilders
 {
-    [Fact]
-    public void RequestBuilder_WithParam_String_MatchBehaviour()
+    public class RequestBuilderWithParamTests
     {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithParam("p", MatchBehaviour.AcceptOnMatch);
+        [Fact]
+        public void RequestBuilder_WithParam_String_MatchBehaviour()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithParam("p", MatchBehaviour.AcceptOnMatch);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithParam_String_Strings()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithParam("p", new[] { "v1", "v2" });
+        [Fact]
+        public void RequestBuilder_WithParam_String_Strings()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithParam("p", new[] { "v1", "v2" });
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithParam_String_IStringMatcher()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithParam("p", new RegexMatcher("[012]"));
+        [Fact]
+        public void RequestBuilder_WithParam_String_IStringMatcher()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithParam("p", new RegexMatcher("[012]"));
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithParam_String_MatchBehaviour_IExactMatcher()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithParam("p", MatchBehaviour.AcceptOnMatch, new ExactMatcher("v"));
+        [Fact]
+        public void RequestBuilder_WithParam_String_MatchBehaviour_IExactMatcher()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithParam("p", MatchBehaviour.AcceptOnMatch, new ExactMatcher("v"));
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
+        }
     }
 }

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

@@ -5,55 +5,56 @@ using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders;
-
-public class RequestBuilderWithUrlTests
+namespace WireMock.Net.Tests.RequestBuilders
 {
-    [Fact]
-    public void RequestBuilder_WithUrl_Strings()
+    public class RequestBuilderWithUrlTests
     {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithUrl("http://a", "http://b");
+        [Fact]
+        public void RequestBuilder_WithUrl_Strings()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithUrl("http://a", "http://b");
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithUrl_MatchBehaviour_Strings()
-    {
-        // Act
-        var requestBuilder = (Request)Request.Create().WithUrl(MatchOperator.Or, "http://a", "http://b");
+        [Fact]
+        public void RequestBuilder_WithUrl_MatchBehaviour_Strings()
+        {
+            // Act
+            var requestBuilder = (Request)Request.Create().WithUrl(MatchOperator.Or, "http://a", "http://b");
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithUrl_Funcs()
-    {
-        // Act
-        var requestBuilder = (Request) Request.Create().WithUrl(url => true, url => false);
+        [Fact]
+        public void RequestBuilder_WithUrl_Funcs()
+        {
+            // Act
+            var requestBuilder = (Request) Request.Create().WithUrl(url => true, url => false);
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
-    }
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+        }
 
-    [Fact]
-    public void RequestBuilder_WithUrl_IStringMatchers()
-    {
-        // Act
-        var requestBuilder = (Request) Request.Create().WithUrl(new ExactMatcher("http://a"), new ExactMatcher("http://b"));
+        [Fact]
+        public void RequestBuilder_WithUrl_IStringMatchers()
+        {
+            // Act
+            var requestBuilder = (Request) Request.Create().WithUrl(new ExactMatcher("http://a"), new ExactMatcher("http://b"));
 
-        // Assert
-        var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-        Check.That(matchers.Count).IsEqualTo(1);
-        Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+            // Assert
+            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
+        }
     }
 }

test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Moq;
 using NFluent;
@@ -6,77 +6,78 @@ using WireMock.Matchers.Request;
 using WireMock.Models;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestMatchers;
-
-public class RequestMessageCompositeMatcherTests
+namespace WireMock.Net.Tests.RequestMatchers
 {
-    private class Helper : RequestMessageCompositeMatcher
+    public class RequestMessageCompositeMatcherTests
     {
-        public Helper(IEnumerable<IRequestMatcher> requestMatchers, CompositeMatcherType type = CompositeMatcherType.And) : base(requestMatchers, type)
+        private class Helper : RequestMessageCompositeMatcher
         {
+            public Helper(IEnumerable<IRequestMatcher> requestMatchers, CompositeMatcherType type = CompositeMatcherType.And) : base(requestMatchers, type)
+            {
+            }
+        }
+
+        [Fact]
+        public void RequestMessageCompositeMatcher_GetMatchingScore_EmptyArray()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
+            var matcher = new Helper(Enumerable.Empty<IRequestMatcher>());
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(0.0d);
+        }
+
+        [Fact]
+        public void RequestMessageCompositeMatcher_GetMatchingScore_CompositeMatcherType_And()
+        {
+            // Assign
+            var requestMatcher1Mock = new Mock<IRequestMatcher>();
+            requestMatcher1Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(1.0d);
+            var requestMatcher2Mock = new Mock<IRequestMatcher>();
+            requestMatcher2Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(0.8d);
+
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
+            var matcher = new Helper(new[] { requestMatcher1Mock.Object, requestMatcher2Mock.Object });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(0.9d);
+
+            // Verify
+            requestMatcher1Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
+            requestMatcher2Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
+        }
+
+        [Fact]
+        public void RequestMessageCompositeMatcher_GetMatchingScore_CompositeMatcherType_Or()
+        {
+            // Assign
+            var requestMatcher1Mock = new Mock<IRequestMatcher>();
+            requestMatcher1Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(1.0d);
+            var requestMatcher2Mock = new Mock<IRequestMatcher>();
+            requestMatcher2Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(0.8d);
+
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
+            var matcher = new Helper(new[] { requestMatcher1Mock.Object, requestMatcher2Mock.Object }, CompositeMatcherType.Or);
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+
+            // Verify
+            requestMatcher1Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
+            requestMatcher2Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
         }
     }
-
-    [Fact]
-    public void RequestMessageCompositeMatcher_GetMatchingScore_EmptyArray()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
-        var matcher = new Helper(Enumerable.Empty<IRequestMatcher>());
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(0.0d);
-    }
-
-    [Fact]
-    public void RequestMessageCompositeMatcher_GetMatchingScore_CompositeMatcherType_And()
-    {
-        // Assign
-        var requestMatcher1Mock = new Mock<IRequestMatcher>();
-        requestMatcher1Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(1.0d);
-        var requestMatcher2Mock = new Mock<IRequestMatcher>();
-        requestMatcher2Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(0.8d);
-
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
-        var matcher = new Helper(new[] { requestMatcher1Mock.Object, requestMatcher2Mock.Object });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(0.9d);
-
-        // Verify
-        requestMatcher1Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
-        requestMatcher2Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
-    }
-
-    [Fact]
-    public void RequestMessageCompositeMatcher_GetMatchingScore_CompositeMatcherType_Or()
-    {
-        // Assign
-        var requestMatcher1Mock = new Mock<IRequestMatcher>();
-        requestMatcher1Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(1.0d);
-        var requestMatcher2Mock = new Mock<IRequestMatcher>();
-        requestMatcher2Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(0.8d);
-
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
-        var matcher = new Helper(new[] { requestMatcher1Mock.Object, requestMatcher2Mock.Object }, CompositeMatcherType.Or);
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-
-        // Verify
-        requestMatcher1Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
-        requestMatcher2Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
-    }
-}
+}

test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs

@@ -1,153 +1,154 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestMatchers;
-
-public class RequestMessageCookieMatcherTests
+namespace WireMock.Net.Tests.RequestMatchers
 {
-    [Fact]
-    public void RequestMessageCookieMatcher_GetMatchingScore_AcceptOnMatch_CookieDoesNotExists()
+    public class RequestMessageCookieMatcherTests
     {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "c", false, "x");
+        [Fact]
+        public void RequestMessageCookieMatcher_GetMatchingScore_AcceptOnMatch_CookieDoesNotExists()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "c", false, "x");
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(0.0d);
-    }
+            // Assert
+            Check.That(score).IsEqualTo(0.0d);
+        }
 
-    [Fact]
-    public void RequestMessageCookieMatcher_GetMatchingScore_RejectOnMatch_CookieDoesNotExists()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "c", false, "x");
+        [Fact]
+        public void RequestMessageCookieMatcher_GetMatchingScore_RejectOnMatch_CookieDoesNotExists()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "c", false, "x");
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void RequestMessageCookieMatcher_GetMatchingScore_AcceptOnMatch()
-    {
-        // Assign
-        var cookies = new Dictionary<string, string> { { "h", "x" } };
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
-        var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "h", false, "x");
+        [Fact]
+        public void RequestMessageCookieMatcher_GetMatchingScore_AcceptOnMatch()
+        {
+            // Assign
+            var cookies = new Dictionary<string, string> { { "h", "x" } };
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "h", false, "x");
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void RequestMessageCookieMatcher_GetMatchingScore_RejectOnMatch()
-    {
-        // Assign
-        var cookies = new Dictionary<string, string> { { "h", "x" } };
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
-        var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "h", false, "x");
+        [Fact]
+        public void RequestMessageCookieMatcher_GetMatchingScore_RejectOnMatch()
+        {
+            // Assign
+            var cookies = new Dictionary<string, string> { { "h", "x" } };
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "h", false, "x");
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(0.0d);
-    }
+            // Assert
+            Check.That(score).IsEqualTo(0.0d);
+        }
 
-    [Fact]
-    public void RequestMessageCookieMatcher_GetMatchingScore_IStringMatcher_Match()
-    {
-        // Assign
-        var cookies = new Dictionary<string, string> { { "cook", "x" } };
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
-        var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "cook", false, new ExactMatcher("x"));
+        [Fact]
+        public void RequestMessageCookieMatcher_GetMatchingScore_IStringMatcher_Match()
+        {
+            // Assign
+            var cookies = new Dictionary<string, string> { { "cook", "x" } };
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "cook", false, new ExactMatcher("x"));
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void RequestMessageCookieMatcher_WithMissingCookie_When_RejectOnMatch_Is_True_Should_Match()
-    {
-        // Assign
-        var cookies = new Dictionary<string, string> { { "cook", "x" } };
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
-        var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "uhuh", false, new ExactMatcher("x"));
+        [Fact]
+        public void RequestMessageCookieMatcher_WithMissingCookie_When_RejectOnMatch_Is_True_Should_Match()
+        {
+            // Assign
+            var cookies = new Dictionary<string, string> { { "cook", "x" } };
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "uhuh", false, new ExactMatcher("x"));
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void RequestMessageCookieMatcher_GetMatchingScore_Func_Match()
-    {
-        // Assign
-        var cookies = new Dictionary<string, string> { { "cook", "x" } };
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
-        var matcher = new RequestMessageCookieMatcher(x => x.ContainsKey("cook"));
+        [Fact]
+        public void RequestMessageCookieMatcher_GetMatchingScore_Func_Match()
+        {
+            // Assign
+            var cookies = new Dictionary<string, string> { { "cook", "x" } };
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var matcher = new RequestMessageCookieMatcher(x => x.ContainsKey("cook"));
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void RequestMessageCookieMatcher_GetMatchingScore_CaseIgnoreForCookieValue()
-    {
-        // Assign
-        var cookies = new Dictionary<string, string> { { "cook", "teST" } };
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
-        var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "cook", "test", true);
+        [Fact]
+        public void RequestMessageCookieMatcher_GetMatchingScore_CaseIgnoreForCookieValue()
+        {
+            // Assign
+            var cookies = new Dictionary<string, string> { { "cook", "teST" } };
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "cook", "test", true);
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
 
-    [Fact]
-    public void RequestMessageCookieMatcher_GetMatchingScore_CaseIgnoreForCookieName()
-    {
-        // Assign
-        var cookies = new Dictionary<string, string> { { "cook", "teST" } };
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
-        var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "CooK", "test", true);
+        [Fact]
+        public void RequestMessageCookieMatcher_GetMatchingScore_CaseIgnoreForCookieName()
+        {
+            // Assign
+            var cookies = new Dictionary<string, string> { { "cook", "teST" } };
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "CooK", "test", true);
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
     }
 }

test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs

@@ -7,192 +7,193 @@ using WireMock.Owin;
 using WireMock.Types;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestMatchers;
-
-public class RequestMessageParamMatcherTests
+namespace WireMock.Net.Tests.RequestMatchers
 {
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_IgnoreCaseKeyWithValuesPresentInUrl_And_With1StringValues_Returns1_0()
+    public class RequestMessageParamMatcherTests
     {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "KeY", true, new[] { "test1" });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_KeyWith1ValuePresentInUrl_And_With2Strings_Or_Returns0_5()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(0.5d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_KeyWith3ValuesPresentInUrl_And_With1ExactStringWith2Patterns_Returns0_66()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2,test3"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new IStringMatcher[] { new ExactMatcher("test1", "test2") });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsCloseTo(0.66d, 0.1d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With1ExactStringWith3Patterns_Returns0_66()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new IStringMatcher[] { new ExactMatcher("test1", "test2", "test3") });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsCloseTo(0.66d, 0.1d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With2Strings_Returns1_0()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With2ExactStringMatchers_Returns1_0()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new IStringMatcher[] { new ExactMatcher("test1"), new ExactMatcher("test2") });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuesPresentInUrl_MatchOnKeyWithValues_PartialMatch()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test0,test2"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(0.5d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKeyWithValues_Fails()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(0.0d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKey()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false);
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKeyWithEmptyArray()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new string[] { });
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
-
-    [Fact]
-    public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuePresentInUrl_MatchOnKey()
-    {
-        // Assign
-        var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=frank@contoso.com"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false);
-
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
-
-        // Assert
-        Check.That(score).IsEqualTo(1.0d);
-    }
-
-    // Issue #849
-    [Fact]
-    public void RequestMessageParamMatcher_With1ParamContainingComma_Using_QueryParameterMultipleValueSupport_NoComma()
-    {
-        // Assign
-        var options = new WireMockMiddlewareOptions
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_IgnoreCaseKeyWithValuesPresentInUrl_And_With1StringValues_Returns1_0()
         {
-            QueryParameterMultipleValueSupport = QueryParameterMultipleValueSupport.NoComma
-        };
-        var requestMessage = new RequestMessage(options, new UrlDetails("http://localhost?query=SELECT id, value FROM table WHERE id = 1&test=42"), "GET", "127.0.0.1");
-        var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "query", false, "SELECT id, value FROM table WHERE id = 1");
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "KeY", true, new[] { "test1" });
 
-        // Act
-        var result = new RequestMatchResult();
-        double score = matcher.GetMatchingScore(requestMessage, result);
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
 
-        // Assert
-        score.Should().Be(1.0);
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith1ValuePresentInUrl_And_With2Strings_Or_Returns0_5()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(0.5d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith3ValuesPresentInUrl_And_With1ExactStringWith2Patterns_Returns0_66()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2,test3"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new IStringMatcher[] { new ExactMatcher("test1", "test2") });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsCloseTo(0.66d, 0.1d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With1ExactStringWith3Patterns_Returns0_66()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new IStringMatcher[] { new ExactMatcher("test1", "test2", "test3") });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsCloseTo(0.66d, 0.1d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With2Strings_Returns1_0()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With2ExactStringMatchers_Returns1_0()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new IStringMatcher[] { new ExactMatcher("test1"), new ExactMatcher("test2") });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuesPresentInUrl_MatchOnKeyWithValues_PartialMatch()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test0,test2"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(0.5d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKeyWithValues_Fails()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(0.0d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKey()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false);
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKeyWithEmptyArray()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new string[] { });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuePresentInUrl_MatchOnKey()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=frank@contoso.com"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false);
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
+
+        // Issue #849
+        [Fact]
+        public void RequestMessageParamMatcher_With1ParamContainingComma_Using_QueryParameterMultipleValueSupport_NoComma()
+        {
+            // Assign
+            var options = new WireMockMiddlewareOptions
+            {
+                QueryParameterMultipleValueSupport = QueryParameterMultipleValueSupport.NoComma
+            };
+            var requestMessage = new RequestMessage(options, new UrlDetails("http://localhost?query=SELECT id, value FROM table WHERE id = 1&test=42"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "query", false, "SELECT id, value FROM table WHERE id = 1");
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            score.Should().Be(1.0);
+        }
     }
 }

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs

@@ -682,27 +682,6 @@ public class ResponseWithTransformerTests
         Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("\"test\"");
     }
 
-    [Fact]
-    public async Task Response_ProvideResponse_Transformer_WithBodyAsJson_Handlebars_StringAppend()
-    {
-        // Assign
-        var request = new RequestMessage(new UrlDetails("https://localhost/token?scope=scope1 scope2 scope3"), "POST", ClientIp);
-
-        var responseBuilder = Response.Create()
-            .WithBodyAsJson(
-                new
-                {
-                    scope = "{{String.Append (String.Join request.query.scope) \" helloworld\" }}"
-                })
-            .WithTransformer();
-
-        // Act
-        var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
-
-        // Assert
-        JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("{\"scope\":\"scope1 scope2 scope3 helloworld\"}");
-    }
-
     [Fact(Skip = "todo...")]
     //[Fact]
     public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsTemplatedString()

test/WireMock.Net.Tests/Serialization/LogEntryMapperTests.Verify/LogEntryMapperTests.LogEntryMapper_Map_LogEntry_Check_BodyTypeBytes.verified.txt

@@ -1,16 +0,0 @@
-{
-  Request: {
-    ClientIP: ::1,
-    Path: /,
-    AbsolutePath: /,
-    Url: http://localhost/,
-    AbsoluteUrl: http://localhost/,
-    Method: post,
-    BodyAsBytes: AA==,
-    DetectedBodyType: Bytes
-  },
-  Response: {
-    BodyAsBytes: AA==,
-    DetectedBodyType: Bytes
-  }
-}

test/WireMock.Net.Tests/Serialization/LogEntryMapperTests.Verify/LogEntryMapperTests.LogEntryMapper_Map_LogEntry_Check_ResponseBodyTypeFile.verified.txt

@@ -1,14 +0,0 @@
-{
-  Request: {
-    ClientIP: ::1,
-    Path: /,
-    AbsolutePath: /,
-    Url: http://localhost/,
-    AbsoluteUrl: http://localhost/,
-    Method: get
-  },
-  Response: {
-    BodyAsFile: test,
-    DetectedBodyType: File
-  }
-}

test/WireMock.Net.Tests/Serialization/LogEntryMapperTests.Verify/LogEntryMapperTests.LogEntryMapper_Map_LogEntry_WhenFuncIsUsed_And_DoNotSaveDynamicResponseInLogEntry_Is_True_Should_NotSave_StringResponse.verified.txt

@@ -1,16 +0,0 @@
-{
-  Request: {
-    ClientIP: ::1,
-    Path: /,
-    AbsolutePath: /,
-    Url: http://localhost/,
-    AbsoluteUrl: http://localhost/,
-    Method: post,
-    BodyAsBytes: AA==,
-    DetectedBodyType: Bytes
-  },
-  Response: {
-    Body: Func<IRequestMessage, string>,
-    DetectedBodyType: String
-  }
-}

test/WireMock.Net.Tests/Serialization/LogEntryMapperTests.Verify/LogEntryMapperTests.LogEntryMapper_Map_LogEntry_WithFault.verified.txt

@@ -1,16 +0,0 @@
-{
-  Request: {
-    ClientIP: ::1,
-    Path: /,
-    AbsolutePath: /,
-    Url: http://localhost/,
-    AbsoluteUrl: http://localhost/,
-    Method: get
-  },
-  Response: {
-    BodyAsFile: test,
-    DetectedBodyType: File,
-    FaultType: EMPTY_RESPONSE,
-    FaultPercentage: 0.5
-  }
-}

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

@@ -1,10 +1,7 @@
-#if !(NET452 || NET461)
-using System.Threading.Tasks;
-using VerifyTests;
-using VerifyXunit;
+using FluentAssertions;
+using NFluent;
 using WireMock.Logging;
 using WireMock.Models;
-using WireMock.Net.Tests.VerifyExtensions;
 using WireMock.Owin;
 using WireMock.ResponseBuilders;
 using WireMock.Serialization;
@@ -14,15 +11,8 @@ using Xunit;
 
 namespace WireMock.Net.Tests.Serialization;
 
-[UsesVerify]
 public class LogEntryMapperTests
 {
-    private static readonly VerifySettings VerifySettings = new();
-    static LogEntryMapperTests()
-    {
-        VerifySettings.Init<LogEntryMapperTests>();
-    }
-
     private readonly IWireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
 
     private readonly LogEntryMapper _sut;
@@ -33,7 +23,7 @@ public class LogEntryMapperTests
     }
 
     [Fact]
-    public Task LogEntryMapper_Map_LogEntry_Check_BodyTypeBytes()
+    public void LogEntryMapper_Map_LogEntry_Check_BodyTypeBytes()
     {
         // Assign
         var logEntry = new LogEntry
@@ -61,12 +51,23 @@ public class LogEntryMapperTests
         // Act
         var result = _sut.Map(logEntry);
 
-        // Verify
-        return Verifier.Verify(result, VerifySettings);
+        // Assert
+        Check.That(result.Request.DetectedBodyType).IsEqualTo("Bytes");
+        Check.That(result.Request.DetectedBodyTypeFromContentType).IsNull();
+        Check.That(result.Request.BodyAsBytes).ContainsExactly(new byte[] { 0 });
+        Check.That(result.Request.Body).IsNull();
+        Check.That(result.Request.BodyAsJson).IsNull();
+
+        Check.That(result.Response.DetectedBodyType).IsEqualTo(BodyType.Bytes);
+        Check.That(result.Response.DetectedBodyTypeFromContentType).IsNull();
+        Check.That(result.Response.BodyAsBytes).ContainsExactly(new byte[] { 0 });
+        Check.That(result.Response.Body).IsNull();
+        Check.That(result.Response.BodyAsJson).IsNull();
+        Check.That(result.Response.BodyAsFile).IsNull();
     }
 
     [Fact]
-    public Task LogEntryMapper_Map_LogEntry_Check_ResponseBodyTypeFile()
+    public void LogEntryMapper_Map_LogEntry_Check_ResponseBodyTypeFile()
     {
         // Assign
         var logEntry = new LogEntry
@@ -85,12 +86,23 @@ public class LogEntryMapperTests
         // Act
         var result = _sut.Map(logEntry);
 
-        // Verify
-        return Verifier.Verify(result, VerifySettings);
+        // Assert
+        Check.That(result.Request.DetectedBodyType).IsNull();
+        Check.That(result.Request.DetectedBodyTypeFromContentType).IsNull();
+        Check.That(result.Request.BodyAsBytes).IsNull();
+        Check.That(result.Request.Body).IsNull();
+        Check.That(result.Request.BodyAsJson).IsNull();
+
+        Check.That(result.Response.DetectedBodyType).IsEqualTo(BodyType.File);
+        Check.That(result.Response.DetectedBodyTypeFromContentType).IsNull();
+        Check.That(result.Request.BodyAsBytes).IsNull();
+        Check.That(result.Response.Body).IsNull();
+        Check.That(result.Response.BodyAsJson).IsNull();
+        Check.That(result.Response.BodyAsFile).IsEqualTo("test");
     }
 
     [Fact]
-    public Task LogEntryMapper_Map_LogEntry_WithFault()
+    public void LogEntryMapper_Map_LogEntry_WithFault()
     {
         // Assign
         var logEntry = new LogEntry
@@ -111,12 +123,13 @@ public class LogEntryMapperTests
         // Act
         var result = _sut.Map(logEntry);
 
-        // Verify
-        return Verifier.Verify(result, VerifySettings);
+        // Assert
+        result.Response.FaultType.Should().Be("EMPTY_RESPONSE");
+        result.Response.FaultPercentage.Should().Be(0.5);
     }
 
     [Fact]
-    public Task LogEntryMapper_Map_LogEntry_WhenFuncIsUsed_And_DoNotSaveDynamicResponseInLogEntry_Is_True_Should_NotSave_StringResponse()
+    public void LogEntryMapper_Map_LogEntry_WhenFuncIsUsed_And_DoNotSaveDynamicResponseInLogEntry_Is_True_Should_NotSave_StringResponse()
     {
         // Assign
         var options = new WireMockMiddlewareOptions
@@ -150,8 +163,7 @@ public class LogEntryMapperTests
         // Act
         var result = new LogEntryMapper(options).Map(logEntry);
 
-        // Verify
-        return Verifier.Verify(result, VerifySettings);
+        // Assert
+        result.Response.Body.Should().Be(isFuncUsed);
     }
-}
-#endif
+}

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs

@@ -1,127 +0,0 @@
-#if !(NET452 || NET461 || NETCOREAPP3_1)
-using System;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using FluentAssertions;
-using VerifyTests;
-using VerifyXunit;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Serialization;
-using WireMock.Types;
-using Xunit;
-
-namespace WireMock.Net.Tests.Serialization;
-
-[UsesVerify]
-public partial class MappingConverterTests
-{
-
-    [ModuleInitializer]
-    public static void ModuleInitializer()
-    {
-        VerifierSettings.DontScrubGuids();
-        VerifierSettings.DontScrubDateTimes();
-    }
-
-    [Fact]
-    public Task ToCSharpCode_With_Builder_And_AddStartIsTrue()
-    {
-        // Assign
-        var mapping = CreateMapping();
-
-        // Act
-        var code = _sut.ToCSharpCode(mapping, new MappingConverterSettings
-        {
-            AddStart = true,
-            ConverterType = MappingConverterType.Builder
-        });
-
-        // Assert
-        code.Should().NotBeEmpty();
-
-        // Verify
-        return Verifier.Verify(code);
-    }
-
-    [Fact]
-    public Task ToCSharpCode_With_Builder_And_AddStartIsFalse()
-    {
-        // Assign
-        var mapping = CreateMapping();
-
-        // Act
-        var code = _sut.ToCSharpCode(mapping, new MappingConverterSettings
-        {
-            AddStart = false,
-            ConverterType = MappingConverterType.Builder
-        });
-
-        // Assert
-        code.Should().NotBeEmpty();
-
-        // Verify
-        return Verifier.Verify(code);
-    }
-
-    [Fact]
-    public Task ToCSharpCode_With_Server_And_AddStartIsTrue()
-    {
-        // Assign
-        var mapping = CreateMapping();
-
-        // Act
-        var code = _sut.ToCSharpCode(mapping, new MappingConverterSettings
-        {
-            AddStart = true,
-            ConverterType = MappingConverterType.Server
-        });
-
-        // Assert
-        code.Should().NotBeEmpty();
-
-        // Verify
-        return Verifier.Verify(code);
-    }
-
-    [Fact]
-    public Task ToCSharpCode_With_Server_And_AddStartIsFalse()
-    {
-        // Assign
-        var mapping = CreateMapping();
-
-        // Act
-        var code = _sut.ToCSharpCode(mapping, new MappingConverterSettings
-        {
-            AddStart = false,
-            ConverterType = MappingConverterType.Server
-        });
-
-        // Assert
-        code.Should().NotBeEmpty();
-
-        // Verify
-        return Verifier.Verify(code);
-    }
-
-    private Mapping CreateMapping()
-    {
-        var guid = new Guid("8e7b9ab7-e18e-4502-8bc9-11e6679811cc");
-        var request = Request.Create()
-            .UsingGet()
-            .WithPath("test_path")
-            .WithParam("q", "42")
-            .WithClientIP("112.123.100.99")
-            .WithHeader("h-key", "h-value")
-            .WithCookie("c-key", "c-value")
-            .WithBody("b");
-        var response = Response.Create()
-            .WithHeader("Keep-Alive", "test")
-            .WithBody("bbb")
-            .WithDelay(12345)
-            .WithTransformer();
-
-        return new Mapping(guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
-    }
-}
-#endif

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Builder_And_AddStartIsFalse.verified.txt

@@ -1,17 +0,0 @@
-builder
-    .Given(Request.Create()
-        .UsingMethod("GET")
-        .WithPath("test_path")
-        .WithParam("q", "42")
-        .WithClientIP("112.123.100.99")
-        .WithHeader("h-key", "h-value", true)
-        .WithCookie("c-key", "c-value", true)
-        .WithBody("b")
-    )
-    .WithGuid("8e7b9ab7-e18e-4502-8bc9-11e6679811cc")
-    .RespondWith(Response.Create()
-        .WithHeader("Keep-Alive)", "test")
-        .WithBody("bbb")
-        .WithDelay(12345)
-        .WithTransformer()
-    );

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Builder_And_AddStartIsTrue.verified.txt

@@ -1,18 +0,0 @@
-var builder = new MappingBuilder();
-builder
-    .Given(Request.Create()
-        .UsingMethod("GET")
-        .WithPath("test_path")
-        .WithParam("q", "42")
-        .WithClientIP("112.123.100.99")
-        .WithHeader("h-key", "h-value", true)
-        .WithCookie("c-key", "c-value", true)
-        .WithBody("b")
-    )
-    .WithGuid("8e7b9ab7-e18e-4502-8bc9-11e6679811cc")
-    .RespondWith(Response.Create()
-        .WithHeader("Keep-Alive)", "test")
-        .WithBody("bbb")
-        .WithDelay(12345)
-        .WithTransformer()
-    );

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Server_And_AddStartIsFalse.verified.txt

@@ -1,17 +0,0 @@
-server
-    .Given(Request.Create()
-        .UsingMethod("GET")
-        .WithPath("test_path")
-        .WithParam("q", "42")
-        .WithClientIP("112.123.100.99")
-        .WithHeader("h-key", "h-value", true)
-        .WithCookie("c-key", "c-value", true)
-        .WithBody("b")
-    )
-    .WithGuid("8e7b9ab7-e18e-4502-8bc9-11e6679811cc")
-    .RespondWith(Response.Create()
-        .WithHeader("Keep-Alive)", "test")
-        .WithBody("bbb")
-        .WithDelay(12345)
-        .WithTransformer()
-    );

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Server_And_AddStartIsTrue.verified.txt

@@ -1,18 +0,0 @@
-var server = WireMockServer.Start();
-server
-    .Given(Request.Create()
-        .UsingMethod("GET")
-        .WithPath("test_path")
-        .WithParam("q", "42")
-        .WithClientIP("112.123.100.99")
-        .WithHeader("h-key", "h-value", true)
-        .WithCookie("c-key", "c-value", true)
-        .WithBody("b")
-    )
-    .WithGuid("8e7b9ab7-e18e-4502-8bc9-11e6679811cc")
-    .RespondWith(Response.Create()
-        .WithHeader("Keep-Alive)", "test")
-        .WithBody("bbb")
-        .WithDelay(12345)
-        .WithTransformer()
-    );

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToMappingModel_WithDelayAsMilleSeconds_ReturnsCorrectModel.verified.txt

@@ -1,12 +0,0 @@
-{
-  Guid: c8eeaf99-d5c4-4341-8543-4597c3fd40d9,
-  UpdatedAt: 2022-12-04 11:12:13,
-  Title: ,
-  Description: ,
-  Priority: 42,
-  Request: {},
-  Response: {
-    Delay: 1000
-  },
-  UseWebhooksFireAndForget: false
-}

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToMappingModel_WithPriority_ReturnsPriority.verified.txt

@@ -1,17 +0,0 @@
-{
-  Guid: c8eeaf99-d5c4-4341-8543-4597c3fd40d9,
-  UpdatedAt: 2022-12-04 11:12:13,
-  Title: ,
-  Description: ,
-  Priority: 42,
-  Request: {},
-  Response: {
-    BodyAsJson: {
-      x: x
-    },
-    UseTransformer: true,
-    TransformerType: Handlebars,
-    TransformerReplaceNodeOptions: Evaluate
-  },
-  UseWebhooksFireAndForget: false
-}

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToMappingModel_WithRandomDelay_ReturnsCorrectModel.verified.txt

@@ -1,13 +0,0 @@
-{
-  Guid: c8eeaf99-d5c4-4341-8543-4597c3fd40d9,
-  UpdatedAt: 2022-12-04 11:12:13,
-  Title: ,
-  Description: ,
-  Priority: 42,
-  Request: {},
-  Response: {
-    MinimumRandomDelay: 1000,
-    MaximumRandomDelay: 2000
-  },
-  UseWebhooksFireAndForget: false
-}

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToMappingModel_WithRandomMinimumDelay_ReturnsCorrectModel.verified.txt

@@ -1,13 +0,0 @@
-{
-  Guid: c8eeaf99-d5c4-4341-8543-4597c3fd40d9,
-  UpdatedAt: 2022-12-04 11:12:13,
-  Title: ,
-  Description: ,
-  Priority: 42,
-  Request: {},
-  Response: {
-    MinimumRandomDelay: 1000,
-    MaximumRandomDelay: 60000
-  },
-  UseWebhooksFireAndForget: false
-}

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings.verified.txt

@@ -1,15 +0,0 @@
-{
-  Guid: c8eeaf99-d5c4-4341-8543-4597c3fd40d9,
-  UpdatedAt: 2022-12-04 11:12:13,
-  TimeSettings: {
-    Start: 2023-01-14 15:16:17,
-    End: 2023-01-14 15:17:57,
-    TTL: 100
-  },
-  Title: ,
-  Description: ,
-  Priority: 42,
-  Request: {},
-  Response: {},
-  UseWebhooksFireAndForget: false
-}

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToMappingModel_WithTitle_And_Description_ReturnsCorrectModel.verified.txt

@@ -1,9 +0,0 @@
-{
-  Guid: c8eeaf99-d5c4-4341-8543-4597c3fd40d9,
-  UpdatedAt: 2022-12-04 11:12:13,
-  Title: my-title,
-  Description: my-description,
-  Request: {},
-  Response: {},
-  UseWebhooksFireAndForget: false
-}

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToMappingModel_With_MultipleWebHooks.verified.txt

@@ -1,34 +0,0 @@
-{
-  Guid: c8eeaf99-d5c4-4341-8543-4597c3fd40d9,
-  UpdatedAt: 2022-12-04 11:12:13,
-  Title: ,
-  Description: ,
-  Request: {},
-  Response: {},
-  Webhooks: [
-    {
-      Request: {
-        Url: https://test1.com,
-        Method: post,
-        Headers: {
-          One: x
-        },
-        Body: 1,
-        TransformerReplaceNodeOptions: EvaluateAndTryToConvert
-      }
-    },
-    {
-      Request: {
-        Url: https://test2.com,
-        Method: post,
-        Headers: {
-          First: x,
-          Second: a, b
-        },
-        Body: 2,
-        TransformerReplaceNodeOptions: EvaluateAndTryToConvert
-      }
-    }
-  ],
-  UseWebhooksFireAndForget: true
-}

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToMappingModel_With_SingleWebHook.verified.txt

@@ -1,21 +0,0 @@
-{
-  Guid: c8eeaf99-d5c4-4341-8543-4597c3fd40d9,
-  UpdatedAt: 2022-12-04 11:12:13,
-  Title: ,
-  Description: ,
-  Request: {},
-  Response: {},
-  Webhook: {
-    Request: {
-      Url: https://test.com,
-      Method: post,
-      Headers: {
-        Multi: a, b,
-        Single: x
-      },
-      Body: b,
-      TransformerReplaceNodeOptions: EvaluateAndTryToConvert
-    }
-  },
-  UseWebhooksFireAndForget: false
-}

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

@@ -1,12 +1,7 @@
-#if !(NET452 || NET461 || NETCOREAPP3_1)
 using System;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 using System.Threading;
-using System.Threading.Tasks;
 using FluentAssertions;
-using VerifyTests;
-using VerifyXunit;
 using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -18,10 +13,9 @@ using Xunit;
 
 namespace WireMock.Net.Tests.Serialization;
 
-public partial class MappingConverterTests
+public class MappingConverterTests
 {
-    private readonly Guid _guid = new("c8eeaf99-d5c4-4341-8543-4597c3fd40d9");
-    private readonly DateTime _updatedAt = new(2022, 12, 4, 11, 12, 13);
+    private readonly DateTime _updatedAt = new(2022, 12, 4);
     private readonly WireMockServerSettings _settings = new();
 
     private readonly MappingConverter _sut;
@@ -32,7 +26,7 @@ public partial class MappingConverterTests
     }
 
     [Fact]
-    public Task ToMappingModel_With_SingleWebHook()
+    public void ToMappingModel_With_SingleWebHook()
     {
         // Assign
         var request = Request.Create();
@@ -59,7 +53,7 @@ public partial class MappingConverterTests
                 }
             }
         };
-        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -80,13 +74,10 @@ public partial class MappingConverterTests
         model.Webhook.Request.Headers.Should().HaveCount(2);
         model.Webhook.Request.Body.Should().Be("b");
         model.Webhook.Request.BodyAsJson.Should().BeNull();
-
-        // Verify
-        return Verifier.Verify(model);
     }
 
     [Fact]
-    public Task ToMappingModel_With_MultipleWebHooks()
+    public void ToMappingModel_With_MultipleWebHooks()
     {
         // Assign
         var request = Request.Create();
@@ -132,7 +123,7 @@ public partial class MappingConverterTests
                 }
             }
         };
-        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, true, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, true, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -157,20 +148,17 @@ public partial class MappingConverterTests
         model.Webhooks[1].Request.Url.Should().Be("https://test2.com");
         model.Webhooks[1].Request.Headers.Should().HaveCount(2);
         model.Webhooks[1].Request.Body.Should().Be("2");
-
-        // Verify
-        return Verifier.Verify(model);
     }
 
     [Fact]
-    public Task ToMappingModel_WithTitle_And_Description_ReturnsCorrectModel()
+    public void ToMappingModel_WithTitle_And_Description_ReturnsCorrectModel()
     {
         // Assign
         var title = "my-title";
         var description = "my-description";
         var request = Request.Create();
         var response = Response.Create();
-        var mapping = new Mapping(_guid, _updatedAt, title, description, null, _settings, request, response, 0, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, title, description, null, _settings, request, response, 0, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -179,18 +167,15 @@ public partial class MappingConverterTests
         model.Should().NotBeNull();
         model.Title.Should().Be(title);
         model.Description.Should().Be(description);
-
-        // Verify
-        return Verifier.Verify(model);
     }
 
     [Fact]
-    public Task ToMappingModel_WithPriority_ReturnsPriority()
+    public void ToMappingModel_WithPriority_ReturnsPriority()
     {
         // Assign
         var request = Request.Create();
         var response = Response.Create().WithBodyAsJson(new { x = "x" }).WithTransformer();
-        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -199,16 +184,13 @@ public partial class MappingConverterTests
         model.Should().NotBeNull();
         model.Priority.Should().Be(42);
         model.Response.UseTransformer.Should().BeTrue();
-
-        // Verify
-        return Verifier.Verify(model);
     }
 
     [Fact]
-    public Task ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings()
+    public void ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings()
     {
         // Assign
-        var start = new DateTime(2023, 1, 14, 15, 16, 17);
+        var start = DateTime.Now;
         var ttl = 100;
         var end = start.AddSeconds(ttl);
         var request = Request.Create();
@@ -219,7 +201,7 @@ public partial class MappingConverterTests
             End = end,
             TTL = ttl
         };
-        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, timeSettings);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, timeSettings);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -230,9 +212,6 @@ public partial class MappingConverterTests
         model.TimeSettings!.Start.Should().Be(start);
         model.TimeSettings.End.Should().Be(end);
         model.TimeSettings.TTL.Should().Be(ttl);
-
-        // Verify
-        return Verifier.Verify(model);
     }
 
     [Fact]
@@ -262,13 +241,13 @@ public partial class MappingConverterTests
     }
 
     [Fact]
-    public Task ToMappingModel_WithDelayAsMilleSeconds_ReturnsCorrectModel()
+    public void ToMappingModel_WithDelayAsMilleSeconds_ReturnsCorrectModel()
     {
         // Assign
         var delay = 1000;
         var request = Request.Create();
         var response = Response.Create().WithDelay(delay);
-        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -276,19 +255,16 @@ public partial class MappingConverterTests
         // Assert
         model.Should().NotBeNull();
         model.Response.Delay.Should().Be(delay);
-
-        // Verify
-        return Verifier.Verify(model);
     }
 
     [Fact]
-    public Task ToMappingModel_WithRandomMinimumDelay_ReturnsCorrectModel()
+    public void ToMappingModel_WithRandomMinimumDelay_ReturnsCorrectModel()
     {
         // Assign
         int minimumDelay = 1000;
         var request = Request.Create();
         var response = Response.Create().WithRandomDelay(minimumDelay);
-        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -298,20 +274,17 @@ public partial class MappingConverterTests
         model.Response.Delay.Should().BeNull();
         model.Response.MinimumRandomDelay.Should().Be(minimumDelay);
         model.Response.MaximumRandomDelay.Should().Be(60_000);
-
-        // Verify
-        return Verifier.Verify(model);
     }
 
     [Fact]
-    public Task ToMappingModel_WithRandomDelay_ReturnsCorrectModel()
+    public void ToMappingModel_WithRandomDelay_ReturnsCorrectModel()
     {
         // Assign
         int minimumDelay = 1000;
         int maximumDelay = 2000;
         var request = Request.Create();
         var response = Response.Create().WithRandomDelay(minimumDelay, maximumDelay);
-        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -321,9 +294,5 @@ public partial class MappingConverterTests
         model.Response.Delay.Should().BeNull();
         model.Response.MinimumRandomDelay.Should().Be(minimumDelay);
         model.Response.MaximumRandomDelay.Should().Be(maximumDelay);
-
-        // Verify
-        return Verifier.Verify(model);
     }
-}
-#endif
+}

test/WireMock.Net.Tests/Serialization/ProxyMappingConverterTests.ToMapping_UseDefinedRequestMatchers_True.verified.txt

@@ -1,75 +0,0 @@
-{
-  Guid: ff55ac0a-fea9-4d7b-be74-5e483a2c1305,
-  UpdatedAt: 2022-12-04,
-  Title: my title,
-  Description: my description,
-  Priority: -2000000,
-  Request: {
-    Path: {
-      Matchers: [
-        {
-          Name: WildcardMatcher,
-          Pattern: x,
-          IgnoreCase: false
-        }
-      ]
-    },
-    Methods: [
-      POST
-    ],
-    Headers: [
-      {
-        Name: Content-Type,
-        Matchers: [
-          {
-            Name: ContentTypeMatcher,
-            Pattern: text/plain,
-            IgnoreCase: false
-          }
-        ]
-      }
-    ],
-    Cookies: [
-      {
-        Name: c,
-        Matchers: [
-          {
-            Name: WildcardMatcher,
-            Pattern: x,
-            IgnoreCase: true
-          }
-        ]
-      }
-    ],
-    Params: [
-      {
-        Name: p1,
-        Matchers: [
-          {
-            Name: ExactMatcher,
-            Pattern: p1-v,
-            IgnoreCase: false
-          }
-        ]
-      },
-      {
-        Name: p2,
-        Matchers: [
-          {
-            Name: ExactMatcher,
-            Pattern: p2-v,
-            IgnoreCase: false
-          }
-        ]
-      }
-    ],
-    Body: {
-      Matcher: {
-        Name: RegexMatcher,
-        Pattern: <RequestType>Auth</RequestType>,
-        IgnoreCase: false
-      }
-    }
-  },
-  Response: {}
-}

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

@@ -1,10 +1,8 @@
-#if !(NET452 || NET461 || NETCOREAPP3_1)
 using System;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using Moq;
-using VerifyTests;
-using VerifyXunit;
+using Newtonsoft.Json;
+using System.IO;
+using FluentAssertions;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
 using WireMock.Serialization;
@@ -14,7 +12,6 @@ using Xunit;
 
 namespace WireMock.Net.Tests.Serialization;
 
-[UsesVerify]
 public class ProxyMappingConverterTests
 {
     private readonly WireMockServerSettings _settings = new();
@@ -36,15 +33,8 @@ public class ProxyMappingConverterTests
         _sut = new ProxyMappingConverter(_settings, guidUtilsMock.Object, dateTimeUtilsMock.Object);
     }
 
-    [ModuleInitializer]
-    public static void ModuleInitializer()
-    {
-        VerifierSettings.DontScrubGuids();
-        VerifierSettings.DontScrubDateTimes();
-    }
-
     [Fact]
-    public Task ToMapping_UseDefinedRequestMatchers_True()
+    public void ToMapping_UseDefinedRequestMatchers_True()
     {
         // Arrange
         var proxyAndRecordSettings = new ProxyAndRecordSettings
@@ -59,7 +49,7 @@ public class ProxyMappingConverterTests
             .WithParam("p2", "p2-v")
             .WithHeader("Content-Type", new ContentTypeMatcher("text/plain"))
             .WithCookie("c", "x")
-            .WithBody(new RegexMatcher("<RequestType>Auth</RequestType>"));
+            .WithBody(new RegexMatcher("<RequestType>Auth</RequestType"));
 
         var mappingMock = new Mock<IMapping>();
         mappingMock.SetupGet(m => m.RequestMatcher).Returns(request);
@@ -75,9 +65,9 @@ public class ProxyMappingConverterTests
 
         // Assert
         var model = _mappingConverter.ToMappingModel(proxyMapping);
+        var json = JsonConvert.SerializeObject(model, JsonSerializationConstants.JsonSerializerSettingsDefault);
+        var expected = File.ReadAllText(Path.Combine("../../../", "Serialization", "files", "proxy.json"));
 
-        // Verify
-        return Verifier.Verify(model);
+        json.Should().Be(expected);
     }
-}
-#endif
+}

test/WireMock.Net.Tests/Serialization/WebhookMapperTests.WebhookMapper_Map_WebhookModel_BodyAsJson.verified.txt

@@ -1,21 +0,0 @@
-{
-  Request: {
-    Url: https://localhost,
-    Method: get,
-    Headers: {
-      x: [
-        y
-      ]
-    },
-    BodyData: {
-      BodyAsJson: {
-        n: 12345
-      },
-      DetectedBodyType: Json,
-      DetectedBodyTypeFromContentType: Bytes
-    },
-    Delay: 4,
-    MinimumRandomDelay: 5,
-    MaximumRandomDelay: 6
-  }
-}

test/WireMock.Net.Tests/Serialization/WebhookMapperTests.WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsFalse.verified.txt

@@ -1,16 +0,0 @@
-{
-  Request: {
-    Url: https://localhost,
-    Method: get,
-    Headers: {
-      x: [
-        y
-      ]
-    },
-    BodyData: {
-      BodyAsString: test,
-      DetectedBodyType: String,
-      DetectedBodyTypeFromContentType: Bytes
-    }
-  }
-}

test/WireMock.Net.Tests/Serialization/WebhookMapperTests.WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsTrue.verified.txt

@@ -1,18 +0,0 @@
-{
-  Request: {
-    Url: https://localhost,
-    Method: get,
-    Headers: {
-      x: [
-        y
-      ]
-    },
-    BodyData: {
-      BodyAsString: test,
-      DetectedBodyType: String,
-      DetectedBodyTypeFromContentType: Bytes
-    },
-    UseTransformer: true,
-    TransformerReplaceNodeOptions: Evaluate
-  }
-}

test/WireMock.Net.Tests/Serialization/WebhookMapperTests.WebhookMapper_Map_Webhook_To_Model.verified.txt

@@ -1,16 +0,0 @@
-{
-  Request: {
-    Url: https://localhost,
-    Method: get,
-    Headers: {
-      x: y
-    },
-    BodyAsJson: {
-      n: 12345
-    },
-    TransformerReplaceNodeOptions: EvaluateAndTryToConvert,
-    Delay: 4,
-    MinimumRandomDelay: 5,
-    MaximumRandomDelay: 6
-  }
-}

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

@@ -1,9 +1,5 @@
-#if !(NET452 || NET461 || NETCOREAPP3_1)
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using VerifyTests;
-using VerifyXunit;
+using FluentAssertions;
 using WireMock.Admin.Mappings;
 using WireMock.Models;
 using WireMock.Serialization;
@@ -13,18 +9,10 @@ using Xunit;
 
 namespace WireMock.Net.Tests.Serialization;
 
-[UsesVerify]
 public class WebhookMapperTests
 {
-    [ModuleInitializer]
-    public static void ModuleInitializer()
-    {
-        VerifierSettings.DontScrubGuids();
-        VerifierSettings.DontScrubDateTimes();
-    }
-
     [Fact]
-    public Task WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsFalse()
+    public void WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsFalse()
     {
         // Assign
         var model = new WebhookModel
@@ -44,12 +32,17 @@ public class WebhookMapperTests
 
         var result = WebhookMapper.Map(model);
 
-        // Verify
-        return Verifier.Verify(result);
+        result.Request.Url.Should().Be("https://localhost");
+        result.Request.Method.Should().Be("get");
+        result.Request.Headers.Should().HaveCount(1);
+        result.Request.BodyData!.BodyAsJson.Should().BeNull();
+        result.Request.BodyData.BodyAsString.Should().Be("test");
+        result.Request.BodyData.DetectedBodyType.Should().Be(BodyType.String);
+        result.Request.UseTransformer.Should().BeNull();
     }
 
     [Fact]
-    public Task WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsTrue()
+    public void WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsTrue()
     {
         // Assign
         var model = new WebhookModel
@@ -69,12 +62,18 @@ public class WebhookMapperTests
 
         var result = WebhookMapper.Map(model);
 
-        // Verify
-        return Verifier.Verify(result);
+        result.Request.Url.Should().Be("https://localhost");
+        result.Request.Method.Should().Be("get");
+        result.Request.Headers.Should().HaveCount(1);
+        result.Request.BodyData!.BodyAsJson.Should().BeNull();
+        result.Request.BodyData.BodyAsString.Should().Be("test");
+        result.Request.BodyData.DetectedBodyType.Should().Be(BodyType.String);
+        result.Request.UseTransformer.Should().BeTrue();
+        result.Request.TransformerType.Should().Be(TransformerType.Handlebars);
     }
 
     [Fact]
-    public Task WebhookMapper_Map_WebhookModel_BodyAsJson()
+    public void WebhookMapper_Map_WebhookModel_BodyAsJson()
     {
         // Assign
         var model = new WebhookModel
@@ -96,12 +95,19 @@ public class WebhookMapperTests
 
         var result = WebhookMapper.Map(model);
 
-        // Verify
-        return Verifier.Verify(result);
+        result.Request.Url.Should().Be("https://localhost");
+        result.Request.Method.Should().Be("get");
+        result.Request.Headers.Should().HaveCount(1);
+        result.Request.BodyData!.BodyAsString.Should().BeNull();
+        result.Request.BodyData.BodyAsJson.Should().NotBeNull();
+        result.Request.BodyData.DetectedBodyType.Should().Be(BodyType.Json);
+        result.Request.Delay.Should().Be(4);
+        result.Request.MinimumRandomDelay.Should().Be(5);
+        result.Request.MaximumRandomDelay.Should().Be(6);
     }
 
     [Fact]
-    public Task WebhookMapper_Map_Webhook_To_Model()
+    public void WebhookMapper_Map_Webhook_To_Model()
     {
         // Assign
         var webhook = new Webhook
@@ -128,8 +134,12 @@ public class WebhookMapperTests
 
         var result = WebhookMapper.Map(webhook);
 
-        // Verify
-        return Verifier.Verify(result);
+        result.Request.Url.Should().Be("https://localhost");
+        result.Request.Method.Should().Be("get");
+        result.Request.Headers.Should().HaveCount(1);
+        result.Request.BodyAsJson.Should().NotBeNull();
+        result.Request.Delay.Should().Be(4);
+        result.Request.MinimumRandomDelay.Should().Be(5);
+        result.Request.MaximumRandomDelay.Should().Be(6);
     }
-}
-#endif
+}

test/WireMock.Net.Tests/Serialization/files/proxy.json

@@ -0,0 +1,75 @@
+{
+  "Guid": "ff55ac0a-fea9-4d7b-be74-5e483a2c1305",
+  "UpdatedAt": "2022-12-04T00:00:00",
+  "Title": "my title",
+  "Description": "my description",
+  "Priority": -2000000,
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "x",
+          "IgnoreCase": false
+        }
+      ]
+    },
+    "Methods": [
+      "POST"
+    ],
+    "Headers": [
+      {
+        "Name": "Content-Type",
+        "Matchers": [
+          {
+            "Name": "ContentTypeMatcher",
+            "Pattern": "text/plain",
+            "IgnoreCase": false
+          }
+        ]
+      }
+    ],
+    "Cookies": [
+      {
+        "Name": "c",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "x",
+            "IgnoreCase": true
+          }
+        ]
+      }
+    ],
+    "Params": [
+      {
+        "Name": "p1",
+        "Matchers": [
+          {
+            "Name": "ExactMatcher",
+            "Pattern": "p1-v",
+            "IgnoreCase": false
+          }
+        ]
+      },
+      {
+        "Name": "p2",
+        "Matchers": [
+          {
+            "Name": "ExactMatcher",
+            "Pattern": "p2-v",
+            "IgnoreCase": false
+          }
+        ]
+      }
+    ],
+    "Body": {
+      "Matcher": {
+        "Name": "RegexMatcher",
+        "Pattern": "<RequestType>Auth</RequestType",
+        "IgnoreCase": false
+      }
+    }
+  },
+  "Response": {}
+}

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

@@ -9,109 +9,109 @@ using WireMock.Types;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Util;
-
-public class BodyParserTests
+namespace WireMock.Net.Tests.Util
 {
-    [Theory]
-    [InlineData("application/json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-    [InlineData("application/json; charset=utf-8", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-    [InlineData("application/json; odata.metadata=minimal", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-    [InlineData("application/vnd.api+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-    [InlineData("application/vnd.test+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-    public async Task BodyParser_Parse_ContentTypeJson(string contentType, string bodyAsJson, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
+    public class BodyParserTests
     {
-        // Arrange
-        var bodyParserSettings = new BodyParserSettings
+        [Theory]
+        [InlineData("application/json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        [InlineData("application/json; charset=utf-8", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        [InlineData("application/json; odata.metadata=minimal", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        [InlineData("application/vnd.api+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        [InlineData("application/vnd.test+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        public async Task BodyParser_Parse_ContentTypeJson(string contentType, string bodyAsJson, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            Stream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsJson)),
-            ContentType = contentType,
-            DeserializeJson = true
-        };
+            // Arrange
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsJson)),
+                ContentType = contentType,
+                DeserializeJson = true
+            };
 
-        // Act
-        var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            // Act
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
-        // Assert
-        Check.That(body.BodyAsBytes).IsNotNull();
-        Check.That(body.BodyAsJson).IsNotNull();
-        Check.That(body.BodyAsString).Equals(bodyAsJson);
-        Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-        Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
-    }
+            // Assert
+            Check.That(body.BodyAsBytes).IsNotNull();
+            Check.That(body.BodyAsJson).IsNotNull();
+            Check.That(body.BodyAsString).Equals(bodyAsJson);
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
+        }
 
-    [Theory]
-    [InlineData("application/xml", "<xml>hello</xml>", BodyType.String, BodyType.String)]
-    [InlineData("something", "hello", BodyType.String, BodyType.Bytes)]
-    public async Task BodyParser_Parse_ContentTypeString(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
-    {
-        // Arrange
-        var bodyParserSettings = new BodyParserSettings
+        [Theory]
+        [InlineData("application/xml", "<xml>hello</xml>", BodyType.String, BodyType.String)]
+        [InlineData("something", "hello", BodyType.String, BodyType.Bytes)]
+        public async Task BodyParser_Parse_ContentTypeString(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            Stream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString)),
-            ContentType = contentType,
-            DeserializeJson = true
-        };
+            // Arrange
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString)),
+                ContentType = contentType,
+                DeserializeJson = true
+            };
 
-        // Act
-        var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            // Act
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
-        // Assert
-        Check.That(body.BodyAsBytes).IsNotNull();
-        Check.That(body.BodyAsJson).IsNull();
-        Check.That(body.BodyAsString).Equals(bodyAsString);
-        Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-        Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
-    }
+            // Assert
+            Check.That(body.BodyAsBytes).IsNotNull();
+            Check.That(body.BodyAsJson).IsNull();
+            Check.That(body.BodyAsString).Equals(bodyAsString);
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
+        }
 
-    [Theory]
-    [InlineData(new byte[] { 34, 97, 34 }, BodyType.Json)]
-    [InlineData(new byte[] { 97 }, BodyType.String)]
-    [InlineData(new byte[] { 0xFF, 0xD8, 0xFF, 0xE0 }, BodyType.Bytes)]
-    public async Task BodyParser_Parse_DetectedBodyType(byte[] content, BodyType detectedBodyType)
-    {
-        // arrange
-        var bodyParserSettings = new BodyParserSettings
+        [Theory]
+        [InlineData(new byte[] { 34, 97, 34 }, BodyType.Json)]
+        [InlineData(new byte[] { 97 }, BodyType.String)]
+        [InlineData(new byte[] { 0xFF, 0xD8, 0xFF, 0xE0 }, BodyType.Bytes)]
+        public async Task BodyParser_Parse_DetectedBodyType(byte[] content, BodyType detectedBodyType)
         {
-            Stream = new MemoryStream(content),
-            ContentType = null,
-            DeserializeJson = true
-        };
+            // arrange
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(content),
+                ContentType = null,
+                DeserializeJson = true
+            };
 
-        // act
-        var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            // act
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
-        // assert
-        Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-    }
+            // assert
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+        }
 
-    [Theory]
-    [InlineData(new byte[] { 34, 97, 34 }, BodyType.String)]
-    [InlineData(new byte[] { 97 }, BodyType.String)]
-    [InlineData(new byte[] { 0xFF, 0xD8, 0xFF, 0xE0 }, BodyType.Bytes)]
-    public async Task BodyParser_Parse_DetectedBodyTypeNoJsonParsing(byte[] content, BodyType detectedBodyType)
-    {
-        // arrange
-        var bodyParserSettings = new BodyParserSettings
+        [Theory]
+        [InlineData(new byte[] { 34, 97, 34 }, BodyType.String)]
+        [InlineData(new byte[] { 97 }, BodyType.String)]
+        [InlineData(new byte[] { 0xFF, 0xD8, 0xFF, 0xE0 }, BodyType.Bytes)]
+        public async Task BodyParser_Parse_DetectedBodyTypeNoJsonParsing(byte[] content, BodyType detectedBodyType)
         {
-            Stream = new MemoryStream(content),
-            ContentType = null,
-            DeserializeJson = false
-        };
+            // arrange
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(content),
+                ContentType = null,
+                DeserializeJson = false
+            };
 
-        // act
-        var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            // act
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
-        // assert
-        Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-    }
+            // assert
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+        }
 
-    [Fact]
-    public async Task BodyParser_Parse_WithUTF8EncodingAndContentTypeMultipart_DetectedBodyTypeEqualsString()
-    {
-        // Arrange
-        string contentType = "multipart/form-data";
-        string body = @"
+        [Fact]
+        public async Task BodyParser_Parse_WithUTF8EncodingAndContentTypeMultipart_DetectedBodyTypeEqualsString()
+        {
+            // Arrange
+            string contentType = "multipart/form-data";
+            string body = @"
 
 -----------------------------9051914041544843365972754266
 Content-Disposition: form-data; name=""text""
@@ -131,162 +131,163 @@ Content-Type: text/html
 
 -----------------------------9051914041544843365972754266--";
 
-        var bodyParserSettings = new BodyParserSettings
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(Encoding.UTF8.GetBytes(body)),
+                ContentType = contentType,
+                DeserializeJson = true
+            };
+
+            // Act
+            var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+
+            // Assert
+            Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String);
+            Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
+            Check.That(result.BodyAsBytes).IsNotNull();
+            Check.That(result.BodyAsJson).IsNull();
+            Check.That(result.BodyAsString).IsNotNull();
+        }
+
+        [Fact]
+        public async Task BodyParser_Parse_WithUTF16EncodingAndContentTypeMultipart_DetectedBodyTypeEqualsString()
         {
-            Stream = new MemoryStream(Encoding.UTF8.GetBytes(body)),
-            ContentType = contentType,
-            DeserializeJson = true
-        };
+            // Arrange
+            string contentType = "multipart/form-data";
+            string body = char.ConvertFromUtf32(0x1D161); //U+1D161 = MUSICAL SYMBOL SIXTEENTH NOTE
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(Encoding.UTF8.GetBytes(body)),
+                ContentType = contentType,
+                DeserializeJson = true
+            };
 
-        // Act
-        var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            // Act
+            var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
-        // Assert
-        Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String);
-        Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
-        Check.That(result.BodyAsBytes).IsNotNull();
-        Check.That(result.BodyAsJson).IsNull();
-        Check.That(result.BodyAsString).IsNotNull();
-    }
+            // Assert
+            Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes);
+            Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
+            Check.That(result.BodyAsBytes).IsNotNull();
+            Check.That(result.BodyAsJson).IsNull();
+            Check.That(result.BodyAsString).IsNull();
+        }
 
-    [Fact]
-    public async Task BodyParser_Parse_WithUTF16EncodingAndContentTypeMultipart_DetectedBodyTypeEqualsString()
-    {
-        // Arrange
-        string contentType = "multipart/form-data";
-        string body = char.ConvertFromUtf32(0x1D161); //U+1D161 = MUSICAL SYMBOL SIXTEENTH NOTE
-        var bodyParserSettings = new BodyParserSettings
+        [Theory]
+        [InlineData("hello", BodyType.String, BodyType.Bytes)]
+        public async Task BodyParser_Parse_ContentTypeIsNull(string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            Stream = new MemoryStream(Encoding.UTF8.GetBytes(body)),
-            ContentType = contentType,
-            DeserializeJson = true
-        };
+            // Arrange
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString)),
+                ContentType = null,
+                DeserializeJson = true
+            };
 
-        // Act
-        var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            // Act
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
-        // Assert
-        Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes);
-        Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
-        Check.That(result.BodyAsBytes).IsNotNull();
-        Check.That(result.BodyAsJson).IsNull();
-        Check.That(result.BodyAsString).IsNull();
-    }
+            // Assert
+            Check.That(body.BodyAsBytes).IsNotNull();
+            Check.That(body.BodyAsJson).IsNull();
+            Check.That(body.BodyAsString).Equals(bodyAsString);
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
+        }
 
-    [Theory]
-    [InlineData("hello", BodyType.String, BodyType.Bytes)]
-    public async Task BodyParser_Parse_ContentTypeIsNull(string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
-    {
-        // Arrange
-        var bodyParserSettings = new BodyParserSettings
+        [Theory]
+        [InlineData("gzip")]
+        [InlineData("deflate")]
+        public async Task BodyParser_Parse_ContentEncoding_GZip_And_DecompressGzipAndDeflate_Is_True_Should_Decompress(string compression)
         {
-            Stream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString)),
-            ContentType = null,
-            DeserializeJson = true
-        };
+            // Arrange
+            var bytes = Encoding.ASCII.GetBytes("0");
+            var compressed = CompressionUtils.Compress(compression, bytes);
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(compressed),
+                ContentType = "text/plain",
+                DeserializeJson = false,
+                ContentEncoding = compression.ToUpperInvariant(),
+                DecompressGZipAndDeflate = true
+            };
 
-        // Act
-        var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            // Act
+            var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
-        // Assert
-        Check.That(body.BodyAsBytes).IsNotNull();
-        Check.That(body.BodyAsJson).IsNull();
-        Check.That(body.BodyAsString).Equals(bodyAsString);
-        Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-        Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
-    }
+            // Assert
+            result.DetectedBodyType.Should().Be(BodyType.String);
+            result.DetectedBodyTypeFromContentType.Should().Be(BodyType.String);
+            result.BodyAsBytes.Should().BeEquivalentTo(new byte[] { 48 });
+            result.BodyAsJson.Should().BeNull();
+            result.BodyAsString.Should().Be("0");
+            result.DetectedCompression.Should().Be(compression);
+        }
 
-    [Theory]
-    [InlineData("gzip")]
-    [InlineData("deflate")]
-    public async Task BodyParser_Parse_ContentEncoding_GZip_And_DecompressGzipAndDeflate_Is_True_Should_Decompress(string compression)
-    {
-        // Arrange
-        var bytes = Encoding.ASCII.GetBytes("0");
-        var compressed = CompressionUtils.Compress(compression, bytes);
-        var bodyParserSettings = new BodyParserSettings
+        [Theory]
+        [InlineData("gzip")]
+        [InlineData("deflate")]
+        public async Task BodyParser_Parse_ContentEncoding_GZip_And_DecompressGzipAndDeflate_Is_False_Should_Not_Decompress(string compression)
         {
-            Stream = new MemoryStream(compressed),
-            ContentType = "text/plain",
-            DeserializeJson = false,
-            ContentEncoding = compression.ToUpperInvariant(),
-            DecompressGZipAndDeflate = true
-        };
+            // Arrange
+            var bytes = Encoding.ASCII.GetBytes(Guid.NewGuid().ToString());
+            var compressed = CompressionUtils.Compress(compression, bytes);
+            var bodyParserSettings = new BodyParserSettings
+            {
+                Stream = new MemoryStream(compressed),
+                ContentType = "text/plain",
+                DeserializeJson = false,
+                ContentEncoding = compression.ToUpperInvariant(),
+                DecompressGZipAndDeflate = false
+            };
 
-        // Act
-        var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            // Act
+            var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
-        // Assert
-        result.DetectedBodyType.Should().Be(BodyType.String);
-        result.DetectedBodyTypeFromContentType.Should().Be(BodyType.String);
-        result.BodyAsBytes.Should().BeEquivalentTo(new byte[] { 48 });
-        result.BodyAsJson.Should().BeNull();
-        result.BodyAsString.Should().Be("0");
-        result.DetectedCompression.Should().Be(compression);
-    }
+            // Assert
+            result.BodyAsBytes.Should().BeEquivalentTo(compressed);
+            result.DetectedCompression.Should().BeNull();
+        }
 
-    [Theory]
-    [InlineData("gzip")]
-    [InlineData("deflate")]
-    public async Task BodyParser_Parse_ContentEncoding_GZip_And_DecompressGzipAndDeflate_Is_False_Should_Not_Decompress(string compression)
-    {
-        // Arrange
-        var bytes = Encoding.ASCII.GetBytes(Guid.NewGuid().ToString());
-        var compressed = CompressionUtils.Compress(compression, bytes);
-        var bodyParserSettings = new BodyParserSettings
+        [Theory]
+        [InlineData("HEAD", false)]
+        [InlineData("GET", false)]
+        [InlineData("PUT", true)]
+        [InlineData("POST", true)]
+        [InlineData("DELETE", true)]
+        [InlineData("TRACE", false)]
+        [InlineData("OPTIONS", true)]
+        [InlineData("CONNECT", false)]
+        [InlineData("PATCH", true)]
+        public void BodyParser_ShouldParseBodyForMethodAndAllowAllIsFalse_ExpectedResultForKnownMethods(string method, bool resultShouldBe)
         {
-            Stream = new MemoryStream(compressed),
-            ContentType = "text/plain",
-            DeserializeJson = false,
-            ContentEncoding = compression.ToUpperInvariant(),
-            DecompressGZipAndDeflate = false
-        };
+            Check.That(BodyParser.ShouldParseBody(method, false)).Equals(resultShouldBe);
+        }
 
-        // Act
-        var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+        [Theory]
+        [InlineData("HEAD")]
+        [InlineData("GET")]
+        [InlineData("PUT")]
+        [InlineData("POST")]
+        [InlineData("DELETE")]
+        [InlineData("TRACE")]
+        [InlineData("OPTIONS")]
+        [InlineData("CONNECT")]
+        [InlineData("PATCH")]
+        [InlineData("REPORT")]
+        [InlineData("SOME-UNKNOWN-METHOD")]
+        public void BodyParser_ShouldParseBodyForMethodAndAllowAllIsTrue_ExpectedResultShouldBeTrue(string method)
+        {
+            Check.That(BodyParser.ShouldParseBody(method, true)).IsTrue();
+        }
 
-        // Assert
-        result.BodyAsBytes.Should().BeEquivalentTo(compressed);
-        result.DetectedCompression.Should().BeNull();
-    }
-
-    [Theory]
-    [InlineData("HEAD", false)]
-    [InlineData("GET", false)]
-    [InlineData("PUT", true)]
-    [InlineData("POST", true)]
-    [InlineData("DELETE", true)]
-    [InlineData("TRACE", false)]
-    [InlineData("OPTIONS", true)]
-    [InlineData("CONNECT", false)]
-    [InlineData("PATCH", true)]
-    public void BodyParser_ShouldParseBodyForMethodAndAllowAllIsFalse_ExpectedResultForKnownMethods(string method, bool resultShouldBe)
-    {
-        Check.That(BodyParser.ShouldParseBody(method, false)).Equals(resultShouldBe);
-    }
-
-    [Theory]
-    [InlineData("HEAD")]
-    [InlineData("GET")]
-    [InlineData("PUT")]
-    [InlineData("POST")]
-    [InlineData("DELETE")]
-    [InlineData("TRACE")]
-    [InlineData("OPTIONS")]
-    [InlineData("CONNECT")]
-    [InlineData("PATCH")]
-    [InlineData("REPORT")]
-    [InlineData("SOME-UNKNOWN-METHOD")]
-    public void BodyParser_ShouldParseBodyForMethodAndAllowAllIsTrue_ExpectedResultShouldBeTrue(string method)
-    {
-        Check.That(BodyParser.ShouldParseBody(method, true)).IsTrue();
-    }
-
-    [Theory]
-    [InlineData("REPORT")]
-    [InlineData("SOME-UNKNOWN-METHOD")]
-    public void BodyParser_ShouldParseBody_DefaultIsTrueForUnknownMethods(string method)
-    {
-        Check.That(BodyParser.ShouldParseBody(method, false)).IsTrue();
+        [Theory]
+        [InlineData("REPORT")]
+        [InlineData("SOME-UNKNOWN-METHOD")]
+        public void BodyParser_ShouldParseBody_DefaultIsTrueForUnknownMethods(string method)
+        {
+            Check.That(BodyParser.ShouldParseBody(method, false)).IsTrue();
+        }
     }
 }

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

@@ -1,29 +1,30 @@
-using System.Text;
+using System.Text;
 using FluentAssertions;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Util;
-
-public class BytesEncodingUtilsTests
+namespace WireMock.Net.Tests.Util
 {
-    [Fact]
-    public void TryGetEncoding_UTF32()
+    public class BytesEncodingUtilsTests
     {
-        var result = BytesEncodingUtils.TryGetEncoding(new byte[] { 0xff, 0xfe, 0x00, 0x00 }, out Encoding encoding);
+        [Fact]
+        public void TryGetEncoding_UTF32()
+        {
+            var result = BytesEncodingUtils.TryGetEncoding(new byte[] { 0xff, 0xfe, 0x00, 0x00 }, out Encoding encoding);
 
-        // Assert
-        result.Should().BeTrue();
-        encoding.CodePage.Should().Be(Encoding.UTF32.CodePage);
-    }
+            // Assert
+            result.Should().BeTrue();
+            encoding.CodePage.Should().Be(Encoding.UTF32.CodePage);
+        }
 
-    [Fact]
-    public void TryGetEncoding_Invalid()
-    {
-        var result = BytesEncodingUtils.TryGetEncoding(new byte[] { 0xff }, out Encoding encoding);
+        [Fact]
+        public void TryGetEncoding_Invalid()
+        {
+            var result = BytesEncodingUtils.TryGetEncoding(new byte[] { 0xff }, out Encoding encoding);
 
-        // Assert
-        result.Should().BeFalse();
-        encoding.Should().BeNull();
+            // Assert
+            result.Should().BeFalse();
+            encoding.Should().BeNull();
+        }
     }
 }