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-05-30 10:30:45 +02:00 · 2026-03-11 17:02:47 +01:00
parent d6e19532bc
commit a292f28dda
521 changed files with 79740 additions and 5246 deletions
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using Stef.Validation;
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
@@ -10,31 +9,20 @@ namespace WireMock.AwesomeAssertions;
 /// Provides assertion methods to verify the number of calls made to a WireMock server.
 /// This class is used in the context of AwesomeAssertions.
 /// </summary>
-public class WireMockANumberOfCallsAssertions
+/// <remarks>
+/// Initializes a new instance of the <see cref="WireMockANumberOfCallsAssertions"/> class.
+/// </remarks>
+/// <param name="server">The WireMock server to assert against.</param>
+/// <param name="callsCount">The expected number of calls to assert.</param>
+/// <param name="chain">The assertion chain</param>
+public class WireMockANumberOfCallsAssertions(IWireMockServer server, int callsCount, AssertionChain chain)
 {
-    private readonly IWireMockServer _server;
-    private readonly int _callsCount;
-    private readonly AssertionChain _chain;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockANumberOfCallsAssertions"/> class.
-    /// </summary>
-    /// <param name="server">The WireMock server to assert against.</param>
-    /// <param name="callsCount">The expected number of calls to assert.</param>
-    /// <param name="chain">The assertion chain</param>
-    public WireMockANumberOfCallsAssertions(IWireMockServer server, int callsCount, AssertionChain chain)
-    {
-        _server = Guard.NotNull(server);
-        _callsCount = callsCount;
-        _chain = chain;
-    }
-
    /// <summary>
    /// Returns an instance of <see cref="WireMockAssertions"/> which can be used to assert the expected number of calls.
    /// </summary>
    /// <returns>A <see cref="WireMockAssertions"/> instance for asserting the number of calls to the server.</returns>
    public WireMockAssertions Calls()
    {
-        return new WireMockAssertions(_server, _callsCount, _chain);
+        return new WireMockAssertions(server, callsCount, chain);
    }
 }
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net

 #pragma warning disable CS1591
-using System;
-
 // ReSharper disable once CheckNamespace
 namespace WireMock.AwesomeAssertions;

@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net

 #pragma warning disable CS1591
-using System;
 using WireMock.Constants;

 // ReSharper disable once CheckNamespace
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net

 #pragma warning disable CS1591
-using System;
-using System.Collections.Generic;
 using AnyOfTypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net

 #pragma warning disable CS1591
-using System;
-
 // ReSharper disable once CheckNamespace
 namespace WireMock.AwesomeAssertions;

@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net

 #pragma warning disable CS1591
-using System;
-using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Server;

@@ -13,20 +11,21 @@ public partial class WireMockAssertions
 {
    public const string Any = "*";

+    private readonly AssertionChain _chain;
+
    public int? CallsCount { get; }
    public IReadOnlyList<IRequestMessage> RequestMessages { get; private set; }
-    private readonly AssertionChain _chain;

    public WireMockAssertions(IWireMockServer subject, int? callsCount, AssertionChain chain)
    {
        CallsCount = callsCount;
-        RequestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
+        RequestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).OfType<IRequestMessage>().ToList();
        _chain = chain;
    }

    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, bool> predicate)
    {
-        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter = requests => requests.Where(predicate).ToList();
+        IReadOnlyList<IRequestMessage> filter(IReadOnlyList<IRequestMessage> requests) => requests.Where(predicate).ToList();

        return (filter, requests => (CallsCount is null && filter(requests).Any()) || CallsCount == filter(requests).Count);
    }
@@ -9,19 +9,13 @@ namespace WireMock.AwesomeAssertions;
 /// <summary>
 /// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
 /// </summary>
