ExactMatcher : IgnoreCase (#817)

* ...

* mm

* fix some null warnings

* fx

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

@@ -2,141 +2,153 @@ using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
-namespace WireMock.Net.Tests.Matchers
+namespace WireMock.Net.Tests.Matchers;
+
+public class ExactMatcherTests
 {
-    public class ExactMatcherTests
+    [Fact]
+    public void ExactMatcher_GetName()
     {
-        [Fact]
-        public void ExactMatcher_GetName()
-        {
-            // Assign
-            var matcher = new ExactMatcher("X");
+        // Assign
+        var matcher = new ExactMatcher("X");
 
-            // Act
-            string name = matcher.Name;
+        // Act
+        string name = matcher.Name;
 
-            // Assert
-            Check.That(name).Equals("ExactMatcher");
-        }
+        // Assert
+        Check.That(name).Equals("ExactMatcher");
+    }
 
-        [Fact]
-        public void ExactMatcher_GetPatterns()
-        {
-            // Assign
-            var matcher = new ExactMatcher("X");
+    [Fact]
+    public void ExactMatcher_GetPatterns()
+    {
+        // Assign
+        var matcher = new ExactMatcher("X");
 
-            // Act
-            var patterns = matcher.GetPatterns();
+        // Act
+        var patterns = matcher.GetPatterns();
 
-            // Assert
-            Check.That(patterns).ContainsExactly("X");
-        }
+        // Assert
+        Check.That(patterns).ContainsExactly("X");
+    }
 
-        [Fact]
-        public void ExactMatcher_IsMatch_WithSinglePattern_ReturnsMatch1_0()
-        {
-            // Assign
-            var matcher = new ExactMatcher("x");
+    [Fact]
+    public void ExactMatcher_IsMatch_IgnoreCase()
+    {
+        // Assign
+        var matcher = new ExactMatcher(true, "x");
 
-            // Act
-            double result = matcher.IsMatch("x");
+        // Act
+        double result = matcher.IsMatch("X");
 
-            // Assert
-            Check.That(result).IsEqualTo(1.0);
-        }
+        // Assert
+        Check.That(result).IsEqualTo(1.0);
+    }
 
-        [Fact]
-        public void ExactMatcher_IsMatch_WithSinglePattern_ReturnsMatch0_0()
-        {
-            // Assign
-            var matcher = new ExactMatcher("x");
+    [Fact]
+    public void ExactMatcher_IsMatch_WithSinglePattern_ReturnsMatch1_0()
+    {
+        // Assign
+        var matcher = new ExactMatcher("x");
 
-            // Act
-            double result = matcher.IsMatch("y");
+        // Act
+        double result = matcher.IsMatch("x");
 
-            // Assert
-            Check.That(result).IsEqualTo(0.0);
-        }
+        // Assert
+        Check.That(result).IsEqualTo(1.0);
+    }
 
-        [Fact]
-        public void ExactMatcher_IsMatch_WithMultiplePatterns_Or_ReturnsMatch_1_0()
-        {
-            // Assign
-            var matcher = new ExactMatcher("x", "y");
+    [Fact]
+    public void ExactMatcher_IsMatch_WithSinglePattern_ReturnsMatch0_0()
+    {
+        // Assign
+        var matcher = new ExactMatcher("x");
 
-            // Act
-            double result = matcher.IsMatch("x");
+        // Act
+        double result = matcher.IsMatch("y");
 
-            // Assert
-            Check.That(result).IsEqualTo(1.0);
-        }
+        // Assert
+        Check.That(result).IsEqualTo(0.0);
+    }
 
-        [Fact]
-        public void ExactMatcher_IsMatch_WithMultiplePatterns_And_ReturnsMatch_0_0()
-        {
-            // Assign
-            var matcher = new ExactMatcher("x", "y");
+    [Fact]
+    public void ExactMatcher_IsMatch_WithMultiplePatterns_Or_ReturnsMatch_1_0()
+    {
+        // Assign
+        var matcher = new ExactMatcher("x", "y");
 
-            // Act
-            double result = matcher.IsMatch("x");
+        // Act
+        double result = matcher.IsMatch("x");
 
-            // Assert
-            Check.That(result).IsEqualTo(1.0);
-        }
+        // Assert
+        Check.That(result).IsEqualTo(1.0);
+    }
 
-        [Theory]
-        [InlineData(MatchOperator.Or, 1.0d)]
-        [InlineData(MatchOperator.And, 0.0d)]
-        [InlineData(MatchOperator.Average, 0.5d)]
-        public void ExactMatcher_IsMatch_WithMultiplePatterns_Average_ReturnsMatch(MatchOperator matchOperator, double score)
-        {
-            // Assign
-            var matcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, false, matchOperator, "x", "y");
+    [Fact]
+    public void ExactMatcher_IsMatch_WithMultiplePatterns_And_ReturnsMatch_0_0()
+    {
+        // Assign
+        var matcher = new ExactMatcher("x", "y");
 
-            // Act
-            double result = matcher.IsMatch("x");
+        // Act
+        double result = matcher.IsMatch("x");
 
-            // Assert
-            Check.That(result).IsEqualTo(score);
-        }
+        // Assert
+        Check.That(result).IsEqualTo(1.0);
+    }
 
-        [Fact]
-        public void ExactMatcher_IsMatch_SinglePattern()
-        {
-            // Assign
-            var matcher = new ExactMatcher("cat");
+    [Theory]
+    [InlineData(MatchOperator.Or, 1.0d)]
+    [InlineData(MatchOperator.And, 0.0d)]
+    [InlineData(MatchOperator.Average, 0.5d)]
+    public void ExactMatcher_IsMatch_WithMultiplePatterns_Average_ReturnsMatch(MatchOperator matchOperator, double score)
+    {
+        // Assign
+        var matcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, false, false, matchOperator, "x", "y");
 
-            // Act
-            double result = matcher.IsMatch("caR");
+        // Act
+        double result = matcher.IsMatch("x");
 
-            // Assert
-            Check.That(result).IsEqualTo(0.0);
-        }
+        // Assert
+        Check.That(result).IsEqualTo(score);
+    }
 
