1.0.11.0

Fix ResponseMessageTransformer to not replace BodyAsJson in an original message with transformed results

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.0.11.0 (30 March 2019)
+- [#261](https://github.com/WireMock-Net/WireMock.Net/pull/261) - Fix BodyAsJson transform bug in ResponseMessageTransformer contributed by [psypilat](https://github.com/psypilat)
+- [#262](https://github.com/WireMock-Net/WireMock.Net/pull/262) - Add ProvideResponse_WithJsonBodyAndTransform test contributed by [psypilat](https://github.com/psypilat)
+
+# 1.0.10.0 (27 March 2019)
+- [#260](https://github.com/WireMock-Net/WireMock.Net/pull/260) - Fix Response.Delay property serialization [bug] contributed by [StefH](https://github.com/StefH)
+- [#257](https://github.com/WireMock-Net/WireMock.Net/issues/257) - Doc: Update outdated  [question]
+- [#258](https://github.com/WireMock-Net/WireMock.Net/issues/258) - InvalidProgramException when following running as standalone process example with dotnetcore  [invalid]
+
+# 1.0.9.0 (25 March 2019)
+- [#256](https://github.com/WireMock-Net/WireMock.Net/pull/256) - Fixed Multi Param Match logic contributed by [StefH](https://github.com/StefH)
+- [#255](https://github.com/WireMock-Net/WireMock.Net/issues/255) - ExactMatcher with array pattern not working? [bug]
+
 # 1.0.8.0 (12 March 2019)
 - [#254](https://github.com/WireMock-Net/WireMock.Net/pull/254) - RequestMessageParamMatcher supports Ignore Case for the key [feature] contributed by [StefH](https://github.com/StefH)
 - [#251](https://github.com/WireMock-Net/WireMock.Net/issues/251) - Problem with Request Match WithBody [question]

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.8</VersionPrefix>
+    <VersionPrefix>1.0.11</VersionPrefix>
   </PropertyGroup>
 
   <Choose>

GitHubReleaseNotes.txt

@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes
 
-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.8.0
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.11.0

examples/WireMock.Net.StandAlone.Net461/App.config

@@ -44,7 +44,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.0.9.0" newVersion="1.0.9.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.11.0" newVersion="1.0.11.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj

@@ -225,8 +225,8 @@
     <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.IO.Pipelines.4.5.2\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
     </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.0.9.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.0.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.0.11.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.0.11\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>

examples/WireMock.Net.StandAlone.Net461/packages.config

@@ -65,7 +65,7 @@
   <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net461" />
   <package id="System.IO.Pipelines" version="4.5.2" targetFramework="net461" />
-  <package id="System.Linq.Dynamic.Core" version="1.0.9" targetFramework="net461" />
+  <package id="System.Linq.Dynamic.Core" version="1.0.11" targetFramework="net461" />
   <package id="System.Memory" version="4.5.1" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" />

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -39,7 +39,12 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values.Select(value => value.Equals(input))));
+            if (_values.Length == 1)
+            {
+                return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values[0] == input));
+            }
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values.Contains(input)));
         }
 
         /// <inheritdoc cref="IStringMatcher.GetPatterns"/>

src/WireMock.Net/Matchers/MatchScores.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 namespace WireMock.Matchers
@@ -54,6 +55,7 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="values">The values.</param>
         /// <returns>average score</returns>
+        [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
         public static double ToScore(IEnumerable<bool> values)
         {
             return values.Any() ? values.Select(ToScore).Average() : Mismatch;
@@ -64,6 +66,7 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="values">The values.</param>
         /// <returns>average score</returns>
+        [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
         public static double ToScore(IEnumerable<double> values)
         {
             return values.Any() ? values.Average() : Mismatch;

src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs

@@ -1,7 +1,7 @@
-using System;
+using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using WireMock.Util;
 using WireMock.Validation;
 
@@ -106,15 +106,8 @@ namespace WireMock.Matchers.Request
 
             if (Matchers != null && Matchers.Any())
             {
-                // Matchers are defined, just use the matchers to calculate the match score.
-                var scores = new List<double>();
-                foreach (string valuePresentInRequestMessage in valuesPresentInRequestMessage)
-                {
-                    double score = Matchers.Max(m => m.IsMatch(valuePresentInRequestMessage));
-                    scores.Add(score);
-                }
-
-                return scores.Any() ? scores.Average() : MatchScores.Mismatch;
+                // Return the score based on Matchers and valuesPresentInRequestMessage
+                return CalculateScore(valuesPresentInRequestMessage);
             }
 
             if (Matchers == null || !Matchers.Any())
@@ -125,5 +118,35 @@ namespace WireMock.Matchers.Request
 
             return MatchScores.Mismatch;
         }
+
+        private double CalculateScore(WireMockList<string> valuesPresentInRequestMessage)
+        {
+            var total = new List<double>();
+
+            // If the total patterns in all matchers > values in message, use the matcher as base
+            if (Matchers.Sum(m => m.GetPatterns().Length) > valuesPresentInRequestMessage.Count)
+            {
+                foreach (var matcher in Matchers)
+                {
+                    double score = 0d;
+                    foreach (string valuePresentInRequestMessage in valuesPresentInRequestMessage)
+                    {
+                        score += matcher.IsMatch(valuePresentInRequestMessage) / matcher.GetPatterns().Length;
+                    }
+
+                    total.Add(score);
+                }
+            }
+            else
+            {
+                foreach (string valuePresentInRequestMessage in valuesPresentInRequestMessage)
+                {
+                    double score = Matchers.Max(m => m.IsMatch(valuePresentInRequestMessage));
+                    total.Add(score);
+                }
+            }
+
+            return total.Any() ? MatchScores.ToScore(total) : MatchScores.Mismatch;
+        }
     }
 }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -77,7 +77,7 @@ namespace WireMock.Serialization
                 },
                 Response = new ResponseModel
                 {
-                    Delay = response.Delay?.Milliseconds
+                    Delay = (int?) response.Delay?.TotalMilliseconds
                 }
             };
 

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -67,7 +67,7 @@ namespace WireMock.Transformers
             switch (original.BodyData.BodyAsJson)
             {
                 case JObject bodyAsJObject:
-                    jToken = bodyAsJObject;
+                    jToken = bodyAsJObject.DeepClone();
                     break;
 
                 case Array bodyAsArray:
@@ -160,4 +160,4 @@ namespace WireMock.Transformers
             };
         }
     }
