Generate C# code from Mapping (#842)

* 1

* .

* v

* .

* .

* -

* b

* res b

* Fix UT

* .

* Verify

* v

* ...

* .

* .

* dir

* m

.gitignore

@@ -255,3 +255,5 @@ 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.*

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.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\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.10" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" 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.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\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.10" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" 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.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.10\lib\net452\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.12\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Json.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Random.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.10\lib\net452\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.12\lib\net46\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.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Json" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Json" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Random" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Random" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.XPath" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.XPath" version="2.3.12" 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" />

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

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

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

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

src/WireMock.Net/Extensions/EnumExtensions.cs

@@ -0,0 +1,20 @@
+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/MappingBuilder.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using Newtonsoft.Json;
 using Stef.Validation;
@@ -8,6 +7,7 @@ using WireMock.Owin;
 using WireMock.Serialization;
 using WireMock.Server;
 using WireMock.Settings;
+using WireMock.Util;
 
 namespace WireMock;
 
@@ -18,9 +18,10 @@ 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
@@ -34,25 +35,32 @@ public class MappingBuilder : IMappingBuilder
         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
+        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, saveToFile);
+        return new RespondWithAProvider(RegisterMapping, Guard.NotNull(requestMatcher), _settings, _guidUtils, _dateTimeUtils, saveToFile);
     }
 
     /// <inheritdoc />
@@ -95,7 +103,7 @@ public class MappingBuilder : IMappingBuilder
         // 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;
+            mapping.UpdatedAt = _dateTimeUtils.UtcNow;
             _options.Mappings[mapping.Guid] = mapping;
         }
         else

src/WireMock.Net/RequestBuilders/ICookiesRequestBuilder.cs

@@ -1,10 +1,9 @@
-using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
-{
+
 /// <summary>
 /// The CookieRequestBuilder interface.
 /// </summary>
@@ -17,7 +16,7 @@ namespace WireMock.RequestBuilders
     /// <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);
+    IRequestBuilder WithCookie(string name, string pattern, MatchBehaviour matchBehaviour);
 
     /// <summary>
     /// WithCookie: matching based on name, pattern, ignoreCase and matchBehaviour.
@@ -27,7 +26,7 @@ namespace WireMock.RequestBuilders
     /// <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);
+    IRequestBuilder WithCookie(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
     /// <summary>
     /// WithCookie: matching based on name, patterns and matchBehaviour.
@@ -36,7 +35,7 @@ namespace WireMock.RequestBuilders
     /// <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);
+    IRequestBuilder WithCookie(string name, string[] patterns, MatchBehaviour matchBehaviour);
 
     /// <summary>
     /// WithCookie: matching based on name, patterns, ignoreCase and matchBehaviour.
@@ -46,7 +45,7 @@ namespace WireMock.RequestBuilders
     /// <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);
+    IRequestBuilder WithCookie(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
     /// <summary>
     /// WithCookie: matching based on name and IStringMatcher[].
@@ -54,7 +53,7 @@ namespace WireMock.RequestBuilders
     /// <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);
+    IRequestBuilder WithCookie(string name, params IStringMatcher[] matchers);
 
     /// <summary>
     /// WithCookie: matching based on name, ignoreCase and IStringMatcher[].
@@ -63,7 +62,7 @@ namespace WireMock.RequestBuilders
     /// <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);
+    IRequestBuilder WithCookie(string name, bool ignoreCase, params IStringMatcher[] matchers);
 
     /// <summary>
     /// WithCookie: matching based on name, ignoreCase, matchBehaviour and IStringMatcher[].
@@ -73,13 +72,12 @@ namespace WireMock.RequestBuilders
     /// <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);
+    IRequestBuilder WithCookie(string name, bool ignoreCase, MatchBehaviour matchBehaviour, 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([NotNull] params Func<IDictionary<string, string>, bool>[] funcs);
+    IRequestBuilder WithCookie(params Func<IDictionary<string, string>, bool>[] funcs);
-    }
 }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -1,9 +1,12 @@
 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;
@@ -16,6 +19,8 @@ namespace WireMock.Serialization;
 
 internal class MappingConverter
 {
+    private static readonly string AcceptOnMatch = MatchBehaviour.AcceptOnMatch.GetFullyQualifiedEnumValue();
+
     private readonly MatcherMapper _mapper;
 
     public MappingConverter(MatcherMapper mapper)
@@ -23,6 +28,133 @@ 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;
@@ -237,6 +369,64 @@ 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

@@ -0,0 +1,25 @@
+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/Server/RespondWithAProvider.cs

@@ -28,9 +28,8 @@ 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;
 
@@ -46,20 +45,25 @@ 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);
-        _saveToFile = Guard.NotNull(saveToFile);
+        _dateTimeUtils = Guard.NotNull(dateTimeUtils);
+        _saveToFile = saveToFile;
 
-        Guid = _guidUtils.NewGuid();
+        Guid = guidUtils.NewGuid();
     }
 
     /// <summary>

src/WireMock.Net/Server/WireMockServer.cs

@@ -22,6 +22,7 @@ using WireMock.ResponseProviders;
 using WireMock.Serialization;
 using WireMock.Settings;
 using WireMock.Types;
+using WireMock.Util;
 
 namespace WireMock.Server;
 
@@ -39,6 +40,8 @@ public partial class WireMockServer : IWireMockServer
     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]
