1.5.50

* Fix FluentAssertions on Header(s)

* ...

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.5.50 (12 March 2024)
+- [#1080](https://github.com/WireMock-Net/WireMock.Net/pull/1080) - Fix FluentAssertions on Header(s) [bug] contributed by [StefH](https://github.com/StefH)
+- [#1082](https://github.com/WireMock-Net/WireMock.Net/pull/1082) - Make WireMockAssertions extendable [feature] contributed by [StefH](https://github.com/StefH)
+- [#1074](https://github.com/WireMock-Net/WireMock.Net/issues/1074) - FluentAssertions extensions do not filter headers correctly [bug]
+- [#1075](https://github.com/WireMock-Net/WireMock.Net/issues/1075) - FluentAssertions extensions are not open for extension [feature]
+
 # 1.5.49 (06 March 2024)
 - [#1069](https://github.com/WireMock-Net/WireMock.Net/pull/1069) - Extend TypeLoader [feature] contributed by [StefH](https://github.com/StefH)
 - [#1078](https://github.com/WireMock-Net/WireMock.Net/pull/1078) - Upgrade ProtoBufJsonConverter to fix issue with dot(s) in package name [bug] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.49</VersionPrefix>
+        <VersionPrefix>1.5.50</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.5.49
+SET version=1.5.50
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate example --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,6 +1,7 @@
-# 1.5.49 (06 March 2024)
-- #1069 Extend TypeLoader [feature]
-- #1078 Upgrade ProtoBufJsonConverter to fix issue with dot(s) in package name [bug]
-- #1077 ProtoBufMatcher not working when proto package name contains dots [bug]
+# 1.5.50 (12 March 2024)
+- #1080 Fix FluentAssertions on Header(s) [bug]
+- #1082 Make WireMockAssertions extendable [feature]
+- #1074 FluentAssertions extensions do not filter headers correctly [bug]
+- #1075 FluentAssertions extensions are not open for extension [feature]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.AtUrl.cs

@@ -0,0 +1,60 @@
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
+                absoluteUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absoluteUrl,
+                requests => requests.Select(request => request.AbsoluteUrl)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.Url, url, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but no calls were made.",
+                url
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => url,
+                requests => requests.Select(request => request.Url)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, url);
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.FromClientIP.cs

@@ -0,0 +1,33 @@
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
+                clientIP
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
+                _ => clientIP, requests => requests.Select(request => request.ClientIP)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.UsingMethod.cs

@@ -58,8 +58,8 @@ public partial class WireMockAssertions
 
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 "Expected {context:wiremockserver} to have been called using method {0}{reason}, but no calls were made.",
                 method
@@ -72,7 +72,7 @@ public partial class WireMockAssertions
                 requests => requests.Select(request => request.Method)
             );
 
-        _requestMessages = filter(_requestMessages).ToList();
+        FilterRequestMessages(filter);
 
         return new AndConstraint<WireMockAssertions>(this);
     }

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs

@@ -70,8 +70,8 @@ public partial class WireMockAssertions
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
                 matcher.GetPatterns()
@@ -84,7 +84,7 @@ public partial class WireMockAssertions
                 requests => requests.Select(expression)
             );
 
-        _requestMessages = filter(_requestMessages).ToList();
+        FilterRequestMessages(filter);
 
         return new AndConstraint<WireMockAssertions>(this);
     }
@@ -100,8 +100,8 @@ public partial class WireMockAssertions
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
                 matcher.Value
@@ -114,7 +114,7 @@ public partial class WireMockAssertions
                 requests => requests.Select(expression)
             );
 
-        _requestMessages = filter(_requestMessages).ToList();
+        FilterRequestMessages(filter);
 
         return new AndConstraint<WireMockAssertions>(this);
     }
@@ -130,8 +130,8 @@ public partial class WireMockAssertions
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
                 matcher.Value
@@ -144,7 +144,7 @@ public partial class WireMockAssertions
                 requests => requests.Select(expression)
             );
 
-        _requestMessages = filter(_requestMessages).ToList();
+        FilterRequestMessages(filter);
 
         return new AndConstraint<WireMockAssertions>(this);
     }

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithHeader.cs

