Upgrade Google.Protobuf in test project

CHANGELOG.md

@@ -1,12 +1,3 @@
-# 1.5.53 (08 May 2024)
-- [#1093](https://github.com/WireMock-Net/WireMock.Net/pull/1093) - Update Handlebars.Net [feature] contributed by [StefH](https://github.com/StefH)
-- [#1101](https://github.com/WireMock-Net/WireMock.Net/pull/1101) - Fix MappingConverter to support Body with JsonMatcher [bug] contributed by [StefH](https://github.com/StefH)
-- [#1095](https://github.com/WireMock-Net/WireMock.Net/issues/1095) - When using C# code generation WithBody() matcher is not generated for POST Request [bug]
-
-# 1.5.52 (06 April 2024)
-- [#1091](https://github.com/WireMock-Net/WireMock.Net/pull/1091) - Add RegEx support to JsonMatcher [feature] contributed by [StefH](https://github.com/StefH)
-- [#1088](https://github.com/WireMock-Net/WireMock.Net/issues/1088) - Regex support for JsonMatcher  [feature]
-
 # 1.5.51 (20 March 2024)
 - [#1085](https://github.com/WireMock-Net/WireMock.Net/pull/1085) - Fix FluentAssertions (actual body is not displayed in error message) [bug] contributed by [StefH](https://github.com/StefH)
 - [#1084](https://github.com/WireMock-Net/WireMock.Net/issues/1084) - FluentAssertions - Actual body is not displayed in error message when using Json Body [bug]

Directory.Build.props

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

Generate-ReleaseNotes.cmd

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

PackageReleaseNotes.txt

@@ -1,6 +1,5 @@
-# 1.5.53 (08 May 2024)
-- #1093 Update Handlebars.Net [feature]
-- #1101 Fix MappingConverter to support Body with JsonMatcher [bug]
-- #1095 When using C# code generation WithBody() matcher is not generated for POST Request [bug]
+# 1.5.51 (20 March 2024)
+- #1085 Fix FluentAssertions (actual body is not displayed in error message) [bug]
+- #1084 FluentAssertions - Actual body is not displayed in error message when using Json Body [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

examples/WireMock.Net.Console.GrpcClient/WireMock.Net.Console.GrpcClient.csproj

@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.60.0">
+        <PackageReference Include="Google.Protobuf" Version="3.26.0" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.62.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

examples/WireMock.Net.Console.NET7.UsingNuGet/Program.cs

@@ -1,8 +1,6 @@
 using System.Net;
-using System.Net.Http.Headers;
 using System.Text;
 using FluentAssertions;
-using MimeKit;
 using WireMock.Logging;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -20,90 +18,17 @@ internal class Program
             Logger = new WireMockConsoleLogger(),
         });
 
-        server
-            .Given(Request.Create()
-                .UsingPost()
-                .WithPath("/test")
-            )
-            .RespondWith(Response.Create()
-                .WithBody(requestMessage => requestMessage.BodyAsMimeMessage != null ?
-                    "BodyAsMimeMessage is present" :
-                    "BodyAsMimeMessage is not present")
-        );
+        server.Given(Request.Create().UsingPost().WithPath("/some/endpoint"))
+            .RespondWith(Response.Create().WithStatusCode(HttpStatusCode.Created));
 
-        server
-            .Given(Request.Create()
-                .UsingPost()
-                .WithPath("/some/endpoint")
-            )
-            .RespondWith(Response.Create()
-                .WithStatusCode(HttpStatusCode.Created)
-            );
-
-        var httpClient = server.CreateClient();
-        var content = new StringContent("abc", Encoding.UTF8, "application/json");
-
-        await TestAsync(httpClient, content);
-
-        await TestNoMultiPartAsync(httpClient, content);
-
-        await TestMultiPartAsync(server);
-    }
-
-    private static async Task TestNoMultiPartAsync(HttpClient httpClient, StringContent content)
-    {
-        var response = await httpClient.PostAsync("/test", content);
-
-        response.StatusCode.Should().Be(HttpStatusCode.OK);
-        (await response.Content.ReadAsStringAsync()).Should().Be("BodyAsMimeMessage is not present");
-    }
-
-    private static async Task TestAsync(HttpClient httpClient, StringContent content)
-    {
-        var response = await httpClient.PostAsync("some/endpoint", content);
-
-        response.StatusCode.Should().Be(HttpStatusCode.Created);
-        (await response.Content.ReadAsStringAsync()).Should().BeEmpty();
-    }
-
-    private static async Task TestMultiPartAsync(WireMockServer server)
-    {
-        var textPlainContent = "This is some plain text";
-        var textPlainContentType = "text/plain";
-
-        var textJson = "{ \"Key\" : \"Value\" }";
-        var textJsonContentType = "text/json";
-
-        var imagePngBytes = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC");
-
-        server
-            .Given(
-                Request.Create()
-                    .UsingPost()
-                    .WithPath("/multipart")
-            )
-            .RespondWith(Response.Create()
-                .WithBody(requestMessage => requestMessage.BodyAsMimeMessage is MimeMessage mm ?
-                    "BodyAsMimeMessage is present: " + ((MimePart)mm.BodyParts.Last()).FileName :
-                    "BodyAsMimeMessage is not present")
-            );
+        var httpClient = new HttpClient { BaseAddress = new Uri(server.Url!) };
+        var requestUri = new Uri(httpClient.BaseAddress!, "some/endpoint");
+        var content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
 
         // Act
-        var formDataContent = new MultipartFormDataContent
-        {
-            { new StringContent(textPlainContent, Encoding.UTF8, textPlainContentType), "text" },
-            { new StringContent(textJson, Encoding.UTF8, textJsonContentType), "json" }
-        };
+        var actual = await httpClient.PostAsync(requestUri, content);
 
-        var fileContent = new ByteArrayContent(imagePngBytes);
-        fileContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
-        formDataContent.Add(fileContent, "somefile", "image.png");
-
-        var client = server.CreateClient();
-
-        var response = await client.PostAsync("/multipart", formDataContent);
-
-        response.StatusCode.Should().Be(HttpStatusCode.OK);
-        (await response.Content.ReadAsStringAsync()).Should().Be("BodyAsMimeMessage is present: image.png");
+        // Assert
+        actual.StatusCode.Should().Be(HttpStatusCode.Created);
     }
 }

examples/WireMock.Net.Console.NET7.UsingNuGet/WireMock.Net.Console.NET7.UsingNuGet.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="WireMock.Net" Version="1.5.51" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="WireMock.Net" Version="1.5.42" />
   </ItemGroup>
 
 </Project>

src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs

@@ -48,7 +48,7 @@ public class MatcherModel
     /// </summary>
     public string? MatchOperator { get; set; }
 
-    #region JsonMatcher, JsonPartialMatcher and JsonPartialWildcardMatcher
+    #region JsonPartialMatcher and JsonPartialWildcardMatcher
     /// <summary>
     /// Support Regex.
     /// </summary>

src/WireMock.Net/Matchers/AbstractJsonPartialMatcher.cs

@@ -10,15 +10,20 @@ namespace WireMock.Matchers;
 /// </summary>
 public abstract class AbstractJsonPartialMatcher : JsonMatcher
 {
+    /// <summary>
+    /// Support Regex
+    /// </summary>
+    public bool Regex { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="AbstractJsonPartialMatcher"/> class.
     /// </summary>
     /// <param name="value">The string value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(string value, bool ignoreCase = false, bool regex = false) :
-        base(value, ignoreCase, regex)
+    protected AbstractJsonPartialMatcher(string value, bool ignoreCase = false, bool regex = false) : base(value, ignoreCase)
     {
+        Regex = regex;
     }
 
     /// <summary>
@@ -27,9 +32,9 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
     /// <param name="value">The object value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(object value, bool ignoreCase = false, bool regex = false) :
-        base(value, ignoreCase, regex)
+    protected AbstractJsonPartialMatcher(object value, bool ignoreCase = false, bool regex = false) : base(value, ignoreCase)
     {
+        Regex = regex;
     }
 
     /// <summary>
@@ -39,15 +44,15 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
     /// <param name="value">The value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false) :
-        base(matchBehaviour, value, ignoreCase, regex)
+    protected AbstractJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false) : base(matchBehaviour, value, ignoreCase)
     {
+        Regex = regex;
     }
 
     /// <inheritdoc />
-    protected override bool IsMatch(JToken value, JToken? input)
+    protected override bool IsMatch(JToken? value, JToken? input)
     {
-        if (value == input)
+        if (value == null || value == input)
         {
             return true;
         }
@@ -67,7 +72,7 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
             ((value.Type == JTokenType.Guid && input.Type == JTokenType.String) ||
             (value.Type == JTokenType.String && input.Type == JTokenType.Guid)))
         {
-            return IsMatch(value.ToString().ToUpperInvariant(), input.ToString().ToUpperInvariant());
+            return IsMatch(value.ToString(), input.ToString());
         }
 
         if (input == null || value.Type != input.Type)

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
 using WireMock.Util;
-using JsonUtils = WireMock.Util.JsonUtils;
 
 namespace WireMock.Matchers;
 
@@ -25,11 +23,6 @@ public class JsonMatcher : IJsonMatcher
     /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
     public bool IgnoreCase { get; }
 
-    /// <summary>
-    /// Support Regex
-    /// </summary>
-    public bool Regex { get; }
-
     private readonly JToken _valueAsJToken;
     private readonly Func<JToken, JToken> _jTokenConverter;
 
@@ -38,8 +31,7 @@ public class JsonMatcher : IJsonMatcher
     /// </summary>
     /// <param name="value">The string value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(string value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
+    public JsonMatcher(string value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
     {
     }
 
@@ -48,8 +40,7 @@ public class JsonMatcher : IJsonMatcher
     /// </summary>
     /// <param name="value">The object value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(object value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
+    public JsonMatcher(object value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
     {
     }
 
@@ -59,14 +50,12 @@ public class JsonMatcher : IJsonMatcher
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="value">The value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
+    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false)
     {
         Guard.NotNull(value);
 
         MatchBehaviour = matchBehaviour;
         IgnoreCase = ignoreCase;
-        Regex = regex;
 
         Value = value;
         _valueAsJToken = JsonUtils.ConvertValueToJToken(value);
@@ -104,79 +93,9 @@ public class JsonMatcher : IJsonMatcher
     /// <param name="value">Matcher value</param>
     /// <param name="input">Input value</param>
     /// <returns></returns>
-    protected virtual bool IsMatch(JToken value, JToken? input)
+    protected virtual bool IsMatch(JToken value, JToken input)
     {
-        // If equal, return true.
-        if (input == value)
-        {
-            return true;
-        }
-
-        // If input is null, return false.
-        if (input == null)
-        {
-            return false;
-        }
-
-        // If using Regex and the value is a string, use the MatchRegex method.
-        if (Regex && value.Type == JTokenType.String)
-        {
-            var valueAsString = value.ToString();
-
-            var (valid, result) = RegexUtils.MatchRegex(valueAsString, input.ToString());
-            if (valid)
-            {
-                return result;
-            }
-        }
-
-        // If the value is a Guid and the input is a string, or vice versa, convert them to strings and compare the string values.
-        if ((value.Type == JTokenType.Guid && input.Type == JTokenType.String) || (value.Type == JTokenType.String && input.Type == JTokenType.Guid))
-        {
-            return JToken.DeepEquals(value.ToString().ToUpperInvariant(), input.ToString().ToUpperInvariant());
-        }
-
-        switch (value.Type)
-        {
-            // If the value is an object, compare all properties.
-            case JTokenType.Object:
-                var valueProperties = value.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
-                var inputProperties = input.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
-
-                // If the number of properties is different, return false.
-                if (valueProperties.Count != inputProperties.Count)
-                {
-                    return false;
-                }
-
-                // Compare all properties. The input must match all properties of the value.
-                foreach (var pair in valueProperties)
-                {
-                    if (!IsMatch(pair.Value, inputProperties[pair.Key]))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-
-            // If the value is an array, compare all elements.
-            case JTokenType.Array:
-                var valueArray = value.ToObject<JToken[]>() ?? EmptyArray<JToken>.Value;
-                var inputArray = input.ToObject<JToken[]>() ?? EmptyArray<JToken>.Value;
-
-                // If the number of elements is different, return false.
-                if (valueArray.Length != inputArray.Length)
-                {
-                    return false;
-                }
-
-                return !valueArray.Where((valueToken, index) => !IsMatch(valueToken, inputArray[index])).Any();
-
-            default:
-                // Use JToken.DeepEquals() for all other types.
-                return JToken.DeepEquals(value, input);
-        }
+        return JToken.DeepEquals(value, input);
     }
 
     private static string? ToUpper(string? input)

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -143,21 +143,25 @@ internal class MappingConverter
 
         if (requestMessageBodyMatcher is { Matchers: { } })
         {
-            var firstMatcher = requestMessageBodyMatcher.Matchers.FirstOrDefault();
-
-            if (firstMatcher is WildcardMatcher wildcardMatcher && wildcardMatcher.GetPatterns().Any())
+            if (requestMessageBodyMatcher.Matchers.OfType<WildcardMatcher>().FirstOrDefault() is { } wildcardMatcher && wildcardMatcher.GetPatterns().Any())
             {
                 sb.AppendLine($"        .WithBody({GetString(wildcardMatcher)})");
             }
-
-            if (firstMatcher is JsonMatcher jsonMatcher)
+            else if (requestMessageBodyMatcher.Matchers.OfType<JsonPartialMatcher>().FirstOrDefault() is { Value: { } } jsonPartialMatcher)
             {
-                var matcherType = jsonMatcher.GetType().Name;
-                sb.AppendLine($"        .WithBody(new {matcherType}(");
-                sb.AppendLine($"            value: {ConvertToAnonymousObjectDefinition(jsonMatcher.Value, 3)},");
-                sb.AppendLine($"            ignoreCase: {ToCSharpBooleanLiteral(jsonMatcher.IgnoreCase)},");
-                sb.AppendLine($"            regex: {ToCSharpBooleanLiteral(jsonMatcher.Regex)}");
-                sb.AppendLine(@"        ))");
+                sb.AppendLine(@$"        .WithBody(new JsonPartialMatcher(
+                                            value: {ToCSharpStringLiteral(jsonPartialMatcher.Value.ToString())},
+                                            ignoreCase: {ToCSharpBooleanLiteral(jsonPartialMatcher.IgnoreCase)},
+                                            regex: {ToCSharpBooleanLiteral(jsonPartialMatcher.Regex)}
+                                         ))");
+            }
+            else if (requestMessageBodyMatcher.Matchers.OfType<JsonPartialWildcardMatcher>().FirstOrDefault() is { Value: { } } jsonPartialWildcardMatcher)
+            {
+                sb.AppendLine(@$"        .WithBody(new JsonPartialWildcardMatcher(
+                                            value: {ToCSharpStringLiteral(jsonPartialWildcardMatcher.Value.ToString())},
+                                            ignoreCase: {ToCSharpBooleanLiteral(jsonPartialWildcardMatcher.IgnoreCase)},
+                                            regex: {ToCSharpBooleanLiteral(jsonPartialWildcardMatcher.Regex)}
+                                         ))");
             }
         }
 

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -84,7 +84,7 @@ internal class MatcherMapper
 
             case nameof(JsonMatcher):
                 var valueForJsonMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
-                return new JsonMatcher(matchBehaviour, valueForJsonMatcher!, ignoreCase, useRegex);
+                return new JsonMatcher(matchBehaviour, valueForJsonMatcher!, ignoreCase);
 
             case nameof(JsonPartialMatcher):
                 var valueForJsonPartialMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
@@ -152,8 +152,12 @@ internal class MatcherMapper
 
         switch (matcher)
         {
-            case JsonMatcher jsonMatcher:
-                model.Regex = jsonMatcher.Regex;
+            case JsonPartialMatcher jsonPartialMatcher:
+                model.Regex = jsonPartialMatcher.Regex;
+                break;
+
+            case JsonPartialWildcardMatcher jsonPartialWildcardMatcher:
+                model.Regex = jsonPartialWildcardMatcher.Regex;
                 break;
 
             case XPathMatcher xpathMatcher:

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

@@ -344,13 +344,15 @@ public partial class WireMockServer
 
     private static MappingConverterType GetMappingConverterType(IRequestMessage requestMessage)
     {
+        var mappingConverterType = MappingConverterType.Server;
+
         if (requestMessage.QueryIgnoreCase?.TryGetValue(nameof(MappingConverterType), out var values) == true &&
             Enum.TryParse(values.FirstOrDefault(), true, out MappingConverterType parsed))
         {
-            return parsed;
+            mappingConverterType = parsed;
         }
 
-        return MappingConverterType.Server;
+        return mappingConverterType;
     }
 
     private IMapping? FindMappingByGuid(IRequestMessage requestMessage)

src/WireMock.Net/Util/CSharpFormatter.cs

@@ -10,8 +10,6 @@ namespace WireMock.Util;
 
 internal static class CSharpFormatter
 {
-    private const string Null = "null";
-
     #region Reserved Keywords
     private static readonly HashSet<string> CSharpReservedKeywords = new(new[]
     {
@@ -94,15 +92,17 @@ internal static class CSharpFormatter
         "while"
     });
     #endregion
-    
-    public static object ConvertToAnonymousObjectDefinition(object jsonBody, int ind = 2)
+
+    private const string Null = "null";
+
+    public static object ConvertToAnonymousObjectDefinition(object jsonBody)
     {
         var serializedBody = JsonConvert.SerializeObject(jsonBody);
         using var jsonReader = new JsonTextReader(new StringReader(serializedBody));
         jsonReader.DateParseHandling = DateParseHandling.None;
         var deserializedBody = JObject.Load(jsonReader);
 
-        return ConvertJsonToAnonymousObjectDefinition(deserializedBody, ind);
+        return ConvertJsonToAnonymousObjectDefinition(deserializedBody, 2);
     }
 
     public static string ConvertJsonToAnonymousObjectDefinition(JToken token, int ind = 0)

src/WireMock.Net/WireMock.Net.csproj

@@ -72,6 +72,7 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
+        <PackageReference Include="XPath2.Extensions" Version="1.1.4" />
         <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.34.0" />
     </ItemGroup>
 
@@ -181,13 +182,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.4.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.2.1" />
+        <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.1.4" />
+        <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.1.4" />
+        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.4.1.4" />
+        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.1.4" />
+        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.1.4" />
+        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.1.4" />
+        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.1.4" />
     </ItemGroup>
 
     <ItemGroup>

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingsCode.verified.txt

@@ -1,49 +1,11 @@
 var server = WireMockServer.Start();
-server
-    .Given(Request.Create()
-        .UsingMethod("POST")
-        .WithPath("/users/post1")
-        .WithBody(new JsonMatcher(
-            value: new
-            {
-                city = "Amsterdam",
-                country = "The Netherlands"
-            },
-            ignoreCase: false,
-            regex: false
-        ))
-    )
-    .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
-    .RespondWith(Response.Create()
-    );
-
-server
-    .Given(Request.Create()
-        .UsingMethod("POST")
-        .WithPath("/users/post2")
-        .WithBody(new JsonPartialMatcher(
-            value: new
-            {
-                city = "City",
-                country = "Country"
-            },
-            ignoreCase: false,
-            regex: false
-        ))
-    )
-    .WithGuid("1b731398-4a5b-457f-a6e3-d65e541c428f")
-    .RespondWith(Response.Create()
-        .WithBody(@"Line1
-Some ""value"" in Line2")
-    );
-
 server
     .Given(Request.Create()
         .UsingMethod("GET")
         .WithPath("/foo1")
         .WithParam("p1", "xyz")
     )
-    .WithGuid("f74fd144-df53-404f-8e35-da22a640bd5f")
+    .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
     .RespondWith(Response.Create()
         .WithStatusCode(200)
         .WithBody("1")
@@ -56,7 +18,7 @@ server
         .WithParam("p2", "abc")
         .WithHeader("h1", "W/\"234f2q3r\"", true)
     )
-    .WithGuid("4126dec8-470b-4eff-93bb-c24f83b8b1fd")
+    .WithGuid("1b731398-4a5b-457f-a6e3-d65e541c428f")
     .RespondWith(Response.Create()
         .WithStatusCode("201")
         .WithHeader("hk", "hv")
@@ -69,7 +31,7 @@ server
         .UsingMethod("DELETE")
         .WithUrl("https://localhost/test")
     )
-    .WithGuid("c9929240-7ae8-4a5d-8ed8-0913479f6eeb")
+    .WithGuid("f74fd144-df53-404f-8e35-da22a640bd5f")
     .RespondWith(Response.Create()
         .WithStatusCode(208)
         .WithBodyAsJson(new
@@ -108,3 +70,20 @@ text
         })
     );
 
+server
+    .Given(Request.Create()
+        .UsingMethod("POST")
+        .WithPath("/foo3")
+        .WithBody(new JsonPartialMatcher(
+                                            value: "{ a = 1, b = 2 }",
+                                            ignoreCase: false,
+                                            regex: false
+                                         ))
+    )
+    .WithGuid("4126dec8-470b-4eff-93bb-c24f83b8b1fd")
+    .RespondWith(Response.Create()
+        .WithStatusCode(200)
+        .WithBody(@"Line1
+Some ""value"" in Line2")
+    );
+

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs

@@ -491,7 +491,7 @@ public partial class WireMockAdminApiTests
 
         server.Stop();
     }
-
+    
     [Fact]
     public async Task IWireMockAdminApi_GetRequestsAsync_Json()
     {
@@ -862,37 +862,8 @@ public partial class WireMockAdminApiTests
         var guid2 = Guid.Parse("1b731398-4a5b-457f-a6e3-d65e541c428f");
         var guid3 = Guid.Parse("f74fd144-df53-404f-8e35-da22a640bd5f");
         var guid4 = Guid.Parse("4126DEC8-470B-4EFF-93BB-C24F83B8B1FD");
-        var guid5 = Guid.Parse("c9929240-7ae8-4a5d-8ed8-0913479f6eeb");
         var server = WireMockServer.StartWithAdminInterface();
 
-        server
-            .Given(
-                Request.Create()
-                    .WithPath("/users/post1")
-                    .UsingPost()
-                    .WithBody(new JsonMatcher(new
-                    {
-                        city = "Amsterdam",
-                        country = "The Netherlands"
-                    }))
-            )
-            .WithGuid(guid1)
-            .RespondWith(Response.Create());
-
-        server
-            .Given(
-                Request.Create()
-                    .WithPath("/users/post2")
-                    .UsingPost()
-                    .WithBody(new JsonPartialMatcher(new
-                    {
-                        city = "City",
-                        country = "Country"
-                    }))
-            )
-            .WithGuid(guid2)
-            .RespondWith(Response.Create().WithBody("Line1\r\nSome \"value\" in Line2"));
-
         server
             .Given(
                 Request.Create()
@@ -900,7 +871,7 @@ public partial class WireMockAdminApiTests
                     .WithParam("p1", "xyz")
                     .UsingGet()
             )
-            .WithGuid(guid3)
+            .WithGuid(guid1)
             .RespondWith(
                 Response.Create()
                     .WithStatusCode(200)
@@ -915,7 +886,7 @@ public partial class WireMockAdminApiTests
                     .WithHeader("h1", "W/\"234f2q3r\"")
                     .UsingPost()
             )
-            .WithGuid(guid4)
+            .WithGuid(guid2)
             .RespondWith(
                 Response.Create()
                     .WithStatusCode("201")
@@ -930,43 +901,36 @@ public partial class WireMockAdminApiTests
                     .WithUrl("https://localhost/test")
                     .UsingDelete()
             )
-            .WithGuid(guid5)
+            .WithGuid(guid3)
             .RespondWith(
                 Response.Create()
                     .WithStatusCode(HttpStatusCode.AlreadyReported)
-                    .WithBodyAsJson(new
-                    {
-                        @as = 1,
-                        b = 1.2,
-                        d = true,
-                        e = false,
-                        f = new[] { 1, 2, 3, 4 },
-                        g = new
-                        {
-                            z1 = 1,
-                            z2 = 2,
-                            z3 = new[] { "a", "b", "c" },
-                            z4 = new[]
-                            {
-                                new { a = 1, b = 2 },
-                                new { a = 2, b = 3 }
-                            }
-                        },
-                        date_field = new DateTime(2023, 05, 08, 11, 20, 19),
-                        string_field_with_date = "2021-03-13T21:04:00Z",
-                        multiline_text = @"This
+                    .WithBodyAsJson(new { @as = 1, b = 1.2, d = true, e = false, f = new[] { 1, 2, 3, 4 }, g = new { z1 = 1, z2 = 2, z3 = new[] { "a", "b", "c" }, z4 = new[] { new { a = 1, b = 2 }, new { a = 2, b = 3 } } }, date_field = new DateTime(2023, 05, 08, 11, 20, 19), string_field_with_date = "2021-03-13T21:04:00Z", multiline_text = @"This
 is
 multiline
 text
-"
-                    })
+" })
+            );
+
+        server
+            .Given(
+                Request.Create()
+                    .WithPath("/foo3")
+                    .WithBody(new JsonPartialMatcher(new { a = 1, b = 2 }))
+                    .UsingPost()
+            )
+            .WithGuid(guid4)
+            .RespondWith(
+                Response.Create()
+                    .WithStatusCode(200)
+                    .WithBody("Line1\r\nSome \"value\" in Line2")
             );
 
         // Act
         var api = RestClient.For<IWireMockAdminApi>(server.Url);
 
         var mappings = await api.GetMappingsAsync().ConfigureAwait(false);
-        mappings.Should().HaveCount(5);
+        mappings.Should().HaveCount(4);
 
         var code = await api.GetMappingsCodeAsync().ConfigureAwait(false);
 

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

@@ -31,35 +31,5 @@
       BodyDestination: SameAsSource,
       Body: { msg: "Hello world!"}
     }
-  },
-  {
-    Guid: Guid_2,
-    UpdatedAt: 2023-01-14 15:16:17,
-    Request: {
-      Path: {
-        Matchers: [
-          {
-            Name: WildcardMatcher,
-            Pattern: /users/post2,
-            IgnoreCase: false
-          }
-        ]
-      },
-      Methods: [
-        POST
-      ],
-      Body: {
-        Matcher: {
-          Name: JsonMatcher,
-          Pattern: {
-            city: Amsterdam,
-            country: The Netherlands
-          },
-          IgnoreCase: false,
-          Regex: false
-        }
-      }
-    },
-    Response: {}
   }
 ]

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

@@ -1,30 +0,0 @@
-var builder = new MappingBuilder();
-builder
-    .Given(Request.Create()
-        .UsingMethod("GET")
-        .WithPath("/foo")
-        .WithParam("test", "it.Length < 10")
-    )
-    .WithGuid("41372914-1838-4c67-916b-b9aacdd096ce")
-    .RespondWith(Response.Create()
-        .WithBody("{ msg: \"Hello world!\"}")
-    );
-
-builder
-    .Given(Request.Create()
-        .UsingMethod("POST")
-        .WithPath("/users/post2")
-        .WithBody(new JsonMatcher(
-            value: new
-            {
-                city = "Amsterdam",
-                country = "The Netherlands"
-            },
-            ignoreCase: false,
-            regex: false
-        ))
-    )
-    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931d9b")
-    .RespondWith(Response.Create()
-    );
-

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

@@ -1,30 +0,0 @@
-var server = WireMockServer.Start();
-server
-    .Given(Request.Create()
-        .UsingMethod("GET")
-        .WithPath("/foo")
-        .WithParam("test", "it.Length < 10")
-    )
-    .WithGuid("41372914-1838-4c67-916b-b9aacdd096ce")
-    .RespondWith(Response.Create()
-        .WithBody("{ msg: \"Hello world!\"}")
-    );
-
-server
-    .Given(Request.Create()
-        .UsingMethod("POST")
-        .WithPath("/users/post2")
-        .WithBody(new JsonMatcher(
-            value: new
-            {
-                city = "Amsterdam",
-                country = "The Netherlands"
-            },
-            ignoreCase: false,
-            regex: false
-        ))
-    )
-    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931d9b")
-    .RespondWith(Response.Create()
-    );
-

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

@@ -31,34 +31,5 @@
       BodyDestination: SameAsSource,
       Body: { msg: "Hello world!"}
     }
-  },
-  {
-    Guid: Guid_2,
-    UpdatedAt: 2023-01-14T15:16:17,
-    Request: {
-      Path: {
-        Matchers: [
-          {
-            Name: WildcardMatcher,
-            Pattern: /users/post2,
-            IgnoreCase: false
-          }
-        ]
-      },
-      Methods: [
-        POST
-      ],
-      Body: {
-        Matcher: {
-          Name: JsonMatcher,
-          Pattern: {
-            city: Amsterdam,
-            country: The Netherlands
-          },
-          IgnoreCase: false,
-          Regex: false
-        }
-      }
-    }
   }
 ]

test/WireMock.Net.Tests/MappingBuilderTests.cs

@@ -13,7 +13,6 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Serialization;
 using WireMock.Settings;
-using WireMock.Types;
 using WireMock.Util;
 using Xunit;
 
@@ -74,25 +73,6 @@ public class MappingBuilderTests
         .RespondWith(Response.Create()
             .WithBody(@"{ msg: ""Hello world!""}")
         );
-
-        _sut.Given(Request.Create()
-            .WithPath("/users/post1")
-            .UsingPost()
-            .WithBodyAsJson(new
-            {
-                Request = "Hello?"
-            })
-        ).RespondWith(Response.Create());
-
-        _sut.Given(Request.Create()
-            .WithPath("/users/post2")
-            .UsingPost()
-            .WithBody(new JsonMatcher(new
-            {
-                city = "Amsterdam",
-                country = "The Netherlands"
-            }))
-        ).RespondWith(Response.Create());
     }
 
     [Fact]
@@ -115,26 +95,6 @@ public class MappingBuilderTests
         return Verifier.VerifyJson(json, VerifySettings);
     }
 
-    [Fact]
-    public Task ToCSharpCode_Server()
-    {
-        // Act
-        var code = _sut.ToCSharpCode(MappingConverterType.Server);
-
-        // Verify
-        return Verifier.Verify(code, VerifySettings);
-    }
-
-    [Fact]
-    public Task ToCSharpCode_Builder()
-    {
-        // Act
-        var code = _sut.ToCSharpCode(MappingConverterType.Builder);
-
-        // Verify
-        return Verifier.Verify(code, VerifySettings);
-    }
-
     [Fact]
     public void SaveMappingsToFile_FolderExists_IsFalse()
     {
@@ -181,9 +141,9 @@ public class MappingBuilderTests
         _sut.SaveMappingsToFolder(null);
 
         // Verify
-        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Exactly(2));
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Exactly(2));
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(2));
+        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Once);
+        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Once);
+        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         _fileSystemHandlerMock.VerifyNoOtherCalls();
     }
 
