1.0.29.0

HandlebarsRegistrationCallback example
JsonMatcher support IgnoreCase (#333 )
2026-02-15 14:57:44 +01:00 · 2019-08-29 21:54:02 +02:00 · 2019-08-25 18:40:54 +02:00 · 2019-08-23 19:49:15 +00:00 · 2019-08-23 11:38:29 +00:00 · 2019-08-22 17:58:53 +00:00
20 changed files with 168 additions and 151 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.0.29.0 (29 August 2019)
+- [#328](https://github.com/WireMock-Net/WireMock.Net/pull/328) - Fix LogRequest : Index Out Of Bounds [bug] contributed by [StefH](https://github.com/StefH)
+- [#331](https://github.com/WireMock-Net/WireMock.Net/pull/331) - Fix: Collection was modified exception [bug] contributed by [theramis](https://github.com/theramis)
+- [#333](https://github.com/WireMock-Net/WireMock.Net/pull/333) - JsonMatcher support IgnoreCase [feature] contributed by [StefH](https://github.com/StefH)
+- [#327](https://github.com/WireMock-Net/WireMock.Net/issues/327) - Index must be within the bounds of the List - Bug [bug]
+- [#332](https://github.com/WireMock-Net/WireMock.Net/issues/332) - Case sensitive true is ignored for JsonMatcher [feature]
+
 # 1.0.28.0 (20 August 2019)
 - [#317](https://github.com/WireMock-Net/WireMock.Net/pull/317) - Make SaveMapping and SaveMappingToFile settings independent. [feature] contributed by [vitaliydavydiak](https://github.com/vitaliydavydiak)
 - [#319](https://github.com/WireMock-Net/WireMock.Net/pull/319) - Add blacklist for Request Cookies. contributed by [vitaliydavydiak](https://github.com/vitaliydavydiak)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <VersionPrefix>1.0.28</VersionPrefix>
+    <VersionPrefix>1.0.29</VersionPrefix>
  </PropertyGroup>

  <Choose>
--- a/GitHubReleaseNotes.txt
+++ b/GitHubReleaseNotes.txt
@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes

-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.28.0
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.29.0
--- a/Solution.sln
+++ b/Solution.sln
@@ -54,8 +54,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.HeadersTest", "examples\WireMock.Net.Console.HeadersTest\WireMock.Net.Console.HeadersTest.csproj", "{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net461.Classic", "examples\WireMock.Net.Console.Net461.Classic\WireMock.Net.Console.Net461.Classic.csproj", "{1261BB9B-A7D4-456C-8985-3CE560361B8E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452.Classic", "examples\WireMock.Net.Console.Net452.Classic\WireMock.Net.Console.Net452.Classic.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
@@ -120,10 +118,6 @@ Global
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -154,7 +148,6 @@ Global
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{83645809-9E01-4E81-8733-BA9497554ABF} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
--- a/examples/WireMock.Net.Console.HeadersTest/Program.cs
+++ b/examples/WireMock.Net.Console.HeadersTest/Program.cs
@@ -1,60 +0,0 @@
-using System.IO;
-using System.Reflection;
-using log4net;
-using log4net.Config;
-using log4net.Repository;
-using Newtonsoft.Json;
-using WireMock.Logging;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.Console.NETCoreApp
-{
-    static class Program
-    {
-        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
-
-        static void Main(params string[] args)
-        {
-            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
-
-            string url = "http://localhost:9999/";
-
-            var server = FluentMockServer.Start(new FluentMockServerSettings
-            {
-                Urls = new[] { url },
-                StartAdminInterface = true,
-                Logger = new WireMockConsoleLogger()
-            });
-            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
-
-            server.SetBasicAuthentication("a", "b");
-
-            server.AllowPartialMapping();
-
-            server
-                .Given(Request.Create()
-                    .UsingGet()
-                    .WithHeader("Keep-Alive-Test", "stef")
-                )
-                .RespondWith(Response.Create()
-                    .WithHeader("Keep-Alive", "timeout=1, max=1")
-                    .WithBody("Keep-Alive OK")
-                );
-
-            System.Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
-
-            System.Console.WriteLine("Displaying all requests");
-            var allRequests = server.LogEntries;
-            System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
-
-            System.Console.WriteLine("Press any key to quit");
-            System.Console.ReadKey();
-        }
-    }
-}
--- a/examples/WireMock.Net.Console.HeadersTest/WireMock.Net.Console.HeadersTest.csproj
+++ b/examples/WireMock.Net.Console.HeadersTest/WireMock.Net.Console.HeadersTest.csproj
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="nlog.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
--- a/examples/WireMock.Net.Console.HeadersTest/log4net.config
+++ b/examples/WireMock.Net.Console.HeadersTest/log4net.config
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
-  </configSections>
-  <appSettings>
-    <add key="log4net.Internal.Debug" value="true"/>
-  </appSettings>
-  <log4net>
-    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="ConsoleAppender" />
-    </root>
-  </log4net>
-</configuration>
--- a/examples/WireMock.Net.Console.HeadersTest/nlog.config
+++ b/examples/WireMock.Net.Console.HeadersTest/nlog.config
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      autoReload="true"
-      internalLogLevel="info"
-      internalLogFile="c:\temp\wiremock-internal-nlog.log">
-
-  <targets>
-    <!-- write logs to file  -->
-    <target xsi:type="File" name="all" fileName="c:\temp\wiremock-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId.Id}|${uppercase:${level}}|${logger}|${message} ${exception}" />
-  </targets>
-
-  <!-- rules to map from logger name to target -->
-  <rules>
-    <logger name="*" minlevel="Debug" writeTo="all" />
-  </rules>
-</nlog>
--- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
@@ -19,6 +19,7 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
    <PackageReference Include="log4net" Version="2.0.8" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
@@ -24,6 +24,7 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
    <PackageReference Include="log4net" Version="2.0.8" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
@@ -1,6 +1,9 @@
 using Newtonsoft.Json;
+using HandlebarsDotNet;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Net;
 using WireMock.Logging;
 using WireMock.Matchers;
@@ -11,6 +14,23 @@ using WireMock.Settings;

 namespace WireMock.Net.ConsoleApplication
 {
+    public interface IHandleBarTransformer
+    {
+        string Name { get; }
+
+        void Render(TextWriter textWriter, dynamic context, object[] arguments);
+    }
+
+    public class CustomNameTransformer : IHandleBarTransformer
+    {
+        public string Name => "CustomName";
+
+        public void Render(TextWriter writer, dynamic context, object[] parameters)
+        {
+            /* Handlebar logic to render */
+        }
+    }
+
    public static class MainApp
    {
        public static void Run()
@@ -33,6 +53,12 @@ namespace WireMock.Net.ConsoleApplication
                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },
                Logger = new WireMockConsoleLogger(),

+                HandlebarsRegistrationCallback = (handlebarsContext, fileSystemHandler) =>
+                {
+                    var transformer = new CustomNameTransformer();
+                    handlebarsContext.RegisterHelper(transformer.Name, transformer.Render);
+                }
+
                // Uncomment below if you want to use the CustomFileSystemFileHandler
                // FileSystemHandler = new CustomFileSystemFileHandler()
            });
--- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
@@ -36,6 +36,9 @@
    <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
+    </Reference>
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
    </Reference>
--- a/examples/WireMock.Net.Console.Net452.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
  <package id="log4net" version="2.0.8" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
--- a/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
@@ -35,6 +35,9 @@
    <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
+    </Reference>
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
    </Reference>
--- a/examples/WireMock.Net.Console.Net461.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net461.Classic/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Handlebars.Net" version="1.9.5" targetFramework="net461" />
  <package id="log4net" version="2.0.8" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
--- a/src/WireMock.Net/Matchers/JsonMatcher.cs
+++ b/src/WireMock.Net/Matchers/JsonMatcher.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WireMock.Validation;
@@ -8,7 +9,7 @@ namespace WireMock.Matchers
    /// <summary>
    /// JsonMatcher
    /// </summary>
-    public class JsonMatcher : IValueMatcher
+    public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
    {
        /// <inheritdoc cref="IValueMatcher.Value"/>
        public object Value { get; }
@@ -19,11 +20,15 @@ namespace WireMock.Matchers
        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
        public MatchBehaviour MatchBehaviour { get; }

+        /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
+        public bool IgnoreCase { get; }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
        /// </summary>
        /// <param name="value">The string value to check for equality.</param>
-        public JsonMatcher([NotNull] string value) : this(MatchBehaviour.AcceptOnMatch, value)
+        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+        public JsonMatcher([NotNull] string value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
        {
        }

@@ -31,7 +36,8 @@ namespace WireMock.Matchers
        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
        /// </summary>
        /// <param name="value">The object value to check for equality.</param>
-        public JsonMatcher([NotNull] object value) : this(MatchBehaviour.AcceptOnMatch, value)
+        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+        public JsonMatcher([NotNull] object value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
        {
        }

@@ -40,12 +46,14 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="value">The string value to check for equality.</param>
-        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] string value)
+        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] string value, bool ignoreCase = false)
        {
            Check.NotNull(value, nameof(value));

            MatchBehaviour = matchBehaviour;
            Value = value;
+            IgnoreCase = ignoreCase;
        }

        /// <summary>
@@ -53,12 +61,14 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="value">The object value to check for equality.</param>
-        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] object value)
+        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] object value, bool ignoreCase = false)
        {
            Check.NotNull(value, nameof(value));

            MatchBehaviour = matchBehaviour;
            Value = value;
+            IgnoreCase = ignoreCase;
        }

        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
@@ -91,7 +101,7 @@ namespace WireMock.Matchers
                            break;
                    }

-                    match = JToken.DeepEquals(jtokenValue, jtokenInput);
+                    match = DeepEquals(jtokenValue, jtokenInput);
                }
                catch (JsonException)
                {
@@ -101,5 +111,53 @@ namespace WireMock.Matchers

            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
        }
+
+        private bool DeepEquals(JToken value, JToken input)
+        {
+            if (!IgnoreCase)
+            {
+                return JToken.DeepEquals(value, input);
+            }
+
+            JToken renamedValue = Rename(value);
+            JToken renamedInput = Rename(input);
+
+            return JToken.DeepEquals(renamedValue, renamedInput);
+        }
+
+        private static string ToUpper(string input)
+        {
+            return input?.ToUpperInvariant();
+        }
+
+        // https://stackoverflow.com/questions/11679804/json-net-rename-properties
+        private static JToken Rename(JToken json)
+        {
+            if (json is JProperty property)
+            {
+                JToken propertyValue = property.Value;
+                if (propertyValue.Type == JTokenType.String)
+                {
+                    string stringValue = propertyValue.Value<string>();
+                    propertyValue = ToUpper(stringValue);
+                }
+
+                return new JProperty(ToUpper(property.Name), Rename(propertyValue));
+            }
+
+            if (json is JArray array)
+            {
+                var renamedValues = array.Select(Rename);
+                return new JArray(renamedValues);
+            }
+
+            if (json is JObject obj)
+            {
+                var renamedProperties = obj.Properties().Select(Rename);
+                return new JObject(renamedProperties);
+            }
+
+            return json;
+        }
    }
 }