@@ -0,0 +1,157 @@
+#pragma warning disable CS1591
+using System.Collections.Generic;
+using WireMock.Types;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> WitHeaderKey(string expectedKey, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            return request.Headers?.Any(h => h.Key == expectedKey) == true;
+        });
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0}{reason}.",
+                expectedKey
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0}{reason}, but didn't find it among the calls with Header(s) {1}.",
+                _ => expectedKey,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, expectedKey);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string value, string because = "", params object[] becauseArgs)
+        => WithHeader(expectedKey, new[] { value }, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            var headers = request.Headers?.ToArray() ?? new KeyValuePair<string, WireMockList<string>>[0];
+
+            var matchingHeaderValues = headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
+
+            if (expectedValues.Length == 1 && matchingHeaderValues.Length == 1)
+            {
+                return matchingHeaderValues[0] == expectedValues[0];
+            }
+
+            var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToArray();
+            return expectedValues.Any(trimmedHeaderValues.Contains);
+        });
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0} and Values {1}{reason}.",
+                expectedKey,
+                expectedValues
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0} and Values {1}{reason}, but didn't find it among the calls with Header(s) {2}.",
+                _ => expectedKey,
+                _ => expectedValues,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeaderKey(string unexpectedKey, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            return request.Headers?.Any(h => h.Key == unexpectedKey) != true;
+        });
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0}{reason}.",
+                unexpectedKey
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0}{reason}, but found it among the calls with Header(s) {1}.",
+                _ => unexpectedKey,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string value, string because = "", params object[] becauseArgs)
+        => WithoutHeader(unexpectedKey, new[] { value }, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            var headers = request.Headers?.ToArray() ?? new KeyValuePair<string, WireMockList<string>>[0];
+
+            var matchingHeaderValues = headers.Where(h => h.Key == unexpectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
+
+            if (expectedValues.Length == 1 && matchingHeaderValues.Length == 1)
+            {
+                return matchingHeaderValues[0] != expectedValues[0];
+            }
+
+            var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToArray();
+            return !expectedValues.Any(trimmedHeaderValues.Contains);
+        });
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0} and Values {1}{reason}.",
+                unexpectedKey,
+                expectedValues
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0} and Values {1}{reason}, but found it among the calls with Header(s) {2}.",
+                _ => unexpectedKey,
+                _ => expectedValues,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithProxy.cs

@@ -0,0 +1,34 @@
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ProxyUrl, proxyUrl, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but no calls were made.",
+                proxyUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
+                _ => proxyUrl,
+                requests => requests.Select(request => request.ProxyUrl)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, proxyUrl);
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs

@@ -3,220 +3,42 @@ using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Server;
-using WireMock.Types;
 
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
 
 public partial class WireMockAssertions
 {
-    private const string Any = "*";
-    private readonly int? _callsCount;
-    private IReadOnlyList<IRequestMessage> _requestMessages;
-    private readonly IReadOnlyList<KeyValuePair<string, WireMockList<string>>> _headers;
+    public const string Any = "*";
+
+    public int? CallsCount { get; }
+    public IReadOnlyList<IRequestMessage> RequestMessages { get; private set; }
 
     public WireMockAssertions(IWireMockServer subject, int? callsCount)
     {
-        _callsCount = callsCount;
-        _requestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
-        _headers = _requestMessages.SelectMany(req => req.Headers).ToList();
+        CallsCount = callsCount;
+        RequestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
     }
 
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
-                absoluteUrl
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
-                _ => absoluteUrl, requests => requests.Select(request => request.AbsoluteUrl)
-            );
-
-        _requestMessages = filter(_requestMessages).ToList();
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
-    }
-
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.Url, url, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but no calls were made.",
-                url
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
-                _ => url,
-                requests => requests.Select(request => request.Url)
-            );
-
-        _requestMessages = filter(_requestMessages).ToList();
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, url);
-    }
-
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ProxyUrl, proxyUrl, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but no calls were made.",
-                proxyUrl
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
-                _ => proxyUrl,
-                requests => requests.Select(request => request.ProxyUrl)
-            );
-
-        _requestMessages = filter(_requestMessages).ToList();
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, proxyUrl);
-    }
-
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
-                clientIP
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
-                _ => clientIP, requests => requests.Select(request => request.ClientIP)
-            );
-
-        _requestMessages = filter(_requestMessages).ToList();
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WitHeaderKey(string expectedKey, string because = "", params object[] becauseArgs)
-    {
-        using (new AssertionScope("headers from requests sent"))
-        {
-            _headers.Select(h => h.Key).Should().Contain(expectedKey, because, becauseArgs);
-        }
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string value, string because = "", params object[] becauseArgs)
-        => WithHeader(expectedKey, new[] { value }, because, becauseArgs);
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
-    {
-        using (new AssertionScope($"header \"{expectedKey}\" from requests sent with value(s)"))
-        {
-            var matchingHeaderValues = _headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray())
-                .ToArray();
-
-            if (expectedValues.Length == 1)
-            {
-                matchingHeaderValues.Should().Contain(expectedValues.First(), because, becauseArgs);
-            }
-            else
-            {
-                var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
-                foreach (var expectedValue in expectedValues)
-                {
-                    trimmedHeaderValues.Should().Contain(expectedValue, because, becauseArgs);
-                }
-            }
-        }
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeaderKey(string unexpectedKey, string because = "", params object[] becauseArgs)
-    {
-        using (new AssertionScope("headers from requests sent"))
-        {
-            _headers.Select(h => h.Key).Should().NotContain(unexpectedKey, because, becauseArgs);
-        }
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string value, string because = "", params object[] becauseArgs)
-        => WithoutHeader(unexpectedKey, new[] { value }, because, becauseArgs);
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
-    {
-        using (new AssertionScope($"header \"{unexpectedKey}\" from requests sent with value(s)"))
-        {
-            var matchingHeaderValues = _headers.Where(h => h.Key == unexpectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
-
-            if (expectedValues.Length == 1)
-            {
-                matchingHeaderValues.Should().NotContain(expectedValues.First(), because, becauseArgs);
-            }
-            else
-            {
-                var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
-                foreach (var expectedValue in expectedValues)
-                {
-                    trimmedHeaderValues.Should().NotContain(expectedValue, because, becauseArgs);
-                }
-            }
-        }
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, bool> predicate)
+    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();
 
-        return (filter, requests => (_callsCount is null && filter(requests).Any()) || _callsCount == filter(requests).Count);
+        return (filter, requests => (CallsCount is null && filter(requests).Any()) || CallsCount == filter(requests).Count);
     }
 
-    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, string?> expression, IStringMatcher matcher)
+    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, string?> expression, IStringMatcher matcher)
     {
         return BuildFilterAndCondition(r => matcher.IsMatch(expression(r)).IsPerfect());
     }
 
-    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, object?> expression, IObjectMatcher matcher)
+    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, object?> expression, IObjectMatcher matcher)
     {
         return BuildFilterAndCondition(r => matcher.IsMatch(expression(r)).IsPerfect());
     }
+
+    public void FilterRequestMessages(Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter)
+    {
+        RequestMessages = filter(RequestMessages).ToList();
+    }
 }

test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsExtensions.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Linq;
+using FluentAssertions;
+using FluentAssertions.Execution;
+using WireMock.FluentAssertions;
+
+namespace WireMock.Net.Tests.FluentAssertions;
+
+public static class WireMockAssertionsExtensions
+{
+    [CustomAssertion]
+    public static AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl2(this WireMockAssertions assertions,
+        string absoluteUrl, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = assertions.BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => assertions.RequestMessages)
+            .ForCondition(requests => assertions.CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
+                absoluteUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absoluteUrl,
+                requests => requests.Select(request => request.AbsoluteUrl)
+            );
+
+        assertions.FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(assertions, absoluteUrl);
+    }
+}

test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs

@@ -12,7 +12,6 @@ using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
 using Xunit;
-using static System.Environment;
 
 namespace WireMock.Net.Tests.FluentAssertions;
 
@@ -62,6 +61,16 @@ public class WireMockAssertionsTests : IDisposable
             .AtAbsoluteUrl($"http://localhost:{_portUsed}/anyurl");
     }
 