@@ -199,8 +159,8 @@ public class MappingBuilderTests
 
         // Verify
         _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Never);
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Exactly(2));
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(2));
+        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Once);
+        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         _fileSystemHandlerMock.VerifyNoOtherCalls();
     }
 }

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

@@ -40,7 +40,7 @@ public class JsonMatcherTests
         var matcher = new JsonMatcher("{}");
 
         // Act
-        var name = matcher.Name;
+        string name = matcher.Name;
 
         // Assert
         Check.That(name).Equals("JsonMatcher");
@@ -53,7 +53,7 @@ public class JsonMatcherTests
         var matcher = new JsonMatcher("{}");
 
         // Act
-        var value = matcher.Value;
+        object value = matcher.Value;
 
         // Assert
         Check.That(value).Equals("{}");
@@ -90,7 +90,7 @@ public class JsonMatcherTests
         // Act
         var result = matcher.IsMatch(new MemoryStream());
 
-        // Assert
+        // Assert 
         result.Score.Should().Be(MatchScores.Mismatch);
         result.Exception.Should().BeAssignableTo<JsonException>();
     }
@@ -102,10 +102,10 @@ public class JsonMatcherTests
         var bytes = EmptyArray<byte>.Value;
         var matcher = new JsonMatcher("");
 
-        // Act
-        var match = matcher.IsMatch(bytes).Score;
+        // Act 
+        double match = matcher.IsMatch(bytes).Score;
 