--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -162,10 +162,9 @@ namespace WireMock.Owin

            if (_options.MaxRequestLogCount != null)
            {
-                var amount = _options.LogEntries.Count - _options.MaxRequestLogCount.Value;
-                for (int i = 0; i < amount; i++)
+                foreach (var logEntry in _options.LogEntries.OrderBy(le => le.RequestMessage.DateTime).Take(_options.LogEntries.Count - _options.MaxRequestLogCount.Value).ToList())
                {
-                    _options.LogEntries.RemoveAt(0);
+                    _options.LogEntries.Remove(logEntry);
                }
            }

@@ -173,13 +172,9 @@ namespace WireMock.Owin
            {
                var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);

-                for (var i = _options.LogEntries.Count - 1; i >= 0; i--)
+                foreach (var logEntry in _options.LogEntries.Where(le => le.RequestMessage.DateTime < checkTime).ToList())
                {
-                    var le = _options.LogEntries[i];
-                    if (le.RequestMessage.DateTime <= checkTime)
-                    {
-                        _options.LogEntries.RemoveAt(i);
-                    }
+                    _options.LogEntries.Remove(logEntry);
                }
            }
        }
--- a/src/WireMock.Net/Serialization/MatcherMapper.cs
+++ b/src/WireMock.Net/Serialization/MatcherMapper.cs
@@ -55,7 +55,7 @@ namespace WireMock.Serialization
                    return new RegexMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);

                case "JsonMatcher":