@@ -315,7 +318,14 @@ public partial class WireMockServer : IWireMockServer
         _matcherMapper = new MatcherMapper(_settings);
         _mappingConverter = new MappingConverter(_matcherMapper);
         _mappingToFileSaver = new MappingToFileSaver(_settings, _mappingConverter);
-        _mappingBuilder = new MappingBuilder(settings, _options, _mappingConverter, _mappingToFileSaver);
+        _mappingBuilder = new MappingBuilder(
+            settings,
+            _options,
+            _mappingConverter,
+            _mappingToFileSaver,
+            _guidUtils,
+            _dateTimeUtils
+        );
 
 #if USE_ASPNETCORE
         _options.AdditionalServiceRegistration = _settings.AdditionalServiceRegistration;

src/WireMock.Net/WireMock.Net.csproj

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

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

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

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

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

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

@@ -5,8 +5,8 @@ using FluentAssertions;
 using WireMock.Http;
 using Xunit;
 
-namespace WireMock.Net.Tests.Http
+namespace WireMock.Net.Tests.Http;
-{
+
 public class ByteArrayContentHelperTests
 {
     [Fact]
@@ -41,4 +41,3 @@ namespace WireMock.Net.Tests.Http
         (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
     }
 }
-}

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

@@ -8,8 +8,8 @@ using WireMock.Types;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Http
+namespace WireMock.Net.Tests.Http;
-{
+
 public class HttpRequestMessageHelperTests
 {
     private const string ClientIp = "::1";
@@ -161,4 +161,3 @@ namespace WireMock.Net.Tests.Http
         Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=Ascii");
     }
 }
-}

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

@@ -1,10 +1,10 @@
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using FluentAssertions;
 using WireMock.Http;
 using Xunit;
 
-namespace WireMock.Net.Tests.Http
+namespace WireMock.Net.Tests.Http;
-{
+
 public class StringContentHelperTests
 {
     [Fact]
@@ -36,4 +36,3 @@ namespace WireMock.Net.Tests.Http
         result.ReadAsStringAsync().Result.Should().Be("test");
     }
 }
-}

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