-}
+}

src/WireMock.Net/WireMock.Net.csproj

@@ -57,7 +57,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.9" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.11" />
     <PackageReference Include="RandomDataGenerator.Net" Version="1.0.7" />
   </ItemGroup>
 

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

@@ -33,7 +33,33 @@ namespace WireMock.Net.Tests.Matchers
         }
 
         [Fact]
-        public void ExactMatcher_IsMatch_MultiplePatterns()
+        public void ExactMatcher_IsMatch_WithSinglePattern_ReturnsMatch1_0()
+        {
+            // Assign
+            var matcher = new ExactMatcher("x");
+
+            // Act
+            double result = matcher.IsMatch("x");
+
+            // Assert
+            Check.That(result).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void ExactMatcher_IsMatch_WithSinglePattern_ReturnsMatch0_0()
+        {
+            // Assign
+            var matcher = new ExactMatcher("x");
+
+            // Act
+            double result = matcher.IsMatch("y");
+
+            // Assert
+            Check.That(result).IsEqualTo(0.0);
+        }
+
+        [Fact]
+        public void ExactMatcher_IsMatch_WithMultiplePatterns_ReturnsMatch0_5()
         {
             // Assign
             var matcher = new ExactMatcher("x", "y");
@@ -42,7 +68,7 @@ namespace WireMock.Net.Tests.Matchers
             double result = matcher.IsMatch("x");
 
             // Assert
-            Check.That(result).IsEqualTo(0.5d);
+            Check.That(result).IsEqualTo(1.0);
         }
 
         [Fact]

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

@@ -16,7 +16,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert 1
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("PATCH");
         }
 
@@ -28,7 +28,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert 1
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageMethodMatcher));
 
             // Act
@@ -36,7 +36,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert 2
             matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(0);
+            Check.That(matchers.Count).IsEqualTo(0);
         }
     }
 }

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

@@ -20,7 +20,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(((RequestMessageBodyMatcher) matchers[0]).Matcher).IsEqualTo(matcher);
         }
     }

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

@@ -17,7 +17,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
         }
 
@@ -29,7 +29,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
         }
 
@@ -41,7 +41,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher));
         }
     }

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

@@ -17,7 +17,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
         }
 
@@ -29,7 +29,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
         }
 
@@ -41,7 +41,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
         }
 
@@ -53,7 +53,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
         }
 
@@ -65,7 +65,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
         }
 
@@ -77,7 +77,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher));
         }
     }

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

@@ -17,7 +17,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
         }
 
@@ -29,7 +29,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
         }
 
@@ -41,7 +41,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
         }
 
@@ -53,7 +53,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher));
         }
     }

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

@@ -17,7 +17,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
         }
 
@@ -29,7 +29,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
         }
 
@@ -41,7 +41,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
         }
 
@@ -53,7 +53,7 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            Check.That(matchers.Count()).IsEqualTo(1);
+            Check.That(matchers.Count).IsEqualTo(1);
             Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher));
         }
     }

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