-        [Fact]
-        public void ExactMatcher_IsMatch_SinglePattern_AcceptOnMatch()
-        {
-            // Assign
-            var matcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, "cat");
+    [Fact]
+    public void ExactMatcher_IsMatch_SinglePattern()
+    {
+        // Assign
+        var matcher = new ExactMatcher("cat");
 
-            // Act
-            double result = matcher.IsMatch("cat");
+        // Act
+        double result = matcher.IsMatch("caR");
 
-            // Assert
-            Check.That(result).IsEqualTo(1.0);
-        }
+        // Assert
+        Check.That(result).IsEqualTo(0.0);
+    }
 
-        [Fact]
-        public void ExactMatcher_IsMatch_SinglePattern_RejectOnMatch()
-        {
-            // Assign
-            var matcher = new ExactMatcher(MatchBehaviour.RejectOnMatch, false, MatchOperator.Or, "cat");
+    [Fact]
+    public void ExactMatcher_IsMatch_SinglePattern_AcceptOnMatch()
+    {
+        // Assign
+        var matcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, false, false, MatchOperator.Or, "cat");
 
-            // Act
-            double result = matcher.IsMatch("cat");
+        // Act
+        double result = matcher.IsMatch("cat");
 
-            // Assert
-            Check.That(result).IsEqualTo(0.0);
-        }
+        // Assert
+        Check.That(result).IsEqualTo(1.0);
+    }
+
+    [Fact]
+    public void ExactMatcher_IsMatch_SinglePattern_RejectOnMatch()
+    {
+        // Assign
+        var matcher = new ExactMatcher(MatchBehaviour.RejectOnMatch, false, false, MatchOperator.Or, "cat");
+
+        // Act
+        double result = matcher.IsMatch("cat");
+
+        // Assert
+        Check.That(result).IsEqualTo(0.0);
     }
 }

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

@@ -13,455 +13,454 @@ using WireMock.Types;
 using WireMock.Util;
 using Xunit;
 