+    [Fact]
+    public async Task HaveReceived1Calls_AtAbsoluteUrl2_WhenACallWasMadeToAbsoluteUrl_Should_BeOK()
+    {
+        await _httpClient.GetAsync("anyurl").ConfigureAwait(false);
+
+        _server.Should()
+            .HaveReceived(1).Calls()
+            .AtAbsoluteUrl2($"http://localhost:{_portUsed}/anyurl");
+    }
+
     [Fact]
     public async Task HaveReceived1Calls_AtAbsoluteUrlUsingPost_WhenAPostCallWasMadeToAbsoluteUrl_Should_BeOK()
     {
@@ -103,10 +112,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .AtAbsoluteUrl("anyurl");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                "Expected _server to have been called at address matching the absolute url \"anyurl\", but no calls were made.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called at address matching the absolute url \"anyurl\", but no calls were made.");
     }
 
     [Fact]
@@ -118,10 +126,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .AtAbsoluteUrl("anyurl");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                $"Expected _server to have been called at address matching the absolute url \"anyurl\", but didn't find it among the calls to {{\"http://localhost:{_portUsed}/\"}}.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage($"Expected _server to have been called at address matching the absolute url \"anyurl\", but didn't find it among the calls to {{\"http://localhost:{_portUsed}/\"}}.");
     }
 
     [Fact]
@@ -132,7 +139,7 @@ public class WireMockAssertionsTests : IDisposable
 
         _server.Should()
             .HaveReceivedACall()
-            .WitHeaderKey("Authorization");
+            .WitHeaderKey("Authorization").Which.Should().StartWith("A");
     }
 
     [Fact]
@@ -172,9 +179,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .WithHeader("Authorization", "value");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Contain("\"Authorization\"");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("*\"Authorization\"*");
     }
 
     [Fact]
@@ -188,38 +195,27 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .WithHeader("Accept", "missing-value");
 
-        var sentHeaders = _server.LogEntries.SelectMany(x => x.RequestMessage.Headers)
-            .ToDictionary(x => x.Key, x => x.Value)["Accept"]
-            .Select(x => $"\"{x}\"")
-            .ToList();
-
-        var sentHeaderString = "{" + string.Join(", ", sentHeaders) + "}";
-
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                $"Expected header \"Accept\" from requests sent with value(s) {sentHeaderString} to contain \"missing-value\".{NewLine}");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called with Header \"Accept\" and Values {\"missing-value\"}, but didn't find it among the calls with Header(s) {{[\"Accept\"] = {\"application/xml, application/json\"}, [\"Host\"] = {\"localhost:*\"}}}.");
     }
 
     [Fact]
     public async Task HaveReceivedACall_WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderWithMultipleValuesWereMade()
     {
-        _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
-        _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-        await _httpClient.GetAsync("").ConfigureAwait(false);
+        using var httpClient = new HttpClient { BaseAddress = new Uri(_server.Url!) };
+        httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
+        httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        await httpClient.GetAsync("").ConfigureAwait(false);
 
         Action act = () => _server.Should()
             .HaveReceivedACall()
             .WithHeader("Accept", new[] { "missing-value1", "missing-value2" });
 
-        const string missingValue1Message =
-            "Expected header \"Accept\" from requests sent with value(s) {\"application/xml\", \"application/json\"} to contain \"missing-value1\".";
-        const string missingValue2Message =
-            "Expected header \"Accept\" from requests sent with value(s) {\"application/xml\", \"application/json\"} to contain \"missing-value2\".";
-
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be($"{string.Join(NewLine, missingValue1Message, missingValue2Message)}{NewLine}");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called with Header \"Accept\" and Values {\"missing-value1\", \"missing-value2\"}, but didn't find it among the calls with Header(s) {{[\"Accept\"] = {\"application/xml, application/json\"}, [\"Host\"] = {\"localhost:*\"}}}.");
     }
 
     [Fact]
@@ -277,10 +273,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .AtUrl("anyurl");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                "Expected _server to have been called at address matching the url \"anyurl\", but no calls were made.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called at address matching the url \"anyurl\", but no calls were made.");
     }
 
     [Fact]
@@ -292,10 +287,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .AtUrl("anyurl");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                $"Expected _server to have been called at address matching the url \"anyurl\", but didn't find it among the calls to {{\"http://localhost:{_portUsed}/\"}}.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage($"Expected _server to have been called at address matching the url \"anyurl\", but didn't find it among the calls to {{\"http://localhost:{_portUsed}/\"}}.");
     }
 
     [Fact]
@@ -309,7 +303,7 @@ public class WireMockAssertionsTests : IDisposable
 
         _server.Should()
             .HaveReceivedACall()