-        // Assert
+        // Assert 
         Check.That(match).IsEqualTo(0);
     }
 
@@ -116,10 +116,10 @@ public class JsonMatcherTests
         string? s = null;
         var matcher = new JsonMatcher("");
 
-        // Act
-        var match = matcher.IsMatch(s).Score;
+        // Act 
+        double match = matcher.IsMatch(s).Score;
 
-        // Assert
+        // Assert 
         Check.That(match).IsEqualTo(0);
     }
 
@@ -130,399 +130,215 @@ public class JsonMatcherTests
         object? o = null;
         var matcher = new JsonMatcher("");
 
-        // Act
-        var match = matcher.IsMatch(o).Score;
+        // Act 
+        double match = matcher.IsMatch(o).Score;
 
-        // Assert
+        // Assert 
         Check.That(match).IsEqualTo(0);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_JArray()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher(new[] { "x", "y" });
 
-        // Act
+        // Act 
         var jArray = new JArray
         {
             "x",
             "y"
         };
-        var match = matcher.IsMatch(jArray).Score;
+        double match = matcher.IsMatch(jArray).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
     [Fact]
-    public void JsonMatcher_IsMatch_JObject_ShouldMatch()
+    public void JsonMatcher_IsMatch_JObject()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher(new { Id = 1, Name = "Test" });
 