-                    return new JsonMatcher(matchBehaviour, matcher.Pattern);
+                    return new JsonMatcher(matchBehaviour, matcher.Pattern, matcher.IgnoreCase == true);

                case "JsonPathMatcher":
                    return new JsonPathMatcher(matchBehaviour, stringPatterns);
--- a/src/WireMock.Net/Server/FluentMockServer.LogEntries.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.LogEntries.cs
@@ -39,7 +39,7 @@ namespace WireMock.Server
        {
            var results = new Dictionary<LogEntry, RequestMatchResult>();

-            foreach (var log in _options.LogEntries)
+            foreach (var log in _options.LogEntries.ToList())
            {
                var requestMatchResult = new RequestMatchResult();
                foreach (var matcher in matchers)
--- a/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs
@@ -76,7 +76,7 @@ namespace WireMock.Net.Tests.Matchers
        }

        [Fact]
-        public void JsonMatcher_IsMatch_JObject1()
+        public void JsonMatcher_IsMatch_JObject()
        {
            // Assign 
            var matcher = new JsonMatcher(new { Id = 1, Name = "Test" });
@@ -94,7 +94,25 @@ namespace WireMock.Net.Tests.Matchers
        }

        [Fact]
-        public void JsonMatcher_IsMatch_JObject2()
+        public void JsonMatcher_IsMatch_WithIgnoreCaseTrue_JObject()
+        {
+            // Assign 
+            var matcher = new JsonMatcher(new { id = 1, Name = "test" }, true);
+
+            // Act 
+            var jobject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "NaMe", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_JObjectParsed()
        {
            // Assign 
            var matcher = new JsonMatcher(new { Id = 1, Name = "Test" });
@@ -107,6 +125,20 @@ namespace WireMock.Net.Tests.Matchers
            Assert.Equal(1.0, match);
        }

+        [Fact]
+        public void JsonMatcher_IsMatch_WithIgnoreCaseTrue_JObjectParsed()
+        {
+            // Assign 
+            var matcher = new JsonMatcher(new { Id = 1, Name = "TESt" }, true);
+
+            // Act 
+            var jobject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
        [Fact]
        public void JsonMatcher_IsMatch_JObjectAsString()
        {
@@ -125,6 +157,24 @@ namespace WireMock.Net.Tests.Matchers
            Assert.Equal(1.0, match);
        }

+        [Fact]
+        public void JsonMatcher_IsMatch_WithIgnoreCaseTrue_JObjectAsString()
+        {
+            // Assign 
+            var matcher = new JsonMatcher("{ \"Id\" : 1, \"Name\" : \"test\" }", true);
+
+            // Act 
+            var jobject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
        [Fact]
        public void JsonMatcher_IsMatch_JObjectAsString_RejectOnMatch()
        {
Author	SHA1	Message	Date
Stef Heyenrath	ec0bfd7eed	1.0.29.0	2019-08-29 21:54:02 +02:00
Stef Heyenrath	d885de1276	HandlebarsRegistrationCallback example	2019-08-25 18:40:54 +02:00
Stef Heyenrath	ccb2c51a39	JsonMatcher support IgnoreCase (#333 ) * JsonMatcher - IgnoreCase - #332 * also rename property name * Remove example project	2019-08-23 19:49:15 +00:00
Stef Heyenrath	2e33bcc464	#327 (#328 )	2019-08-23 11:38:29 +00:00
Simar	fc64c5f925	Convert collection into a new list before enumerating (#331 )	2019-08-22 17:58:53 +00:00