-public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServer, WireMockReceivedAssertions>
+/// <remarks>
+/// Create a WireMockReceivedAssertions.
+/// </remarks>
+/// <param name="server">The <see cref="IWireMockServer"/>.</param>
+/// <param name="chain">The assertion chain</param>
+public class WireMockReceivedAssertions(IWireMockServer server, AssertionChain chain) : ReferenceTypeAssertions<IWireMockServer, WireMockReceivedAssertions>(server, chain)
 {
-    private readonly AssertionChain _chain;
-
-    /// <summary>
-    /// Create a WireMockReceivedAssertions.
-    /// </summary>
-    /// <param name="server">The <see cref="IWireMockServer"/>.</param>
-    /// <param name="chain">The assertion chain</param>
-    public WireMockReceivedAssertions(IWireMockServer server, AssertionChain chain) : base(server, chain)
-    {
-        _chain = chain;
-    }

    /// <summary>
    /// Asserts if <see cref="IWireMockServer"/> has received no calls.
@@ -29,7 +23,7 @@ public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServe
    /// <returns><see cref="WireMockAssertions"/></returns>
    public WireMockAssertions HaveReceivedNoCalls()
    {
-        return new WireMockAssertions(Subject, 0, _chain);
+        return new WireMockAssertions(Subject, 0, CurrentAssertionChain);
    }

    /// <summary>
@@ -38,7 +32,7 @@ public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServe
    /// <returns><see cref="WireMockAssertions"/></returns>
    public WireMockAssertions HaveReceivedACall()
    {
-        return new WireMockAssertions(Subject, null, _chain);
+        return new WireMockAssertions(Subject, null, CurrentAssertionChain);
    }

    /// <summary>
@@ -48,7 +42,7 @@ public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServe
    /// <returns><see cref="WireMockANumberOfCallsAssertions"/></returns>
    public WireMockANumberOfCallsAssertions HaveReceived(int callsCount)
    {
-        return new WireMockANumberOfCallsAssertions(Subject, callsCount, _chain);
+        return new WireMockANumberOfCallsAssertions(Subject, callsCount, CurrentAssertionChain);
    }

    /// <inheritdoc />
@@ -3,21 +3,20 @@
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.AwesomeAssertions
+namespace WireMock.AwesomeAssertions;
+
+/// <summary>
+/// Contains extension methods for custom assertions in unit tests.
+/// </summary>
+public static class WireMockExtensions
 {
    /// <summary>
-    /// Contains extension methods for custom assertions in unit tests.
+    /// Returns a <see cref="WireMockReceivedAssertions"/> object that can be used to assert the current <see cref="IWireMockServer"/>.
    /// </summary>
-    public static class WireMockExtensions
+    /// <param name="instance">The WireMockServer</param>
+    /// <returns><see cref="WireMockReceivedAssertions"/></returns>
+    public static WireMockReceivedAssertions Should(this IWireMockServer instance)
    {
-        /// <summary>
-        /// Returns a <see cref="WireMockReceivedAssertions"/> object that can be used to assert the current <see cref="IWireMockServer"/>.
-        /// </summary>
-        /// <param name="instance">The WireMockServer</param>
-        /// <returns><see cref="WireMockReceivedAssertions"/></returns>
-        public static WireMockReceivedAssertions Should(this IWireMockServer instance)
-        {
-            return new WireMockReceivedAssertions(instance, AssertionChain.GetOrCreate());
-        }
+        return new WireMockReceivedAssertions(instance, AssertionChain.GetOrCreate());
    }
 }
@@ -4,7 +4,7 @@
        <Description>AwesomeAssertions extensions for WireMock.Net</Description>
        <AssemblyTitle>WireMock.Net.AwesomeAssertions</AssemblyTitle>
        <Authors>Francesco Venturoli;Mahmoud Ali;Stef Heyenrath</Authors>
-        <TargetFrameworks>net47;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFramework>netstandard2.0</TargetFramework>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <AssemblyName>WireMock.Net.AwesomeAssertions</AssemblyName>
        <PackageId>WireMock.Net.AwesomeAssertions</PackageId>
@@ -32,7 +32,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="AwesomeAssertions" Version="9.0.0" />
+        <PackageReference Include="AwesomeAssertions" Version="9.4.0" />
    </ItemGroup>

    <ItemGroup>