@@ -0,0 +1,25 @@
+[
+  {
+    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

@@ -0,0 +1,25 @@
+[
+  {
+    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,5 +1,10 @@
-using FluentAssertions;
+#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;
@@ -7,13 +12,17 @@ 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 string MappingGuid = "41372914-1838-4c67-916b-b9aacdd096ce";
+    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;
 
@@ -23,6 +32,12 @@ public class 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,
@@ -33,7 +48,14 @@ public class MappingBuilderTests
         var mappingConverter = new MappingConverter(matcherMapper);
         var mappingToFileSaver = new MappingToFileSaver(settings, mappingConverter);
 
-        _sut = new MappingBuilder(settings, options, mappingConverter, mappingToFileSaver);
+        _sut = new MappingBuilder(
+            settings,
+            options,
+            mappingConverter,
+            mappingToFileSaver,
+            guidUtilsMock.Object,
+            dateTimeUtilsMock.Object
+        );
 
         _sut.Given(Request.Create()
             .WithPath("/foo")
@@ -45,24 +67,31 @@ public class MappingBuilderTests
         );
     }
 
+    [ModuleInitializer]
+    public static void ModuleInitializer()
+    {
+        VerifierSettings.DontScrubGuids();
+        VerifierSettings.DontScrubDateTimes();
+    }
+
     [Fact]
-    public void GetMappings()
+    public Task GetMappings()
     {
         // Act
         var mappings = _sut.GetMappings();
 
-        // Assert
+        // Verify
-        mappings.Should().HaveCount(1);
+        return Verifier.Verify(mappings);
     }
 
     [Fact]
-    public void ToJson()
+    public Task ToJson()
     {
         // Act
         var json = _sut.ToJson();
 
-        // Assert
+        // Verify
-        json.Should().NotBeEmpty();
+        return Verifier.VerifyJson(json);
     }
 
     [Fact]
@@ -134,3 +163,4 @@ public class MappingBuilderTests
         _fileSystemHandlerMock.VerifyNoOtherCalls();
     }
 }
+#endif

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

@@ -2,8 +2,8 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class CSharpCodeMatcherTests
 {
     [Fact]
@@ -89,4 +89,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(patterns).ContainsExactly("x");
     }
 }
-}

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

@@ -1,10 +1,9 @@
-using AnyOfTypes;
 using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class ContentTypeMatcherTests
 {
     [Theory]
@@ -56,4 +55,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(patterns).ContainsExactly("x");
     }
 }
-}

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

@@ -1,9 +1,9 @@
-using NFluent;
+using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class ExactObjectMatcherTests
 {
     [Fact]
@@ -62,4 +62,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(result).IsEqualTo(0.0);
     }
 }
-}

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

@@ -3,8 +3,8 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class JmesPathMatcherTests
 {
     [Fact]
@@ -163,4 +163,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(match).IsEqualTo(0.0);
     }
 }
-}

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

@@ -7,8 +7,8 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class JsonPartialMatcherTests
 {
     [Fact]
@@ -419,4 +419,3 @@ namespace WireMock.Net.Tests.Matchers
         Assert.Equal(0.0, match);
     }
 }
-}

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

@@ -3,8 +3,8 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class LinqMatcherTests
 {
     [Fact]
@@ -109,4 +109,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(patterns).ContainsExactly("x");
     }
 }
-}

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

@@ -1,9 +1,9 @@
-using NFluent;
+using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class MatchBehaviourHelperTests
 {
     [Fact]
@@ -22,4 +22,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 1.0)).IsEqualTo(0.0);
     }
 }
-}

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

@@ -3,8 +3,8 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class NotNullOrEmptyMatcherTests
 {
     [Fact]
@@ -81,4 +81,3 @@ namespace WireMock.Net.Tests.Matchers
         patterns.Should().BeEmpty();
     }
 }
-}

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

@@ -4,8 +4,8 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class RegexMatcherTests
 {
     [Fact]
@@ -124,4 +124,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(result).IsEqualTo(0.0);
     }
 }
-}

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

@@ -1,11 +1,11 @@
-using System.Linq;
+using System.Linq;
 using FluentAssertions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class RequestMatchResultTests
 {
     [Fact]
@@ -51,4 +51,3 @@ namespace WireMock.Net.Tests.Matchers
         best.Should().Be(result2);
     }
 }
-}

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

@@ -2,8 +2,8 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class SimMetricsMatcherTests
 {
     [Fact]
@@ -84,4 +84,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(result).IsEqualTo(0.0);
     }
 }
