.

CHANGELOG.md

@@ -1,8 +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]

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.53</VersionPrefix>
+        <VersionPrefix>1.5.52</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.52
 
 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)
+# 1.5.52 (06 April 2024)
-- #1093 Update Handlebars.Net [feature]
+- #1091 Add RegEx support to JsonMatcher [feature]
-- #1101 Fix MappingConverter to support Body with JsonMatcher [bug]
+- #1088 Regex support for JsonMatcher  [feature]
-- #1095 When using C# code generation WithBody() matcher is not generated for POST Request [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

src/WireMock.Net/Serialization/MappingConverter.cs

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

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
+                    .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
-                    {
-                        @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.GetMappingFolder(), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Exactly(2));
+        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(2));
+        _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.FolderExists(path), Times.Once);
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(2));
+        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         _fileSystemHandlerMock.VerifyNoOtherCalls();
     }
 }

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();
-    }
 }

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

@@ -967,4 +967,44 @@ public class WireMockServerProxyTests
 
         server.Dispose();
     }
+
+    // #1097
+    // https://stackoverflow.com/questions/52106567/how-to-stop-httprequestmessage-from-unencoding-3a-to-a-colon-in-the-request-uri
+    [Fact]
+    public async Task WireMockServer_Proxy_Should_Keep_UrlEncoding()
+    {
+        // Assign
+        string path = $"/prx_{Guid.NewGuid()}";
+        var serverForProxyForwarding = WireMockServer.Start();
+        serverForProxyForwarding
+            .Given(Request.Create().WithPath(path))
+            .RespondWith(Response.Create());
+
+        var settings = new WireMockServerSettings
+        {
+            ProxyAndRecordSettings = new ProxyAndRecordSettings
+            {
+                Url = serverForProxyForwarding.Urls[0],
+                SaveMapping = true,
+                SaveMappingToFile = false
+            }
+        };
+        var server = WireMockServer.Start(settings);
+
+        // Act
+        var requestUri = $"{server.Urls[0]}{path}with%20space_and_%3A_colon";
+        var requestMessage = new HttpRequestMessage
+        {
+            Method = HttpMethod.Get,
+            RequestUri = new Uri(requestUri)
+        };
+        await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
+
+        // Assert
+        var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
+        receivedRequest.AbsolutePath.Should().EndWith("with space_and_:_colon");
+
+        // check that new proxied mapping is added
+        server.Mappings.Should().HaveCount(2);
+    }
 }