Removed WithFilter, WithRequestHeader and WithContentHeader methods.

Author: dnperfors

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to TestableHttpClient will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and 
 this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.13] - unplanned
+### Removed
+- The methods `WithRequestHeader` and `WithContentHeader` have been removed, please use `WithHeader` instead.
+- The `WithFilter` method is removed.
+
 ## [0.12] - 2026-06-06
 ### Deprecated
 - The methods `WithRequestHeader` and `WithContentHeader` are deprecated, please use `WithHeader` instead.
@@ -307,6 +312,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Automatically build project when pushing changes to github and when creating a pull request
 - Automatically deploy to NuGet when creating a tag in github
 
+[0.12]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.12...v0.13
 [0.12]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.11...v0.12
 [0.11]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.10...v0.11
 [0.10]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.9...v0.10

src/TestableHttpClient/HttpRequestMessageAsserter.cs

@@ -5,8 +5,6 @@
 /// </summary>
 internal sealed class HttpRequestMessageAsserter : IHttpRequestMessagesCheck
 {
-    private readonly List<string> _expectedConditions = new();
-
     private readonly RequestBuilder expectedRequestBuilder;
 
     /// <summary>
@@ -58,7 +56,7 @@ internal HttpRequestMessageAsserter Assert(int? expectedCount = null)
 
         if (!pass)
         {
-            var message = MessageBuilder.BuildMessage(expectedCount, actualCount, expectedRequest, _expectedConditions);
+            var message = MessageBuilder.BuildMessage(expectedCount, actualCount, expectedRequest);
             throw new HttpRequestMessageAssertionException(message);
         }
 
@@ -72,7 +70,7 @@ internal HttpRequestMessageAsserter Assert(int? expectedCount = null)
     /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
     [AssertionMethod]
-    [Obsolete("WithFilter will be removed, since it should no longer be necesary to use.")]
+    [Obsolete("WithFilter will be removed, since it should no longer be necesary to use.", true)]
     public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, string condition) => WithFilter(requestFilter, null, condition);
 
     /// <summary>
@@ -83,21 +81,13 @@ internal HttpRequestMessageAsserter Assert(int? expectedCount = null)
     /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
     [AssertionMethod]
-    [Obsolete("WithFilter will be removed, since it should no longer be necesary to use.")]
+    [Obsolete("WithFilter will be removed, since it should no longer be necesary to use.", true)]
     public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int expectedNumberOfRequests, string condition) => WithFilter(requestFilter, (int?)expectedNumberOfRequests, condition);
 
     [AssertionMethod]
-    [Obsolete("WithFilter will be removed, since it should no longer be necesary to use.")]
+    [Obsolete("WithFilter will be removed, since it should no longer be necesary to use.", true)]
     public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int? expectedNumberOfRequests, string condition)
     {
-        if (!string.IsNullOrEmpty(condition))
-        {
-            _expectedConditions.Add(condition);
-        }
-
-        Requests = Requests.Where(requestFilter);
-        Assert(expectedNumberOfRequests);
-
         return this;
     }
 

src/TestableHttpClient/HttpRequestMessagesCheckExtensions.cs

@@ -9,13 +9,8 @@ public static class HttpRequestMessagesCheckExtensions
     /// <param name="check">The implementation that hold all the request messages.</param>
     /// <param name="headerName">The name of the header that is expected.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("Use WithHeader instead.")]
-    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName)
-    {
-        Guard.ThrowIfNull(check);
-
-        return check.WithHeader(headerName);
-    }
+    [Obsolete("Use WithHeader instead.", true)]
+    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName) => check;
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name. Values are ignored.
@@ -25,13 +20,8 @@ public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessa
     /// <param name="headerName">The name of the header that is expected.</param>
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("Use WithHeader instead.")]
-    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, int expectedNumberOfRequests)
-    {
-        Guard.ThrowIfNull(check);
-
-        return check.WithHeader(headerName, expectedNumberOfRequests);
-    }
+    [Obsolete("Use WithHeader instead.", true)]
+    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, int expectedNumberOfRequests) => check;
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name and value.
@@ -41,13 +31,8 @@ public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessa
     /// <param name="headerName">The name of the header that is expected.</param>
     /// <param name="headerValue">The value of the expected header, supports wildcards.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("Use WithHeader instead.")]
