Fix BodyParser

2026-06-14 09:34:27 +02:00 · 2026-06-12 18:48:08 +02:00
parent 89b3149732
commit 1d4f820f1a
5 changed files with 122 additions and 20 deletions
@@ -416,4 +416,20 @@ public class JsonPartialWildcardMatcherTests
        // Assert 
        Assert.Equal(1.0, match);
    }
-}
+
+    [Fact]
+    public void JsonPartialWildcardMatcher_IsMatch_WithRegexTrue_DateFormat_ShouldMatch()
+    {
+        // Assign
+        var matcher = new JsonPartialWildcardMatcher(
+            new { date = "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?(?:Z|[+-]\\d{2}:\\d{2})$", id = 1 },
+            ignoreCase: false,
+            regex: true);
+
+        // Act
+        var match = matcher.IsMatch("{\"date\":\"2026-06-09T22:23:18.53421+00:00\",\"id\":1}").Score;
+
+        // Assert
+        Assert.Equal(1.0, match);
+    }
+}
@@ -366,17 +366,33 @@ public class SystemTextJsonPartialWildcardMatcherTests
        Assert.Equal(1.0, match);
    }

-    [Fact]
-    public void SystemTextJsonPartialWildcardMatcher_IsMatch_JsonElement_ShouldMatch()
-    {
-        // Assign
-        var matcher = new SystemTextJsonPartialWildcardMatcher(new { Id = 1, Name = "Test" });
+        [Fact]
+        public void SystemTextJsonPartialWildcardMatcher_IsMatch_JsonElement_ShouldMatch()
+        {
+            // Assign
+            var matcher = new SystemTextJsonPartialWildcardMatcher(new { Id = 1, Name = "Test" });

-        // Act
-        var jsonElement = JsonDocument.Parse("{ \"Id\" : 1, \"Name\" : \"Test\", \"Extra\" : \"value\" }").RootElement;
-        var match = matcher.IsMatch(jsonElement).Score;
+            // Act
+            var jsonElement = JsonDocument.Parse("{ \"Id\" : 1, \"Name\" : \"Test\", \"Extra\" : \"value\" }").RootElement;
+            var match = matcher.IsMatch(jsonElement).Score;

-        // Assert
-        Assert.Equal(1.0, match);
+            // Assert
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void SystemTextJsonPartialWildcardMatcher_IsMatch_WithRegexTrue_DateFormat_ShouldMatch()
+        {
+            // Assign
+            var matcher = new SystemTextJsonPartialWildcardMatcher(
+                new { date = "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?(?:Z|[+-]\\d{2}:\\d{2})$", id = 1 },
+                ignoreCase: false,
+                regex: true);
+
+            // Act
+            var match = matcher.IsMatch("{\"date\":\"2026-06-09T22:23:18.53421+00:00\",\"id\":1}").Score;
+
+            // Assert
+            Assert.Equal(1.0, match);
+        }
    }
-}
@@ -53,6 +53,81 @@ public partial class WireMockServerTests
        response.Should().BeEquivalentTo("{\"first_name\":\"John\",\"last_name\":\"Smith\"}");
    }

+    [Fact]
+    public async Task WireMockServer_WithBodyAsJson_WithJsonPartialWildcardMatcher()
+    {
+        // Arrange
+        using var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            Logger = new TestOutputHelperWireMockLogger(testOutputHelper)
+        });
+        server
+            .Given(
+                Request.Create()
+                    .WithPath("/test")
+                    .UsingPost()
+                    .WithBody(new JsonPartialWildcardMatcher(
+                        new
+                        {
+                            date = @"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$",
+                            id = 1
+                        },
+                        ignoreCase: true,
+                        regex: true
+                    )
+                )
+            )
+            .RespondWith(Response.Create().WithStatusCode(200).WithBody("matched"));
+
+        // Act
+        var requestUri = new Uri($"http://localhost:{server.Port}/test");
+
+        var response = await server.CreateClient().PostAsync(requestUri, new StringContent("{\"date\":\"2026-06-09T22:23:18.53421+00:00\",\"id\":1}"), _ct);
+
+        // Assert
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+
+        server.Stop();
+    }
+
+    [Fact]
+    public async Task WireMockServer_WithBodyAsJson_WithSystemTextJsonPartialWildcardMatcher()
+    {
+        // Arrange
+        using var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            Logger = new TestOutputHelperWireMockLogger(testOutputHelper),
+            DefaultJsonSerializer = new SystemTextJsonConverter()
+        });
+        server
+            .Given(
+                Request.Create()
+                    .WithPath("/test")
+                    .UsingPost()
+                    .WithBody(new SystemTextJsonPartialWildcardMatcher(
+                        new
+                        {
+                            date = @"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$",
+                            id = 1
+                        },
+                        ignoreCase: true,
+                        regex: true
+                    )
+                )
+            )
+            .RespondWith(Response.Create().WithStatusCode(200).WithBody("matched"));
+
+        // Act
+        var requestUri = new Uri($"http://localhost:{server.Port}/test");
+
+        var response = await server.CreateClient().PostAsync(requestUri, new StringContent("{\"date\":\"2026-06-09T22:23:18.53421+00:00\",\"id\":1}"), _ct);
+
+        // Assert
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+
+        server.Stop();
+    }
+
    [Fact]
    public async Task WireMockServer_WithBodyAsJson_Using_PostAsJsonAsync_And_MultipleJmesPathMatchers_ShouldMatch()
    {