Version 2.x (#1359)

* Version 2.x * Setup .NET 9 * 12 * cleanup some #if for NETSTANDARD1_3 * cleanup + fix tests for net8 * openapi * NO ConfigureAwait(false) + cleanup * . * #endif * HashSet * WireMock.Net.NUnit * HttpContext * Add WebSockets (#1423) * Add WebSockets * Add tests * fix * more tests * Add tests * ... * remove IOwin * - * tests * fluent * ok * match * . * byte[] * x * func * func * byte * trans * ... * frameworks......... * jmes * xxx * sc * using var httpClient = new HttpClient(); * usings * maxRetries * up * xunit v3 * ct * --- * ct * ct2 * T Unit * WireMock.Net.TUnitTests / 10 * t unit first * --project * no tunit * t2 * --project * --project * ci - --project * publish ./test/wiremock-coverage.xml * windows * . * log * ... * log * goed * BodyType * . * . * --scenario * ... * pact * ct * . * WireMock.Net.RestClient.AwesomeAssertions (#1427) * WireMock.Net.RestClient.AwesomeAssertions * ok * atpath * fix test * sonar fixes * ports * proxy test * FIX? * --- * await Task.Delay(100, _ct); * ? * --project * Aspire: use IDistributedApplicationEventingSubscriber (#1428) * broadcast * ok * more tsts * . * Collection * up * . * 2 * remove nfluent * <VersionPrefix>2.0.0-preview-02</VersionPrefix> * ... * . * nuget icon * . * <PackageReference Include="JmesPath.Net" Version="1.1.0" /> * x * 500 * . * fix some warnings * ws
2026-04-24 09:48:51 +02:00 · 2026-03-11 17:02:47 +01:00
parent d6e19532bc
commit a292f28dda
521 changed files with 79740 additions and 5246 deletions
--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs
@@ -1,19 +1,13 @@
 // Copyright © WireMock.Net

-using System;
-using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using FluentAssertions;
 using Moq;
-using NFluent;
+
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;
-using Xunit;

 namespace WireMock.Net.Tests.RequestMatchers;

@@ -40,7 +34,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1d);
+        score.Should().Be(1d);

        // Verify
        stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never);
@@ -77,7 +71,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(expected);
+        score.Should().Be(expected);

        // Verify
        stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
@@ -118,7 +112,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(expected);
+        score.Should().Be(expected);

        // Verify
        stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
@@ -159,7 +153,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(expected);
+        score.Should().Be(expected);

        // Verify
        stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
@@ -190,7 +184,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);

        // Verify
        stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never);
@@ -218,7 +212,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);

        // Verify
        stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Once);
@@ -247,7 +241,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1d);
+        score.Should().Be(1d);

        // Verify
        stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Once);
@@ -274,7 +268,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1d);
+        score.Should().Be(1d);

        // Verify
        objectMatcherMock.Verify(m => m.IsMatch(42), Times.Once);
@@ -299,7 +293,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -331,7 +325,7 @@ public class RequestMessageBodyMatcherTests
    [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)
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_NotNullOrEmptyObjectMatcher(byte[]? bytes, double expected)
    {
        // Assign
        var body = new BodyData
@@ -355,7 +349,7 @@ public class RequestMessageBodyMatcherTests
    [InlineData(null, 0.0)]
    [InlineData("", 0.0)]
    [InlineData("x", 1.0)]
-    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_NotNullOrEmptyObjectMatcher(string data, double expected)
+    public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_NotNullOrEmptyObjectMatcher(string? data, double expected)
    {
        // Assign
        var body = new BodyData
@@ -398,7 +392,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);

        // Verify
        objectMatcherMock.Verify(m => m.IsMatch(It.IsAny<byte[]>()), Times.Once);
@@ -426,7 +420,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -450,7 +444,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -474,7 +468,7 @@ public class RequestMessageBodyMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Theory]
@@ -491,7 +485,7 @@ public class RequestMessageBodyMatcherTests
                ContentType = null,
                DeserializeJson = true
            };
-            bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            bodyData = await BodyParser.ParseAsync(bodyParserSettings);
        }
        else if (body is string s)
        {
@@ -501,7 +495,7 @@ public class RequestMessageBodyMatcherTests
                ContentType = null,
                DeserializeJson = true
            };
-            bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            bodyData = await BodyParser.ParseAsync(bodyParserSettings);
        }
        else
        {
@@ -515,7 +509,7 @@ public class RequestMessageBodyMatcherTests
        var score = matcher.GetMatchingScore(requestMessage, result);

        // assert
-        Check.That(score).IsEqualTo(shouldMatch ? 1d : 0d);
+        score.Should().Be(shouldMatch ? 1d : 0d);
    }

    public static TheoryData<object, RequestMessageBodyMatcher, bool> MatchingScoreData
--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs
@@ -1,12 +1,8 @@
 // Copyright © WireMock.Net