-    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue)
-    {
-        Guard.ThrowIfNull(check);
-
-        return check.WithHeader(headerName, headerValue);
-    }
+    [Obsolete("Use WithHeader instead.", true)]
+    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue) => check;
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name and value.
@@ -58,13 +43,8 @@ public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessa
     /// <param name="headerValue">The value of the expected header, supports wildcards.</param>
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("Use WithHeader instead.")]
-    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue, int expectedNumberOfRequests)
-    {
-        Guard.ThrowIfNull(check);
-
-        return check.WithHeader(headerName, headerValue, expectedNumberOfRequests);
-    }
+    [Obsolete("Use WithHeader instead.", true)]
+    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue, int expectedNumberOfRequests) => check;
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name. Values are ignored.
@@ -73,13 +53,8 @@ public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessa
     /// <param name="check">The implementation that hold all the request messages.</param>
     /// <param name="headerName">The name of the header that is expected.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("Use WithHeader instead.")]
-    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName)
-    {
-        Guard.ThrowIfNull(check);
-
-        return check.WithHeader(headerName);
-    }
+    [Obsolete("Use WithHeader instead.", true)]
+    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName) => check;
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name. Values are ignored.
@@ -89,13 +64,8 @@ public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessa
     /// <param name="headerName">The name of the header that is expected.</param>
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("Use WithHeader instead.")]
-    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, int expectedNumberOfRequests)
-    {
-        Guard.ThrowIfNull(check);
-
-        return check.WithHeader(headerName, expectedNumberOfRequests);
-    }
+    [Obsolete("Use WithHeader instead.", true)]
+    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, int expectedNumberOfRequests) => check;
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name and value.
@@ -105,13 +75,8 @@ public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessa
     /// <param name="headerName">The name of the header that is expected.</param>
     /// <param name="headerValue">The value of the expected header, supports wildcards.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("Use WithHeader instead.")]
-    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue)
-    {
-        Guard.ThrowIfNull(check);
-
-        return check.WithHeader(headerName, headerValue);
-    }
+    [Obsolete("Use WithHeader instead.", true)]
+    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue) => check;
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name and value.
@@ -122,7 +87,7 @@ public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessa
     /// <param name="headerValue">The value of the expected header, supports wildcards.</param>
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("Use WithHeader instead.")]
+    [Obsolete("Use WithHeader instead.", true)]
     public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue, int expectedNumberOfRequests)
     {
         Guard.ThrowIfNull(check);

src/TestableHttpClient/IHttpRequestMessagesCheck.cs

@@ -16,7 +16,7 @@ public interface IHttpRequestMessagesCheck
     /// <param name="requestFilter">The filter to filter requests with before asserting.</param>
     /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("WithFilter will be made removed, since it should no longer be necesary to use.")]
+    [Obsolete("WithFilter will be made removed, since it should no longer be necesary to use.", true)]
     public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, string condition);
 
     /// <summary>
@@ -26,7 +26,7 @@ public interface IHttpRequestMessagesCheck
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("WithFilter will be made removed, since it should no longer be necesary to use.")]
+    [Obsolete("WithFilter will be made removed, since it should no longer be necesary to use.", true)]
     public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int expectedNumberOfRequests, string condition);
 
     /// <summary>
@@ -36,7 +36,7 @@ public interface IHttpRequestMessagesCheck
     /// <param name="expectedNumberOfRequests">The expected number of requests, when null is passed "at least one" is presumed.</param>
     /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    [Obsolete("WithFilter will be made removed, since it should no longer be necesary to use.")]
+    [Obsolete("WithFilter will be made removed, since it should no longer be necesary to use.", true)]
     public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int? expectedNumberOfRequests, string condition);
 
     /// <summary>

src/TestableHttpClient/Utils/MessageBuilder.cs

@@ -5,7 +5,7 @@ namespace TestableHttpClient.Utils;
 
 internal static class MessageBuilder
 {
-    internal static string BuildMessage(int? expectedCount, int actualCount, Request expectedRequest, IEnumerable<string> conditions)
+    internal static string BuildMessage(int? expectedCount, int actualCount, Request expectedRequest)
     {
         var pass = expectedCount switch
         {
@@ -60,12 +60,6 @@ internal static string BuildMessage(int? expectedCount, int actualCount, Request
             content = contentBuilder.ToString();
         }
 
-        var expectedConditions = string.Empty;
-        if (conditions is not null && conditions.Any())
-        {
-            expectedConditions = $" with {string.Join(", ", conditions)}";
-        }
-
         var actualMessage = actualCount switch
         {
             0 => "no requests were made",
@@ -75,8 +69,8 @@ internal static string BuildMessage(int? expectedCount, int actualCount, Request
 
         return pass switch
         {
-            true => $"Expected {expectedMessage} to be made{requestUri}{headers}{content}{expectedConditions}, and {actualMessage}.",
-            false => $"Expected {expectedMessage} to be made{requestUri}{headers}{content}{expectedConditions}, but {actualMessage}."
+            true => $"Expected {expectedMessage} to be made{requestUri}{headers}{content}, and {actualMessage}.",
+            false => $"Expected {expectedMessage} to be made{requestUri}{headers}{content}, but {actualMessage}."
         };
     }