-}

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

@@ -5,8 +5,8 @@ using WireMock.Matchers;
 using WireMock.Models;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
-{
+
 public class WildcardMatcherTest
 {
     [Fact]
@@ -136,4 +136,3 @@ namespace WireMock.Net.Tests.Matchers
         Check.That(result).IsEqualTo(0.0);
     }
 }
-}

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

@@ -3,8 +3,8 @@ using NFluent;
 using WireMock.RegularExpressions;
 using Xunit;
 
-namespace WireMock.Net.Tests.RegularExpressions
+namespace WireMock.Net.Tests.RegularExpressions;
-{
+
 public class RegexExtendedTests
 {
     /// <summary>
@@ -97,4 +97,3 @@ namespace WireMock.Net.Tests.RegularExpressions
         Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
     }
 }
-}

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

@@ -1,11 +1,11 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders
+namespace WireMock.Net.Tests.RequestBuilders;
-{
+
 public class RequestBuilderUsingMethodTests
 {
     [Fact]
@@ -75,4 +75,3 @@ namespace WireMock.Net.Tests.RequestBuilders
         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,8 +6,8 @@ using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders
+namespace WireMock.Net.Tests.RequestBuilders;
-{
+
 public class RequestBuilderWithBodyTests
 {
     [Fact]
@@ -41,4 +41,3 @@ namespace WireMock.Net.Tests.RequestBuilders
         ((RequestMessageBodyMatcher)matchers[0]).Matchers.Should().Contain(new[] { matcher1, matcher2 });
     }
 }
-}

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

@@ -1,12 +1,12 @@
-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
+namespace WireMock.Net.Tests.RequestBuilders;
-{
+
 public class RequestBuilderWithCookieTests
 {
     [Fact]
@@ -45,4 +45,3 @@ namespace WireMock.Net.Tests.RequestBuilders
         Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
     }
 }
-}

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

@@ -1,12 +1,12 @@
-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
+namespace WireMock.Net.Tests.RequestBuilders;
-{
+
 public class RequestBuilderWithHeaderTests
 {
     [Fact]
@@ -81,4 +81,3 @@ namespace WireMock.Net.Tests.RequestBuilders
         Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
     }
 }
-}

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

@@ -1,12 +1,12 @@
-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
+namespace WireMock.Net.Tests.RequestBuilders;
-{
+
 public class RequestBuilderWithParamTests
 {
     [Fact]
@@ -57,4 +57,3 @@ namespace WireMock.Net.Tests.RequestBuilders
         Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
     }
 }
-}

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

@@ -5,8 +5,8 @@ using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestBuilders
+namespace WireMock.Net.Tests.RequestBuilders;
-{
+
 public class RequestBuilderWithUrlTests
 {
     [Fact]
@@ -57,4 +57,3 @@ namespace WireMock.Net.Tests.RequestBuilders
         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,8 +6,8 @@ using WireMock.Matchers.Request;
 using WireMock.Models;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestMatchers
+namespace WireMock.Net.Tests.RequestMatchers;
-{
+
 public class RequestMessageCompositeMatcherTests
 {
     private class Helper : RequestMessageCompositeMatcher
@@ -80,4 +80,3 @@ namespace WireMock.Net.Tests.RequestMatchers
         requestMatcher2Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
     }
 }
-}

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

@@ -1,12 +1,12 @@
-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
+namespace WireMock.Net.Tests.RequestMatchers;
-{
+
 public class RequestMessageCookieMatcherTests
 {
     [Fact]
@@ -151,4 +151,3 @@ namespace WireMock.Net.Tests.RequestMatchers
         Check.That(score).IsEqualTo(1.0d);
     }
 }
-}

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

@@ -7,8 +7,8 @@ using WireMock.Owin;
 using WireMock.Types;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestMatchers
+namespace WireMock.Net.Tests.RequestMatchers;
-{
+
 public class RequestMessageParamMatcherTests
 {
     [Fact]
@@ -196,4 +196,3 @@ namespace WireMock.Net.Tests.RequestMatchers
         score.Should().Be(1.0);
     }
 }
-}

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

@@ -0,0 +1,16 @@
+{
+  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

@@ -0,0 +1,14 @@
+{
+  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

@@ -0,0 +1,16 @@
+{
+  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

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

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

@@ -0,0 +1,127 @@
+#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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,12 @@
+{
+  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

@@ -0,0 +1,17 @@
+{
+  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

@@ -0,0 +1,13 @@
+{
+  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

@@ -0,0 +1,13 @@
+{
+  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

@@ -0,0 +1,15 @@
+{
+  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

@@ -0,0 +1,9 @@
+{
+  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

@@ -0,0 +1,34 @@
+{
+  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

@@ -0,0 +1,21 @@
+{
+  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,7 +1,12 @@
+#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;
@@ -13,9 +18,10 @@ using Xunit;
 
 namespace WireMock.Net.Tests.Serialization;
 
-public class MappingConverterTests
+public partial class MappingConverterTests
 {
-    private readonly DateTime _updatedAt = new(2022, 12, 4);
+    private readonly Guid _guid = new("c8eeaf99-d5c4-4341-8543-4597c3fd40d9");
+    private readonly DateTime _updatedAt = new(2022, 12, 4, 11, 12, 13);
     private readonly WireMockServerSettings _settings = new();
 
     private readonly MappingConverter _sut;
@@ -26,7 +32,7 @@ public class MappingConverterTests
     }
 
     [Fact]
-    public void ToMappingModel_With_SingleWebHook()
+    public Task ToMappingModel_With_SingleWebHook()
     {
         // Assign
         var request = Request.Create();
@@ -53,7 +59,7 @@ public class MappingConverterTests
                 }
             }
         };
-        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, false, null);
+        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -74,10 +80,13 @@ public 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 void ToMappingModel_With_MultipleWebHooks()
+    public Task ToMappingModel_With_MultipleWebHooks()
     {
         // Assign
         var request = Request.Create();
@@ -123,7 +132,7 @@ public class MappingConverterTests
                 }
             }
         };
-        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, true, null);
+        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, true, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -148,17 +157,20 @@ public 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 void ToMappingModel_WithTitle_And_Description_ReturnsCorrectModel()
+    public Task 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.NewGuid(), _updatedAt, title, description, null, _settings, request, response, 0, null, null, null, null, null, false, null);
+        var mapping = new Mapping(_guid, _updatedAt, title, description, null, _settings, request, response, 0, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -167,15 +179,18 @@ public class MappingConverterTests
         model.Should().NotBeNull();
         model.Title.Should().Be(title);
         model.Description.Should().Be(description);
+
+        // Verify
+        return Verifier.Verify(model);
     }
 
     [Fact]
-    public void ToMappingModel_WithPriority_ReturnsPriority()
+    public Task ToMappingModel_WithPriority_ReturnsPriority()
     {
         // Assign
         var request = Request.Create();
         var response = Response.Create().WithBodyAsJson(new { x = "x" }).WithTransformer();
-        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -184,13 +199,16 @@ public class MappingConverterTests
         model.Should().NotBeNull();
         model.Priority.Should().Be(42);
         model.Response.UseTransformer.Should().BeTrue();
+
+        // Verify
+        return Verifier.Verify(model);
     }
 
     [Fact]
-    public void ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings()
+    public Task ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings()
     {
         // Assign
-        var start = DateTime.Now;
+        var start = new DateTime(2023, 1, 14, 15, 16, 17);
         var ttl = 100;
         var end = start.AddSeconds(ttl);
         var request = Request.Create();
@@ -201,7 +219,7 @@ public class MappingConverterTests
             End = end,
             TTL = ttl
         };
-        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, timeSettings);
+        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, timeSettings);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -212,6 +230,9 @@ public 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]
@@ -241,13 +262,13 @@ public class MappingConverterTests
     }
 
     [Fact]