@@ -9,7 +9,7 @@ namespace WireMock.Net.Tests.RequestMatchers
     public class RequestMessageParamMatcherTests
     {
         [Fact]
-        public void RequestMessageParamMatcher_GetMatchingScore_IgnoreCaseKeyWithValuesPresentInUrl_MatchExactOnStringValues()
+        public void RequestMessageParamMatcher_GetMatchingScore_IgnoreCaseKeyWithValuesPresentInUrl_And_With1StringValues_Returns1_0()
         {
             // Assign
             var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1"), "GET", "127.0.0.1");
@@ -24,7 +24,52 @@ namespace WireMock.Net.Tests.RequestMatchers
         }
 
         [Fact]
-        public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuesPresentInUrl_MatchExactOnStringValues()
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith1ValuePresentInUrl_And_With2Strings_Returns0_5()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new[] { "test1", "test2" });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(0.5d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith3ValuesPresentInUrl_And_With1ExactStringWith2Patterns_Returns0_66()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2,test3"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new IStringMatcher[] { new ExactMatcher("test1", "test2") });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsCloseTo(0.66d, 0.1d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With1ExactStringWith3Patterns_Returns0_66()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", false, new IStringMatcher[] { new ExactMatcher("test1", "test2", "test3") });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsCloseTo(0.66d, 0.1d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With2Strings_Returns1_0()
         {
             // Assign
             var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
@@ -39,7 +84,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         }
 
         [Fact]
-        public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuesPresentInUrl_MatchExactOnExactMatchers()
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWith2ValuesPresentInUrl_And_With2ExactStringMatchers_Returns1_0()
         {
             // Assign
             var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");

test/WireMock.Net.Tests/RequestMessageTests.cs

@@ -60,6 +60,18 @@ namespace WireMock.Net.Tests
             Check.That(request.GetParameter("key")).Contains("2");
         }
 
+        [Fact]
+        public void RequestMessage_ParseQuery_SingleKey_MultipleValuesCommaSeparated()
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost?key=1,2,3"), "POST", ClientIp);
+
+            // Assert
+            Check.That(request.GetParameter("key")).Contains("1");
+            Check.That(request.GetParameter("key")).Contains("2");
+            Check.That(request.GetParameter("key")).Contains("3");
+        }
+
         [Fact]
         public void RequestMessage_ParseQuery_SingleKey_MultipleValues()
         {

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs

@@ -5,6 +5,7 @@ using WireMock.Models;
 using WireMock.ResponseBuilders;
 using WireMock.Util;
 using Xunit;
+using Newtonsoft.Json.Linq;
 
 namespace WireMock.Net.Tests.ResponseBuilders
 {
@@ -199,5 +200,36 @@ namespace WireMock.Net.Tests.ResponseBuilders
             Check.That(responseMessage.Headers["H1"].ToString()).IsEqualTo("X1");
             Check.That(responseMessage.Headers["H2"].ToString()).IsEqualTo("X2");
         }
+        
+        [Fact]
+        public async Task Response_ProvideResponse_WithJsonBodyAndTransform_Func()
+        {
+            // Assign
+            const int request1Id = 1;
+            const int request2Id = 2;
+
+            var request1 = new RequestMessage(new UrlDetails($"http://localhost/test?id={request1Id}"), "GET", ClientIp);
+            var request2 = new RequestMessage(new UrlDetails($"http://localhost/test?id={request2Id}"), "GET", ClientIp);
+            
+            var response = Response.Create()
+                .WithStatusCode(200)
+                .WithBodyAsJson(JObject.Parse("{ \"id\": \"{{request.query.id}}\" }"))
+                .WithTransformer();
+
+            // Act
+            var response1Message = await response.ProvideResponseAsync(request1);
+            var response2Message = await response.ProvideResponseAsync(request2);
+
+            // Assert
+            Check.That(((JToken)response1Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id);
+            Check.That(response1Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response1Message.BodyData.BodyAsString).IsNull();
+            Check.That(response1Message.StatusCode).IsEqualTo(200);
+
+            Check.That(((JToken)response2Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request2Id);
+            Check.That(response2Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response2Message.BodyData.BodyAsString).IsNull();
+            Check.That(response2Message.StatusCode).IsEqualTo(200);
+        }
     }
-}
+}

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

@@ -30,13 +30,13 @@
 
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="MimeKitLite" Version="2.0.7" />
-    <PackageReference Include="Moq" Version="4.10.0" />
+    <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NFluent" Version="2.4.0" />
+    <PackageReference Include="NFluent" Version="2.5.0" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="ReportGenerator" Version="3.1.2" />
     <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.9" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.11" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>