-        // Act
+        // Act 
         var jObject = new JObject
         {
             { "Id", new JValue(1) },
             { "Name", new JValue("Test") }
         };
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
-    [Fact]
-    public void JsonMatcher_IsMatch_JObject_ShouldNotMatch()
-    {
-        // Assign
-        var matcher = new JsonMatcher(new { Id = 1, Name = "Test" });
-
-        // Act
-        var jObject = new JObject
-        {
-            { "Id", new JValue(1) },
-            { "Name", new JValue("Test") },
-            { "Other", new JValue("abc") }
-        };
-        var score = matcher.IsMatch(jObject).Score;
-
-        // Assert
-        Assert.Equal(MatchScores.Mismatch, score);
-    }
-
     [Fact]
     public void JsonMatcher_IsMatch_WithIgnoreCaseTrue_JObject()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher(new { id = 1, Name = "test" }, true);
 
-        // Act
+        // Act 
         var jObject = new JObject
         {
             { "Id", new JValue(1) },
             { "NaMe", new JValue("Test") }
         };
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_JObjectParsed()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher(new { Id = 1, Name = "Test" });
 
-        // Act
+        // Act 
         var jObject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_WithIgnoreCaseTrue_JObjectParsed()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher(new { Id = 1, Name = "TESt" }, true);
 