-namespace WireMock.Net.Tests.RequestMatchers
+namespace WireMock.Net.Tests.RequestMatchers;
+
+public class RequestMessageBodyMatcherTests
 {
-    public class RequestMessageBodyMatcherTests
+    [Fact]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatcher()
     {
-        [Fact]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatcher()
+        // Assign
+        var body = new BodyData
         {
-            // Assign
-            var body = new BodyData
+            BodyAsString = "b",
+            DetectedBodyType = BodyType.String
+        };
+        var stringMatcherMock = new Mock<IStringMatcher>();
+        stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(1d);
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(1d);
+
+        // Verify
+        stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never);
+        stringMatcherMock.Verify(m => m.IsMatch("b"), Times.Once);
+    }
+
+    [Theory]
+    [InlineData(1d, 1d, 1d)]
+    [InlineData(0d, 1d, 1d)]
+    [InlineData(1d, 0d, 1d)]
+    [InlineData(0d, 0d, 0d)]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatchers_Or(double one, double two, double expected)
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsString = "b",
+            DetectedBodyType = BodyType.String
+        };
+        var stringMatcherMock1 = new Mock<IStringMatcher>();
+        stringMatcherMock1.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(one);
+
+        var stringMatcherMock2 = new Mock<IStringMatcher>();
+        stringMatcherMock2.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(two);
+
+        var matchers = new[] { stringMatcherMock1.Object, stringMatcherMock2.Object };
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(MatchOperator.Or, matchers.Cast<IMatcher>().ToArray());
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(expected);
+
+        // Verify
+        stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
+        stringMatcherMock1.Verify(m => m.IsMatch("b"), Times.Once);
+
+        stringMatcherMock2.Verify(m => m.GetPatterns(), Times.Never);
+        stringMatcherMock2.Verify(m => m.IsMatch("b"), Times.Once);
+        stringMatcherMock2.VerifyNoOtherCalls();
+    }
+
+    [Theory]
+    [InlineData(1d, 1d, 1d)]
+    [InlineData(0d, 1d, 0d)]
+    [InlineData(1d, 0d, 0d)]
+    [InlineData(0d, 0d, 0d)]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatchers_And(double one, double two, double expected)
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsString = "b",
+            DetectedBodyType = BodyType.String
+        };
+        var stringMatcherMock1 = new Mock<IStringMatcher>();
+        stringMatcherMock1.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(one);
+
+        var stringMatcherMock2 = new Mock<IStringMatcher>();
+        stringMatcherMock2.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(two);
+
+        var matchers = new[] { stringMatcherMock1.Object, stringMatcherMock2.Object };
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(MatchOperator.And, matchers.Cast<IMatcher>().ToArray());
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(expected);
+
+        // Verify
+        stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
+        stringMatcherMock1.Verify(m => m.IsMatch("b"), Times.Once);
+
+        stringMatcherMock2.Verify(m => m.GetPatterns(), Times.Never);
+        stringMatcherMock2.Verify(m => m.IsMatch("b"), Times.Once);
+        stringMatcherMock2.VerifyNoOtherCalls();
+    }
+
+    [Theory]
+    [InlineData(1d, 1d, 1d)]
+    [InlineData(0d, 1d, 0.5d)]
+    [InlineData(1d, 0d, 0.5d)]
+    [InlineData(0d, 0d, 0d)]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatchers_Average(double one, double two, double expected)
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsString = "b",
+            DetectedBodyType = BodyType.String
+        };
+        var stringMatcherMock1 = new Mock<IStringMatcher>();
+        stringMatcherMock1.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(one);
+
+        var stringMatcherMock2 = new Mock<IStringMatcher>();
+        stringMatcherMock2.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(two);
+
+        var matchers = new[] { stringMatcherMock1.Object, stringMatcherMock2.Object };
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(MatchOperator.Average, matchers.Cast<IMatcher>().ToArray());
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(expected);
+
+        // Verify
+        stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
+        stringMatcherMock1.Verify(m => m.IsMatch("b"), Times.Once);
+
+        stringMatcherMock2.Verify(m => m.GetPatterns(), Times.Never);
+        stringMatcherMock2.Verify(m => m.IsMatch("b"), Times.Once);
+    }
+
+    [Fact]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_IStringMatcher()
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsBytes = new byte[] { 1 },
+            DetectedBodyType = BodyType.Bytes
+        };
+        var stringMatcherMock = new Mock<IStringMatcher>();
+        stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(0.5d);
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(0.0d);
+
+        // Verify
+        stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never);
+        stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Never);
+    }
+
+    [Fact]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_IStringMatcher()
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsJson = new { value = 42 },
+            DetectedBodyType = BodyType.Json
+        };
+        var stringMatcherMock = new Mock<IStringMatcher>();
+        stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(1.0d);
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(1.0d);
+
+        // Verify
+        stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Once);
+    }
+
+    [Fact]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_and_BodyAsString_IStringMatcher()
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsJson = new { value = 42 },
+            BodyAsString = "orig",
+            DetectedBodyType = BodyType.Json
+        };
+        var stringMatcherMock = new Mock<IStringMatcher>();
+        stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(1d);
+        stringMatcherMock.SetupGet(m => m.MatchOperator).Returns(MatchOperator.Or);
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(1d);
+
+        // Verify
+        stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Once);
+    }
+
+    [Fact]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_IObjectMatcher()
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsJson = 42,
+            DetectedBodyType = BodyType.Json
+        };
+        var objectMatcherMock = new Mock<IObjectMatcher>();
+        objectMatcherMock.Setup(m => m.IsMatch(It.IsAny<object>())).Returns(1d);
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(objectMatcherMock.Object);
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(1d);
+
+        // Verify
+        objectMatcherMock.Verify(m => m.IsMatch(42), Times.Once);
+    }
+
+    [Fact]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_CSharpCodeMatcher()
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsJson = new { value = 42 },
+            DetectedBodyType = BodyType.Json
+        };
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(new CSharpCodeMatcher(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, "return it.value == 42;"));
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(1.0d);
+    }
+
+    [Theory]
+    [InlineData(null, 0.0)]
+    [InlineData(new byte[0], 0.0)]
+    [InlineData(new byte[] { 48 }, 1.0)]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_NotNullOrEmptyObjectMatcher(byte[] bytes, double expected)
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsBytes = bytes,
+            DetectedBodyType = BodyType.Bytes
+        };
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(new NotNullOrEmptyMatcher());
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        score.Should().Be(expected);
+    }
+
+    [Theory]
+    [InlineData(null, 0.0)]
+    [InlineData("", 0.0)]
+    [InlineData("x", 1.0)]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_NotNullOrEmptyObjectMatcher(string data, double expected)
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsString = data,
+            DetectedBodyType = BodyType.String
+        };
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(new NotNullOrEmptyMatcher());
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        score.Should().Be(expected);
+    }
+
+    [Theory]
+    [InlineData(new byte[] { 1 })]
+    [InlineData(new byte[] { 48 })]
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_IObjectMatcher(byte[] bytes)
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsBytes = bytes,
+            DetectedBodyType = BodyType.Bytes
+        };
+        var objectMatcherMock = new Mock<IObjectMatcher>();
+        objectMatcherMock.Setup(m => m.IsMatch(It.IsAny<object>())).Returns(1.0d);
+
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
+
+        var matcher = new RequestMessageBodyMatcher(objectMatcherMock.Object);
+
+        // Act
+        var result = new RequestMatchResult();
+        double score = matcher.GetMatchingScore(requestMessage, result);
+
+        // Assert
+        Check.That(score).IsEqualTo(1.0d);
+
+        // Verify
+        objectMatcherMock.Verify(m => m.IsMatch(It.IsAny<byte[]>()), Times.Once);
+    }
+
+    [Theory]
+    [MemberData(nameof(MatchingScoreData))]
+    public async Task RequestMessageBodyMatcher_GetMatchingScore_Funcs_Matching(object body, RequestMessageBodyMatcher matcher, bool shouldMatch)
+    {
+        // assign
+        BodyData bodyData;
+        if (body is byte[] b)
+        {
+            var bodyParserSettings = new BodyParserSettings
             {
-                BodyAsString = "b",
-                DetectedBodyType = BodyType.String
+                Stream = new MemoryStream(b),
+                ContentType = null,
+                DeserializeJson = true
             };
-            var stringMatcherMock = new Mock<IStringMatcher>();
-            stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(1d);
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(1d);
-
-            // Verify
-            stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock.Verify(m => m.IsMatch("b"), Times.Once);
+            bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
         }
-
-        [Theory]
-        [InlineData(1d, 1d, 1d)]
-        [InlineData(0d, 1d, 1d)]
-        [InlineData(1d, 0d, 1d)]
-        [InlineData(0d, 0d, 0d)]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatchers_Or(double one, double two, double expected)
+        else if (body is string s)
         {
-            // Assign
-            var body = new BodyData
+            var bodyParserSettings = new BodyParserSettings
             {
-                BodyAsString = "b",
-                DetectedBodyType = BodyType.String
+                Stream = new MemoryStream(Encoding.UTF8.GetBytes(s)),
+                ContentType = null,
+                DeserializeJson = true
             };
-            var stringMatcherMock1 = new Mock<IStringMatcher>();
-            stringMatcherMock1.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(one);
-
-            var stringMatcherMock2 = new Mock<IStringMatcher>();
-            stringMatcherMock2.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(two);
-
-            var matchers = new[] { stringMatcherMock1.Object, stringMatcherMock2.Object };
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(MatchOperator.Or, matchers.Cast<IMatcher>().ToArray());
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(expected);
-
-            // Verify
-            stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock1.Verify(m => m.IsMatch("b"), Times.Once);
-
-            stringMatcherMock2.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock2.Verify(m => m.IsMatch("b"), Times.Once);
-            stringMatcherMock2.VerifyNoOtherCalls();
+            bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+        }
+        else
+        {
+            throw new Exception();
         }
 
-        [Theory]
-        [InlineData(1d, 1d, 1d)]
-        [InlineData(0d, 1d, 0d)]
-        [InlineData(1d, 0d, 0d)]
-        [InlineData(0d, 0d, 0d)]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatchers_And(double one, double two, double expected)
+        var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", bodyData);
+
+        // act
+        var result = new RequestMatchResult();
+        var score = matcher.GetMatchingScore(requestMessage, result);
+
+        // assert
+        Check.That(score).IsEqualTo(shouldMatch ? 1d : 0d);
+    }
+
+    public static TheoryData<object, RequestMessageBodyMatcher, bool> MatchingScoreData
+    {
+        get
         {
-            // Assign
-            var body = new BodyData
+            var json = "{'a':'b'}";
+            var str = "HelloWorld";
+            var bytes = new byte[] { 0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46, 0x49, 0x46, 0x00 };
+
+            return new TheoryData<object, RequestMessageBodyMatcher, bool>
             {
-                BodyAsString = "b",
-                DetectedBodyType = BodyType.String
+                // JSON match +++
+                {json, new RequestMessageBodyMatcher((object? o) => ((dynamic) o!).a == "b"), true},
+                {json, new RequestMessageBodyMatcher((string? s) => s == json), true},
+                {json, new RequestMessageBodyMatcher((byte[]? b) => b.SequenceEqual(Encoding.UTF8.GetBytes(json))), true},
+                
+                // JSON no match ---
+                {json, new RequestMessageBodyMatcher((object? o) => false), false},
+                {json, new RequestMessageBodyMatcher((string? s) => false), false},
+                {json, new RequestMessageBodyMatcher((byte[]? b) => false), false},
+                {json, new RequestMessageBodyMatcher(), false },
+                
+                // string match +++
+                {str, new RequestMessageBodyMatcher((object? o) => o == null), true},
+                {str, new RequestMessageBodyMatcher((string? s) => s == str), true},
+                {str, new RequestMessageBodyMatcher((byte[]? b) => b.SequenceEqual(Encoding.UTF8.GetBytes(str))), true},
+
+                // string no match ---
+                {str, new RequestMessageBodyMatcher((object? o) => false), false},
+                {str, new RequestMessageBodyMatcher((string? s) => false), false},
+                {str, new RequestMessageBodyMatcher((byte[]? b) => false), false},
+                {str, new RequestMessageBodyMatcher(), false },
+                
+                // binary match +++
+                {bytes, new RequestMessageBodyMatcher((object? o) => o == null), true},
+                {bytes, new RequestMessageBodyMatcher((string? s) => s == null), true},
+                {bytes, new RequestMessageBodyMatcher((byte[]? b) => b.SequenceEqual(bytes)), true},
+
+                // binary no match ---
+                {bytes, new RequestMessageBodyMatcher((object? o) => false), false},
+                {bytes, new RequestMessageBodyMatcher((string? s) => false), false},
+                {bytes, new RequestMessageBodyMatcher((byte[]? b) => false), false},
+                {bytes, new RequestMessageBodyMatcher(), false },
             };
-            var stringMatcherMock1 = new Mock<IStringMatcher>();
-            stringMatcherMock1.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(one);
-
-            var stringMatcherMock2 = new Mock<IStringMatcher>();
-            stringMatcherMock2.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(two);
-
-            var matchers = new[] { stringMatcherMock1.Object, stringMatcherMock2.Object };
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(MatchOperator.And, matchers.Cast<IMatcher>().ToArray());
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(expected);
-
-            // Verify
-            stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock1.Verify(m => m.IsMatch("b"), Times.Once);
-
-            stringMatcherMock2.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock2.Verify(m => m.IsMatch("b"), Times.Once);
-            stringMatcherMock2.VerifyNoOtherCalls();
-        }
-
-        [Theory]
-        [InlineData(1d, 1d, 1d)]
-        [InlineData(0d, 1d, 0.5d)]
-        [InlineData(1d, 0d, 0.5d)]
-        [InlineData(0d, 0d, 0d)]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatchers_Average(double one, double two, double expected)
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsString = "b",
-                DetectedBodyType = BodyType.String
-            };
-            var stringMatcherMock1 = new Mock<IStringMatcher>();
-            stringMatcherMock1.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(one);
-
-            var stringMatcherMock2 = new Mock<IStringMatcher>();
-            stringMatcherMock2.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(two);
-
-            var matchers = new[] { stringMatcherMock1.Object, stringMatcherMock2.Object };
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(MatchOperator.Average, matchers.Cast<IMatcher>().ToArray());
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(expected);
-
-            // Verify
-            stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock1.Verify(m => m.IsMatch("b"), Times.Once);
-
-            stringMatcherMock2.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock2.Verify(m => m.IsMatch("b"), Times.Once);
-        }
-
-        [Fact]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_IStringMatcher()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsBytes = new byte[] { 1 },
-                DetectedBodyType = BodyType.Bytes
-            };
-            var stringMatcherMock = new Mock<IStringMatcher>();
-            stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(0.5d);
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(0.0d);
-
-            // Verify
-            stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Never);
-        }
-
-        [Fact]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_IStringMatcher()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new { value = 42 },
-                DetectedBodyType = BodyType.Json
-            };
-            var stringMatcherMock = new Mock<IStringMatcher>();
-            stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(1.0d);
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(1.0d);
-
-            // Verify
-            stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Once);
-        }
-
-        [Fact]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_and_BodyAsString_IStringMatcher()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new { value = 42 },
-                BodyAsString = "orig",
-                DetectedBodyType = BodyType.Json
-            };
-            var stringMatcherMock = new Mock<IStringMatcher>();
-            stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(1d);
-            stringMatcherMock.SetupGet(m => m.MatchOperator).Returns(MatchOperator.Or);
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(1d);
-
-            // Verify
-            stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Once);
-        }
-
-        [Fact]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_IObjectMatcher()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = 42,
-                DetectedBodyType = BodyType.Json
-            };
-            var objectMatcherMock = new Mock<IObjectMatcher>();
-            objectMatcherMock.Setup(m => m.IsMatch(It.IsAny<object>())).Returns(1d);
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(objectMatcherMock.Object);
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(1d);
-
-            // Verify
-            objectMatcherMock.Verify(m => m.IsMatch(42), Times.Once);
-        }
-
-        [Fact]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_CSharpCodeMatcher()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new { value = 42 },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(new CSharpCodeMatcher(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, "return it.value == 42;"));
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(1.0d);
-        }
-
-        [Theory]
-        [InlineData(null, 0.0)]
-        [InlineData(new byte[0], 0.0)]
-        [InlineData(new byte[] { 48 }, 1.0)]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_NotNullOrEmptyObjectMatcher(byte[] bytes, double expected)
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsBytes = bytes,
-                DetectedBodyType = BodyType.Bytes
-            };
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(new NotNullOrEmptyMatcher());
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            score.Should().Be(expected);
-        }
-
-        [Theory]
-        [InlineData(null, 0.0)]
-        [InlineData("", 0.0)]
-        [InlineData("x", 1.0)]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_NotNullOrEmptyObjectMatcher(string data, double expected)
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsString = data,
-                DetectedBodyType = BodyType.String
-            };
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(new NotNullOrEmptyMatcher());
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            score.Should().Be(expected);
-        }
-
-        [Theory]
-        [InlineData(new byte[] { 1 })]
-        [InlineData(new byte[] { 48 })]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_IObjectMatcher(byte[] bytes)
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsBytes = bytes,
-                DetectedBodyType = BodyType.Bytes
-            };
-            var objectMatcherMock = new Mock<IObjectMatcher>();
-            objectMatcherMock.Setup(m => m.IsMatch(It.IsAny<object>())).Returns(1.0d);
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(objectMatcherMock.Object);
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(1.0d);
-
-            // Verify
-            objectMatcherMock.Verify(m => m.IsMatch(It.IsAny<byte[]>()), Times.Once);
-        }
-
-        [Theory]
-        [MemberData(nameof(MatchingScoreData))]
-        public async Task RequestMessageBodyMatcher_GetMatchingScore_Funcs_Matching(object body, RequestMessageBodyMatcher matcher, bool shouldMatch)
-        {
-            // assign
-            BodyData bodyData;
-            if (body is byte[] b)
-            {
-                var bodyParserSettings = new BodyParserSettings
-                {
-                    Stream = new MemoryStream(b),
-                    ContentType = null,
-                    DeserializeJson = true
-                };
-                bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
-            }
-            else if (body is string s)
-            {
-                var bodyParserSettings = new BodyParserSettings
-                {
-                    Stream = new MemoryStream(Encoding.UTF8.GetBytes(s)),
-                    ContentType = null,
-                    DeserializeJson = true
-                };
-                bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
-            }
-            else
-            {
-                throw new Exception();
-            }
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", bodyData);
-
-            // act
-            var result = new RequestMatchResult();
-            var score = matcher.GetMatchingScore(requestMessage, result);
-
-            // assert
-            Check.That(score).IsEqualTo(shouldMatch ? 1d : 0d);
-        }
-
-        public static TheoryData<object, RequestMessageBodyMatcher, bool> MatchingScoreData
-        {
-            get
-            {
-                var json = "{'a':'b'}";
-                var str = "HelloWorld";
-                var bytes = new byte[] { 0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46, 0x49, 0x46, 0x00 };
-
-                return new TheoryData<object, RequestMessageBodyMatcher, bool>
-                {
-                    // JSON match +++
-                    {json, new RequestMessageBodyMatcher((object o) => ((dynamic) o).a == "b"), true},
-                    {json, new RequestMessageBodyMatcher((string s) => s == json), true},
-                    {json, new RequestMessageBodyMatcher((byte[] b) => b.SequenceEqual(Encoding.UTF8.GetBytes(json))), true},
-                    
-                    // JSON no match ---
-                    {json, new RequestMessageBodyMatcher((object o) => false), false},
-                    {json, new RequestMessageBodyMatcher((string s) => false), false},
-                    {json, new RequestMessageBodyMatcher((byte[] b) => false), false},
-                    {json, new RequestMessageBodyMatcher(), false },
-                    
-                    // string match +++
-                    {str, new RequestMessageBodyMatcher((object o) => o == null), true},
-                    {str, new RequestMessageBodyMatcher((string s) => s == str), true},
-                    {str, new RequestMessageBodyMatcher((byte[] b) => b.SequenceEqual(Encoding.UTF8.GetBytes(str))), true},
-
-                    // string no match ---
-                    {str, new RequestMessageBodyMatcher((object o) => false), false},
-                    {str, new RequestMessageBodyMatcher((string s) => false), false},
-                    {str, new RequestMessageBodyMatcher((byte[] b) => false), false},
-                    {str, new RequestMessageBodyMatcher(), false },
-                    
-                    // binary match +++
-                    {bytes, new RequestMessageBodyMatcher((object o) => o == null), true},
-                    {bytes, new RequestMessageBodyMatcher((string s) => s == null), true},
-                    {bytes, new RequestMessageBodyMatcher((byte[] b) => b.SequenceEqual(bytes)), true},
-
-                    // binary no match ---
-                    {bytes, new RequestMessageBodyMatcher((object o) => false), false},
-                    {bytes, new RequestMessageBodyMatcher((string s) => false), false},
-                    {bytes, new RequestMessageBodyMatcher((byte[] b) => false), false},
-                    {bytes, new RequestMessageBodyMatcher(), false },
-                };
-            }
         }
     }