-using System.Collections.Generic;
-using System.Linq;
 using Moq;
-using NFluent;
 using WireMock.Matchers.Request;
 using WireMock.Models;
-using Xunit;

 namespace WireMock.Net.Tests.RequestMatchers;

@@ -31,7 +27,7 @@ public class RequestMessageCompositeMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);
    }

    [Fact]
@@ -51,7 +47,7 @@ public class RequestMessageCompositeMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.9d);
+        score.Should().Be(0.9d);

        // Verify
        requestMatcher1Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
@@ -75,7 +71,7 @@ public class RequestMessageCompositeMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);

        // Verify
        requestMatcher1Mock.Verify(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>()), Times.Once);
--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs
@@ -1,11 +1,8 @@
 // Copyright © WireMock.Net

-using System.Collections.Generic;
-using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
-using Xunit;

 namespace WireMock.Net.Tests.RequestMatchers;

@@ -23,7 +20,7 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);
    }

    [Fact]
@@ -38,7 +35,7 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -54,7 +51,7 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -70,7 +67,7 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);
    }

    [Fact]
@@ -86,7 +83,7 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -102,7 +99,7 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -118,7 +115,7 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -134,7 +131,7 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -150,6 +147,6 @@ public class RequestMessageCookieMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }
 }
--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs
@@ -1,15 +1,11 @@
 // Copyright © WireMock.Net

-#if GRAPHQL
-using System.Linq;
-using FluentAssertions;
 using Moq;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;
-using Xunit;

 namespace WireMock.Net.Tests.RequestMatchers;

@@ -192,5 +188,4 @@ public class RequestMessageGraphQLMatcherTests
        stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never);
        stringMatcherMock.Verify(m => m.IsMatch(It.IsAny<string>()), Times.Never);
    }
-}
-#endif
+}
--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs
@@ -1,11 +1,8 @@
 // Copyright © WireMock.Net

-using System.Collections.Generic;
-using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
-using Xunit;

 namespace WireMock.Net.Tests.RequestMatchers;

@@ -23,7 +20,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);
    }

    [Fact]
@@ -38,7 +35,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -54,7 +51,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);
    }
    [Fact]
    public void RequestMessageHeaderMatcher_GetMatchingScore_RejectOnMatch_HeaderDoesNotMatchPattern()
@@ -69,7 +66,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -85,7 +82,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -101,7 +98,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);
    }

    [Fact]
@@ -117,7 +114,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);
    }

    [Fact]
@@ -133,7 +130,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -149,7 +146,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -165,7 +162,7 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -181,6 +178,6 @@ public class RequestMessageHeaderMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }
 }
--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs
@@ -1,10 +1,8 @@
 // Copyright © WireMock.Net

-using FluentAssertions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
-using Xunit;

 namespace WireMock.Net.Tests.RequestMatchers;

--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs
@@ -1,16 +1,10 @@
 // Copyright © WireMock.Net

-#if MIMEKIT
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FluentAssertions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;
-using Xunit;

 namespace WireMock.Net.Tests.RequestMatchers;

@@ -215,5 +209,4 @@ AAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC
        var result = new RequestMatchResult();
        return matcher.GetMatchingScore(requestMessage, result);
    }
-}
-#endif
+}
--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs
@@ -1,13 +1,10 @@
 // Copyright © WireMock.Net

-using FluentAssertions;
-using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Owin;
 using WireMock.Types;
-using Xunit;

 namespace WireMock.Net.Tests.RequestMatchers;

@@ -25,7 +22,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -40,7 +37,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.5d);
+        score.Should().Be(0.5d);
    }

    [Fact]
@@ -55,7 +52,7 @@ public class RequestMessageParamMatcherTests
        var score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -70,7 +67,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsCloseTo(0.66d, 0.1d);
+        score.Should().BeApproximately(0.66d, 0.1d);
    }

    [Fact]
@@ -85,7 +82,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsCloseTo(0.66d, 0.1d);
+        score.Should().BeApproximately(0.66d, 0.1d);
    }

    [Fact]
@@ -100,7 +97,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -115,7 +112,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -130,7 +127,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.5d);
+        score.Should().Be(0.5d);
    }

    [Fact]
@@ -145,7 +142,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(0.0d);
+        score.Should().Be(0.0d);
    }

    [Fact]
@@ -160,7 +157,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -175,7 +172,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    [Fact]
@@ -190,7 +187,7 @@ public class RequestMessageParamMatcherTests
        double score = matcher.GetMatchingScore(requestMessage, result);

        // Assert
-        Check.That(score).IsEqualTo(1.0d);
+        score.Should().Be(1.0d);
    }

    // Issue #849
@@ -212,4 +209,5 @@ public class RequestMessageParamMatcherTests
        // Assert
        score.Should().Be(1.0);
    }
-}
+}
+