-        // Act
+        // Act 
         var jObject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_JArrayAsString()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher("[ \"x\", \"y\" ]");
 
-        // Act
+        // Act 
         var jArray = new JArray
         {
             "x",
             "y"
         };
-        var match = matcher.IsMatch(jArray).Score;
+        double match = matcher.IsMatch(jArray).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_JObjectAsString()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher("{ \"Id\" : 1, \"Name\" : \"Test\" }");
 
-        // Act
+        // Act 
         var jObject = new JObject
         {
             { "Id", new JValue(1) },
             { "Name", new JValue("Test") }
         };
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_WithIgnoreCaseTrue_JObjectAsString()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher("{ \"Id\" : 1, \"Name\" : \"test\" }", true);
 
-        // Act
+        // Act 
         var jObject = new JObject
         {
             { "Id", new JValue(1) },
             { "Name", new JValue("Test") }
         };
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_JObjectAsString_RejectOnMatch()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher(MatchBehaviour.RejectOnMatch, "{ \"Id\" : 1, \"Name\" : \"Test\" }");
 
-        // Act
+        // Act 
         var jObject = new JObject
         {
             { "Id", new JValue(1) },
             { "Name", new JValue("Test") }
         };
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(0.0, match);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_JObjectWithDateTimeOffsetAsString()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher("{ \"preferredAt\" : \"2019-11-21T10:32:53.2210009+00:00\" }");
 