-            .WithProxyUrl($"http://localhost:9999");
+            .WithProxyUrl("http://localhost:9999");
     }
 
     [Fact]
@@ -323,10 +317,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .WithProxyUrl("anyurl");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                "Expected _server to have been called with proxy url \"anyurl\", but no calls were made.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called with proxy url \"anyurl\", but no calls were made.");
     }
 
     [Fact]
@@ -342,10 +335,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .WithProxyUrl("anyurl");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                $"Expected _server to have been called with proxy url \"anyurl\", but didn't find it among the calls with {{\"http://localhost:9999\"}}.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called with proxy url \"anyurl\", but didn't find it among the calls with {\"http://localhost:9999\"}.");
     }
 
     [Fact]
@@ -366,10 +358,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .FromClientIP("different-ip");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                "Expected _server to have been called from client IP \"different-ip\", but no calls were made.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called from client IP \"different-ip\", but no calls were made.");
     }
 
     [Fact]
@@ -382,10 +373,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .FromClientIP("different-ip");
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                $"Expected _server to have been called from client IP \"different-ip\", but didn't find it among the calls from IP(s) {{\"{clientIP}\"}}.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage($"Expected _server to have been called from client IP \"different-ip\", but didn't find it among the calls from IP(s) {{\"{clientIP}\"}}.");
     }
 
     [Fact]
@@ -419,10 +409,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .UsingPatch();
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                "Expected _server to have been called using method \"PATCH\", but no calls were made.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called using method \"PATCH\", but no calls were made.");
     }
 
     [Fact]
@@ -434,10 +423,9 @@ public class WireMockAssertionsTests : IDisposable
             .HaveReceivedACall()
             .UsingOptions();
 
-        act.Should().Throw<Exception>()
-            .And.Message.Should()
-            .Be(
-                "Expected _server to have been called using method \"OPTIONS\", but didn't find it among the methods {\"POST\"}.");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called using method \"OPTIONS\", but didn't find it among the methods {\"POST\"}.");
     }
 
 #if !NET452
@@ -838,6 +826,56 @@ public class WireMockAssertionsTests : IDisposable
         server.Stop();
     }
 
+    [Fact]
+    public async Task HaveReceivedACall_WithHeader_Should_ThrowWhenHttpMethodDoesNotMatch()
+    {
+        // Arrange
+        using var server = WireMockServer.Start();
+
+        // Act : HTTP GET
+        using var httpClient = new HttpClient();
+        await httpClient.GetAsync(server.Url!);
+
+        // Act : HTTP POST
+        var request = new HttpRequestMessage(HttpMethod.Post, server.Url!);
+        request.Headers.Add("TestHeader", new[] { "Value", "Value2" });
+
+        await httpClient.SendAsync(request);
+
+        // Assert
+        server.Should().HaveReceivedACall().UsingPost().And.WithHeader("TestHeader", new[] { "Value", "Value2" });
+
+        Action act = () => server.Should().HaveReceivedACall().UsingGet().And.WithHeader("TestHeader", "Value");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected server to have been called with Header \"TestHeader\" and Values {\"Value\"}, but didn't find it among the calls with Header(s) {{[\"Host\"] = {\"localhost:*\"}}}.");
+    }
+
+    [Fact]
+    public async Task HaveReceivedACall_WithHeaderKey_Should_ThrowWhenHttpMethodDoesNotMatch()
+    {
+        // Arrange
+        using var server = WireMockServer.Start();
+
+        // Act : HTTP GET
+        using var httpClient = new HttpClient();
+        await httpClient.GetAsync(server.Url!);
+
+        // Act : HTTP POST
+        var request = new HttpRequestMessage(HttpMethod.Post, server.Url!);
+        request.Headers.Add("TestHeader", new[] { "Value", "Value2" });
+
+        await httpClient.SendAsync(request);
+
+        // Assert
+        server.Should().HaveReceivedACall().UsingPost().And.WitHeaderKey("TestHeader");
+
+        Action act = () => server.Should().HaveReceivedACall().UsingGet().And.WitHeaderKey("TestHeader");
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected server to have been called with Header \"TestHeader\", but didn't find it among the calls with Header(s) {{[\"Host\"] = {\"localhost:*\"}}}.");
+    }
+
     public void Dispose()
     {
         _server?.Stop();