-}
+}

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

@@ -80,7 +80,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test http://localhost/foo /foo POSt");
     }
 
     [Theory]
@@ -104,7 +104,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b");
     }
 
     [Fact]
@@ -122,7 +122,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("a wiremock");
     }
 
     [Theory(Skip = "Invalid token `OpenBracket`")]
@@ -142,7 +142,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("a wiremock");
     }
 
     [Fact]
@@ -164,7 +164,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5");
     }
 
     [Theory(Skip = "Invalid token `OpenBracket`")]
@@ -188,7 +188,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
     }
 
     [Fact]
@@ -211,7 +211,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test");
         Check.That(response.Message.StatusCode).Equals("400");
     }
 
@@ -237,7 +237,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test");
         Check.That(response.Message.StatusCode).Equals("400");
     }
 
@@ -263,7 +263,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test");
         Check.That(response.Message.StatusCode).Equals(null);
     }
 
@@ -331,7 +331,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test");
         Check.That(response.Message.Headers).ContainsKey("x");
         Check.That(response.Message.Headers["x"]).Contains("text/plain");
         Check.That(response.Message.Headers["x"]).Contains("http://localhost/foo");
@@ -356,7 +356,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test");
         Check.That(response.Message.Headers).ContainsKey("x");
         Check.That(response.Message.Headers["x"]).Contains("text/plain");
         Check.That(response.Message.Headers["x"]).Contains("http://localhost/foo");