-        // Act
+        // Act 
         var jObject = new JObject
         {
             { "preferredAt", new JValue("2019-11-21T10:32:53.2210009+00:00") }
         };
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         Assert.Equal(1.0, match);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_NormalEnum()
     {
-        // Assign
-        var matcher = new JsonMatcher(new Test1 { NormalEnum = NormalEnum.Abc });
+        // Assign 
+        var matcher = new JsonMatcher(new Test1 { NormalEnum = NormalEnum.Abc});
 
-        // Act
+        // Act 
         var jObject = new JObject
         {
             { "NormalEnum", new JValue(0) }
         };
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         match.Should().Be(1.0);
     }
 
     [Fact]
     public void JsonMatcher_IsMatch_EnumWithJsonConverter()
     {
-        // Assign
+        // Assign 
         var matcher = new JsonMatcher(new Test2 { EnumWithJsonConverter = EnumWithJsonConverter.Type1 });
 
-        // Act
+        // Act 
         var jObject = new JObject
         {
             { "EnumWithJsonConverter", new JValue("Type1") }
         };
-        var match = matcher.IsMatch(jObject).Score;
+        double match = matcher.IsMatch(jObject).Score;
 
-        // Assert
+        // Assert 
         match.Should().Be(1.0);
     }
-
-    [Fact]
-    public void JsonMatcher_IsMatch_WithRegexTrue_ShouldMatch()
-    {
-        // Assign
-        var matcher = new JsonMatcher(new { Id = "^\\d+$", Name = "Test" }, regex: true);
-
-        // Act
-        var jObject = new JObject
-        {
-            { "Id", new JValue(42) },
-            { "Name", new JValue("Test") }
-        };
-        var score = matcher.IsMatch(jObject).Score;
-
-        // Assert
-        Assert.Equal(1.0, score);
-    }
-
-    [Fact]
-    public void JsonMatcher_IsMatch_WithRegexTrue_Complex_ShouldMatch()
-    {
-        // Assign
-        var matcher = new JsonMatcher(new
-        {
-            Complex = new
-            {
-                Id = "^\\d+$",
-                Name = ".*"
-            }
-        }, regex: true);
-
-        // Act
-        var jObject = new JObject
-        {
-            {
-                "Complex", new JObject
-                {
-                    { "Id", new JValue(42) },
-                    { "Name", new JValue("Test") }
-                }
-            }
-        };
-        var score = matcher.IsMatch(jObject).Score;
-
-        // Assert
-        Assert.Equal(1.0, score);
-    }
-
-    [Fact]
-    public void JsonMatcher_IsMatch_WithRegexTrue_Complex_ShouldNotMatch()
-    {
-        // Assign
-        var matcher = new JsonMatcher(new
-        {
-            Complex = new
-            {
-                Id = "^\\d+$",
-                Name = ".*"
-            }
-        }, regex: true);
-
-        // Act
-        var jObject = new JObject
-        {
-            {
-                "Complex", new JObject
-                {
-                    { "Id", new JValue(42) },
-                    { "Name", new JValue("Test") },
-                    { "Other", new JValue("Other") }
-                }
-            }
-        };
-        var score = matcher.IsMatch(jObject).Score;
-
-        // Assert
-        Assert.Equal(MatchScores.Mismatch, score);
-    }
-
-    [Fact]
-    public void JsonMatcher_IsMatch_WithRegexTrue_Array_ShouldMatch()
-    {
-        // Assign
-        var matcher = new JsonMatcher(new
-        {
-            Array = new[]
-            {
-                "^\\d+$",
-                ".*"
-            }
-        }, regex: true);
-
-        // Act
-        var jObject = new JObject
-        {
-            { "Array", new JArray("42", "test") }
-        };
-        var score = matcher.IsMatch(jObject).Score;
-
-        // Assert
-        Assert.Equal(1.0, score);
-    }
-
-    [Fact]
-    public void JsonMatcher_IsMatch_WithRegexTrue_Array_ShouldNotMatch()
-    {
-        // Assign
-        var matcher = new JsonMatcher(new
-        {
-            Array = new[]
-            {
-                "^\\d+$",
-                ".*"
-            }
-        }, regex: true);
-
-        // Act
-        var jObject = new JObject
-        {
-            { "Array", new JArray("42", "test", "other") }
-        };
-        var score = matcher.IsMatch(jObject).Score;
-
-        // Assert
-        Assert.Equal(MatchScores.Mismatch, score);
-    }
-
-    [Fact]
-    public void JsonMatcher_IsMatch_GuidAndString()
-    {
-        // Assign
-        var id = Guid.NewGuid();
-        var idAsString = id.ToString();
-        var matcher = new JsonMatcher(new { Id = id });
-
-        // Act
-        var jObject = new JObject
-        {
-            { "Id", new JValue(idAsString) }
-        };
-        var score = matcher.IsMatch(jObject).Score;
-
-        // Assert
-        Assert.Equal(1.0, score);
-    }
-
-    [Fact]
-    public void JsonMatcher_IsMatch_StringAndGuid()
-    {
-        // Assign
-        var id = Guid.NewGuid();
-        var idAsString = id.ToString();
-        var matcher = new JsonMatcher(new { Id = idAsString });
-
-        // Act
-        var jObject = new JObject
-        {
-            { "Id", new JValue(id) }
-        };
-        var score = matcher.IsMatch(jObject).Score;
-
-        // Assert
-        Assert.Equal(1.0, score);
-    }
 }

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