-    public void ToMappingModel_WithDelayAsMilleSeconds_ReturnsCorrectModel()
+    public Task ToMappingModel_WithDelayAsMilleSeconds_ReturnsCorrectModel()
     {
         // Assign
         var delay = 1000;
         var request = Request.Create();
         var response = Response.Create().WithDelay(delay);
-        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -255,16 +276,19 @@ public class MappingConverterTests
         // Assert
         model.Should().NotBeNull();
         model.Response.Delay.Should().Be(delay);
+
+        // Verify
+        return Verifier.Verify(model);
     }
 
     [Fact]
-    public void ToMappingModel_WithRandomMinimumDelay_ReturnsCorrectModel()
+    public Task ToMappingModel_WithRandomMinimumDelay_ReturnsCorrectModel()
     {
         // Assign
         int minimumDelay = 1000;
         var request = Request.Create();
         var response = Response.Create().WithRandomDelay(minimumDelay);
-        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -274,17 +298,20 @@ public 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 void ToMappingModel_WithRandomDelay_ReturnsCorrectModel()
+    public Task 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.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(_guid, _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -294,5 +321,9 @@ public 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

@@ -0,0 +1,75 @@
+{
+  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,8 +1,10 @@
+#if !(NET452 || NET461 || NETCOREAPP3_1)
 using System;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using Moq;
-using Newtonsoft.Json;
+using VerifyTests;
-using System.IO;
+using VerifyXunit;
-using FluentAssertions;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
 using WireMock.Serialization;
@@ -12,6 +14,7 @@ using Xunit;
 
 namespace WireMock.Net.Tests.Serialization;
 
+[UsesVerify]
 public class ProxyMappingConverterTests
 {
     private readonly WireMockServerSettings _settings = new();
@@ -33,8 +36,15 @@ public class ProxyMappingConverterTests
         _sut = new ProxyMappingConverter(_settings, guidUtilsMock.Object, dateTimeUtilsMock.Object);
     }
 
+    [ModuleInitializer]
+    public static void ModuleInitializer()
+    {
+        VerifierSettings.DontScrubGuids();
+        VerifierSettings.DontScrubDateTimes();
+    }
+
     [Fact]
-    public void ToMapping_UseDefinedRequestMatchers_True()
+    public Task ToMapping_UseDefinedRequestMatchers_True()
     {
         // Arrange
         var proxyAndRecordSettings = new ProxyAndRecordSettings
@@ -49,7 +59,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);
@@ -65,9 +75,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"));
 
-        json.Should().Be(expected);
+        // Verify
+        return Verifier.Verify(model);
     }
 }
+#endif

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

@@ -0,0 +1,21 @@
+{
+  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

@@ -0,0 +1,16 @@
+{
+  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

@@ -0,0 +1,18 @@
+{
+  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

@@ -0,0 +1,16 @@
+{
+  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,5 +1,9 @@
+#if !(NET452 || NET461 || NETCOREAPP3_1)
 using System.Collections.Generic;
-using FluentAssertions;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using VerifyTests;
+using VerifyXunit;
 using WireMock.Admin.Mappings;
 using WireMock.Models;
 using WireMock.Serialization;
@@ -9,10 +13,18 @@ using Xunit;
 
 namespace WireMock.Net.Tests.Serialization;
 
+[UsesVerify]
 public class WebhookMapperTests
 {
+    [ModuleInitializer]
+    public static void ModuleInitializer()
+    {
+        VerifierSettings.DontScrubGuids();
+        VerifierSettings.DontScrubDateTimes();
+    }
+
     [Fact]
-    public void WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsFalse()
+    public Task WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsFalse()
     {
         // Assign
         var model = new WebhookModel
@@ -32,17 +44,12 @@ public class WebhookMapperTests
 
         var result = WebhookMapper.Map(model);
 
-        result.Request.Url.Should().Be("https://localhost");
+        // Verify
-        result.Request.Method.Should().Be("get");
+        return Verifier.Verify(result);
-        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 void WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsTrue()
+    public Task WebhookMapper_Map_WebhookModel_BodyAsString_And_UseTransformerIsTrue()
     {
         // Assign
         var model = new WebhookModel
@@ -62,18 +69,12 @@ public class WebhookMapperTests
 
         var result = WebhookMapper.Map(model);
 
-        result.Request.Url.Should().Be("https://localhost");
+        // Verify
-        result.Request.Method.Should().Be("get");
+        return Verifier.Verify(result);
-        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 void WebhookMapper_Map_WebhookModel_BodyAsJson()
+    public Task WebhookMapper_Map_WebhookModel_BodyAsJson()
     {
         // Assign
         var model = new WebhookModel
@@ -95,19 +96,12 @@ public class WebhookMapperTests
 
         var result = WebhookMapper.Map(model);
 
-        result.Request.Url.Should().Be("https://localhost");
+        // Verify
-        result.Request.Method.Should().Be("get");
+        return Verifier.Verify(result);
-        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 void WebhookMapper_Map_Webhook_To_Model()
+    public Task WebhookMapper_Map_Webhook_To_Model()
     {
         // Assign
         var webhook = new Webhook
@@ -134,12 +128,8 @@ public class WebhookMapperTests
 
         var result = WebhookMapper.Map(webhook);
 
-        result.Request.Url.Should().Be("https://localhost");
+        // Verify
-        result.Request.Method.Should().Be("get");
+        return Verifier.Verify(result);
-        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

@@ -1,75 +0,0 @@
-{
-  "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,8 +9,8 @@ using WireMock.Types;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Util
+namespace WireMock.Net.Tests.Util;
-{
+
 public class BodyParserTests
 {
     [Theory]
@@ -290,4 +290,3 @@ Content-Type: text/html
         Check.That(BodyParser.ShouldParseBody(method, false)).IsTrue();
     }
 }
-}

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

@@ -1,10 +1,10 @@
-using System.Text;
+using System.Text;
 using FluentAssertions;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Util
+namespace WireMock.Net.Tests.Util;
-{
+
 public class BytesEncodingUtilsTests
 {
     [Fact]
@@ -27,4 +27,3 @@ namespace WireMock.Net.Tests.Util
         encoding.Should().BeNull();
     }
 }
-}

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

@@ -1,11 +1,11 @@
-using FluentAssertions;
+using FluentAssertions;
 using System;
 using System.Net;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Util
+namespace WireMock.Net.Tests.Util;
-{
+
 /// <summary>
 /// Based on https://raw.githubusercontent.com/tmenier/Flurl/129565361e135e639f1d44a35a78aea4302ac6ca/Test/Flurl.Test/Http/HttpStatusRangeParserTests.cs 
 /// </summary>
@@ -72,4 +72,3 @@ namespace WireMock.Net.Tests.Util
         Assert.Throws<ArgumentException>(() => HttpStatusRangeParser.IsMatch(pattern, 100));
     }
 }
-}

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

@@ -2,8 +2,8 @@ using FluentAssertions;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Util
+namespace WireMock.Net.Tests.Util;
-{
+
 public class StringUtilsTests
 {
     [Theory]
@@ -101,4 +101,3 @@ namespace WireMock.Net.Tests.Util
         quote.Should().Be('"');
     }
 }
-}

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 #if NET452
 using Microsoft.Owin;
 #else
@@ -8,8 +8,8 @@ using NFluent;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.Util
+namespace WireMock.Net.Tests.Util;
-{
+
 public class UrlUtilsTests
 {
     [Fact]
@@ -54,4 +54,3 @@ namespace WireMock.Net.Tests.Util
         Check.That(result.AbsoluteUrl.ToString()).Equals("https://localhost:1234/a/b?x=0");
     }
 }
-}

test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs

@@ -0,0 +1,15 @@
+#if !(NET452 || NET461)
+using VerifyTests;
+
+namespace WireMock.Net.Tests.VerifyExtensions;
+
+internal static class VerifySettingsExtensions
+{
+    public static void Init<T>(this VerifySettings verifySettings)
+    {
+        verifySettings.DontScrubDateTimes();
+        verifySettings.DontScrubDateTimes();
+        verifySettings.UseDirectory($"{typeof(T).Name}.Verify");
+    }
+}
+#endif

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

@@ -24,6 +24,18 @@
         <DefineConstants>NETFRAMEWORK</DefineConstants>
     </PropertyGroup>
 
+    <ItemGroup>
+        <!-- https://stackoverflow.com/questions/59406201/filenesting-not-working-for-class-or-shared-library-projects -->
+        <ProjectCapability Include="ConfigurableFileNesting" />
+        <ProjectCapability Include="ConfigurableFileNestingFeatureEnabled" />
+    </ItemGroup>
+
+    <!--<ItemGroup>
+        <Compile Update="**\*.*.verified.txt">
+            <DependentUpon>$([System.String]::Copy((Filename)*.cs))</DependentUpon>
+        </Compile>
+    </ItemGroup>-->
+
     <ItemGroup>
         <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
         <ProjectReference Include="..\..\src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj" />
@@ -41,12 +53,6 @@
         </PackageReference>
         <PackageReference Include="CultureAwareTesting.xUnit" Version="0.0.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.core" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="coverlet.collector" Version="3.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -66,10 +72,23 @@
         <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="3.1.0" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.core" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net461'">
-        <PackageReference Include="FluentAssertions" Version="6.7.0" />
+        <PackageReference Include="FluentAssertions" Version="6.9.0" />
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.core" Version="2.4.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Verify.Xunit" Version="19.6.0" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net452'">
@@ -81,9 +100,6 @@
         <None Update="responsebody.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="Serialization\files\proxy.json">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
         <None Update="__admin\mappings.org\*.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
@@ -108,7 +124,6 @@
 
     <ItemGroup>
       <Folder Include="Pact\files\" />
-      <Folder Include="Serialization\files\" />
     </ItemGroup>
 
 </Project>

test/WireMock.Net.Tests/WireMockServer.Admin.cs

@@ -146,7 +146,7 @@ public class WireMockServerAdminTests
 
         string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "responsebody.json");
 
-        dynamic jsonObj = JsonConvert.DeserializeObject(json);
+        dynamic jsonObj = JsonConvert.DeserializeObject(json)!;
         jsonObj["Response"]["BodyAsFile"] = responseBodyFilePath;
 
         string output = JsonConvert.SerializeObject(jsonObj, Formatting.Indented);

test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 using FluentAssertions;
 using WireMock.Admin.Mappings;
 using WireMock.Server;
 using Xunit;
 
-namespace WireMock.Net.Tests.WithMapping
+namespace WireMock.Net.Tests.WithMapping;
-{
+
 public class WireMockServerWithMappingTests
 {
     [Fact]
@@ -49,7 +49,7 @@ namespace WireMock.Net.Tests.WithMapping
             //((PathModel)m.Request.Path).Matchers.OfType<WildcardMatcher>().First().GetPatterns().First() == "/foo*"
             // m.Request.Body.Matchers.OfType<ExactMatcher>().First().GetPatterns().First() == pattern &&
             m.Response.Body == response &&
-                (int)m.Response.StatusCode == 201
+            (int?)m.Response.StatusCode == 201
         );
 
         server.Stop();
@@ -86,7 +86,7 @@ namespace WireMock.Net.Tests.WithMapping
         // Assert
         server.MappingModels.Should().HaveCount(1).And.Contain(m =>
             m.Guid == Guid.Parse("532889c2-f84d-4dc8-b847-9ea2c6aca7d5") &&
-                (int)m.Response.StatusCode == 201
+            (int?)m.Response.StatusCode == 201
         );
 
         server.Stop();
@@ -128,4 +128,3 @@ namespace WireMock.Net.Tests.WithMapping
         server.Stop();
     }
 }
-}