@@ -384,7 +384,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
     }
 
     [Theory]
@@ -644,7 +644,7 @@ public class ResponseWithTransformerTests
         // Assert
         Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
         Check.That(response.Message.BodyData.DetectedBodyType).Equals(BodyType.String);
-        Check.That(response.Message.BodyData.BodyAsString).Equals("<xml MyUniqueNumber=\"1\"></xml>");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("<xml MyUniqueNumber=\"1\"></xml>");
     }
 
     [Theory]

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

@@ -408,4 +408,24 @@ public class MatcherMapperTests
         matcher.Value.Should().BeEquivalentTo(pattern);
         matcher.Regex.Should().BeFalse();
     }
+
+    [Fact]
+    public void MatcherMapper_Map_MatcherModel_ExactMatcher_Pattern()
+    {
+        // Assign
+        var model = new MatcherModel
+        {
+            Name = "ExactMatcher",
+            Pattern = "p",
+            IgnoreCase = true
+        };
+
+        // Act
+        var matcher = (ExactMatcher)_sut.Map(model)!;
+
+        // Assert
+        matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+        matcher.GetPatterns().Should().Contain("p");
+        matcher.IgnoreCase.Should().BeTrue();
+    }
 }

test/WireMock.Net.Tests/Serialization/files/proxy.json