@@ -25,8 +25,7 @@
           Pattern: {
             name: stef
           },
-          IgnoreCase: false,
-          Regex: false
+          IgnoreCase: false
         },
         ProtoBufMessageType: greet.HelloRequest
       }

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

@@ -42,8 +42,7 @@ message HelloReply {
           Pattern: {
             name: stef
           },
-          IgnoreCase: false,
-          Regex: false
+          IgnoreCase: false
         },
         ProtoBufMessageType: greet.HelloRequest
       }

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

@@ -108,9 +108,9 @@
         <PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
         <PackageReference Include="JsonConverter.System.Text.Json" Version="0.5.0" />
 
-        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.60.0">
+        <PackageReference Include="Google.Protobuf" Version="3.26.0" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.62.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

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

@@ -499,24 +499,4 @@ public class WireMockServerAdminTests
         Check.That(response.StatusCode).Equals(HttpStatusCode.OK);
         Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}");
     }
-
-    [Fact]
-    public async Task WireMockServer_Admin_()
-    {
-        // given
-        var server = WireMockServer.Start();
-
-        server.CreateClient();
-
-        // when
-        await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);
-
-        // then
-        Check.That(server.LogEntries).HasSize(1);
-        var requestLogged = server.LogEntries.First();
-        Check.That(requestLogged.RequestMessage.Method).IsEqualTo("GET");
-        Check.That(requestLogged.RequestMessage.BodyData).IsNull();
-
-        server.Stop();
-    }
 }