1.4.34

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.4.34 (27 January 2022)
+- [#716](https://github.com/WireMock-Net/WireMock.Net/pull/716) - MatcherMapper : Always use Pattern [bug] contributed by [StefH](https://github.com/StefH)
+- [#715](https://github.com/WireMock-Net/WireMock.Net/issues/715) - Record request mapping outputs JsonMatcher with Patterns instead of Pattern [bug]
+
 # 1.4.33 (24 January 2022)
 - [#714](https://github.com/WireMock-Net/WireMock.Net/pull/714) - Add support for Cors [feature] contributed by [StefH](https://github.com/StefH)
 

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.4.33</VersionPrefix>
+        <VersionPrefix>1.4.34</VersionPrefix>
         <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>

Generate-ReleaseNotes.cmd

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

PackageReleaseNotes.txt

@@ -1,4 +1,5 @@
-# 1.4.33 (24 January 2022)
-- #714 Add support for Cors [feature]
+# 1.4.34 (27 January 2022)
+- #716 MatcherMapper : Always use Pattern [bug]
+- #715 Record request mapping outputs JsonMatcher with Patterns instead of Pattern [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

examples/WireMock.Net.Console.NET5/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json

@@ -1,22 +1,33 @@
-{
+{
     "Request": {
         "Path": {
             "Matchers": [
                 {
                     "Name": "WildcardMatcher",
-                    "Pattern": "/static/mapping"
+                    "Patterns": [ "/static/mapping", "/static/mapping2" ]
                 }
             ]
         },
+        "Body": {
+            "Matcher": {
+                "Name": "JsonMatcher",
+                "Pattern": {
+                    "post1": "value 1",
+                    "post2": "value 2"
+                },
+                "IgnoreCase": true
+            }
+        },
         "Methods": [
-            "get"
+            "get",
+            "post"
         ]
     },
     "Response": {
         "BodyAsJson": { "body": "static mapping" },
-      "Headers": {
-        "Content-Type": "application/json",
-        "Test-X": [ "test 1", "test 2" ]
-      }
+        "Headers": {
+            "Content-Type": "application/json",
+            "Test-X": [ "test 1", "test 2" ]
+        }
     }
 }

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,80 +1,80 @@
-using JetBrains.Annotations;
-using System;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
+using JetBrains.Annotations;
+using System;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
 using WireMock.Util;
 
-namespace WireMock.RequestBuilders
-{
-    /// <summary>
-    /// The BodyRequestBuilder interface.
-    /// </summary>
-    public interface IBodyRequestBuilder : IRequestMatcher
-    {
-        /// <summary>
-        /// WithBody: IMatcher
-        /// </summary>
-        /// <param name="matcher">The matcher.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher matcher);
-
-        /// <summary>
-        /// WithBody: IMatcher[]
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher[] matchers);
-
-        /// <summary>
-        /// WithBody: Body as string
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: Body as byte[]
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: Body as object
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: func (string)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
-
-        /// <summary>
-        /// WithBody: func (byte[])
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
-
-        /// <summary>
-        /// WithBody: func (json object)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
-
-        /// <summary>
-        /// WithBody: func (BodyData object)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
-    }
+namespace WireMock.RequestBuilders
+{
+    /// <summary>
+    /// The BodyRequestBuilder interface.
+    /// </summary>
+    public interface IBodyRequestBuilder : IRequestMatcher
+    {
+        /// <summary>
+        /// WithBody: IMatcher
+        /// </summary>
+        /// <param name="matcher">The matcher.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] IMatcher matcher);
+
+        /// <summary>
+        /// WithBody: IMatcher[]
+        /// </summary>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] IMatcher[] matchers);
+
+        /// <summary>
+        /// WithBody: Body as string
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: Body as byte[]
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: Body as object
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: func (string)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
+
+        /// <summary>
+        /// WithBody: func (byte[])
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
+
+        /// <summary>
+        /// WithBody: func (json object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
+
+        /// <summary>
+        /// WithBody: func (BodyData object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
+    }
 }

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -161,12 +161,12 @@ namespace WireMock.Serialization
 
                 // If the matcher is a IValueMatcher, get the value (can be string or object).
                 case IValueMatcher valueMatcher:
-                    model.Patterns = new[] { valueMatcher.Value };
+                    model.Pattern = valueMatcher.Value;
                     break;
 
                 // If the matcher is a ExactObjectMatcher, get the ValueAsObject or ValueAsBytes.
                 case ExactObjectMatcher exactObjectMatcher:
-                    model.Patterns = new[] { exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes };
+                    model.Pattern = exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes;
                     break;
             }
 

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

@@ -164,7 +164,7 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void ToMappingModel_WithTimeSetrtings_ReturnsCorrectTimeSettings()
+        public void ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings()
         {
             // Assign
             var start = DateTime.Now;

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

@@ -187,16 +187,36 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_String()
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_1_Value_As_String()
+        {
+            // Assign
+            var pattern = "{ \"post1\": \"value1\", \"post2\": \"value2\" }";
+            var patterns = new[] { pattern };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_2_Values_As_String()
         {
             // Assign
             var pattern1 = "{ \"AccountIds\": [ 1, 2, 3 ] }";
-            var pattern2 = "{ \"X\": \"x\" }";
+            var pattern2 = "{ \"post1\": \"value1\", \"post2\": \"value2\" }";
             var patterns = new[] { pattern1, pattern2 };
             var model = new MatcherModel
             {
                 Name = "JsonMatcher",
-                Pattern = patterns
+                Patterns = patterns
             };
 
             // Act
@@ -227,11 +247,31 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_Object()
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_1_Value_As_Object()
+        {
+            // Assign
+            object pattern = new { post1 = "value1", post2 = "value2" };
+            var patterns = new[] { pattern };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_2_Values_As_Object()
         {
             // Assign
             object pattern1 = new { AccountIds = new[] { 1, 2, 3 } };
-            object pattern2 = new { X = "x" };
+            object pattern2 = new { post1 = "value1", post2 = "value2" };
             var patterns = new[] { pattern1, pattern2 };
             var model = new MatcherModel
             {