@@ -46,7 +46,8 @@
         "Matchers": [
           {
             "Name": "ExactMatcher",
-            "Pattern": "p1-v"
+            "Pattern": "p1-v",
+            "IgnoreCase": false
           }
         ]
       },
@@ -55,7 +56,8 @@
         "Matchers": [
           {
             "Name": "ExactMatcher",
-            "Pattern": "p2-v"
+            "Pattern": "p2-v",
+            "IgnoreCase": false
           }
         ]
       }

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

@@ -10,9 +10,6 @@
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
         <ProjectGuid>{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}</ProjectGuid>
 
-        <!--<SonarQubeTestProject>True</SonarQubeTestProject>
-		<SonarQubeExclude>True</SonarQubeExclude>-->
-
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>../../src/WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
         <!--<DelaySign>true</DelaySign>-->
@@ -38,7 +35,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <!--<PackageReference Include="Mapster" Version="7.2.0" />-->
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
@@ -53,17 +49,11 @@
         <PackageReference Include="Moq" Version="4.17.2" />
         <PackageReference Include="System.Threading" Version="4.3.0" />
         <PackageReference Include="RestEase" Version="1.5.7" />
-        <!--<PackageReference Include="RandomDataGenerator.Net" Version="1.0.14" />-->
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="NFluent" Version="2.8.0" />
-        <!--<PackageReference Include="OpenCover" Version="4.7.922" />-->
-        <!--<PackageReference Include="ReportGenerator" Version="4.8.1" />-->
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
         <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.19" />
-        <!--<PackageReference Include="StrongNamer" Version="0.2.5" />-->
         <PackageReference Include="AnyOf" Version="0.3.0" />
-        <!--<PackageReference Include="TinyMapper" Version="3.0.3" />-->
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'net461'">