Use WithHeader implementation for WithRequestHeader and WithContentHeader

Author: dnperfors

CHANGELOG.md

@@ -20,6 +20,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Changed
 - The TestableHttpMessageHandler now makes a clone of the original request, so that the original request can be disposed.  
   This change also makes it possible to assert the content on .NET Framework.
+- The methods `WithRequestHeader` and `WithContentHeader` now work the same as `WithHeader`, this might lead to slight changes in the behavior since now the headers from both the request and the content of that request are checked.
 - Moved `WithHttpMethod`, `WithRequestUri`, `WithHttpVersion`, `WithHeader` and `WithContent` from `HttpRequestMessagesCheckExtensions` to `HttpRequestMessageAsserter` and specify them on the `IHttpRequestMessagesCheck` interface.
 
 ## [0.11] - 2024-06-15

src/TestableHttpClient/HttpRequestMessagesCheckExtensions.cs

@@ -10,7 +10,12 @@ public static class HttpRequestMessagesCheckExtensions
     /// <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) => WithRequestHeader(check, headerName, (int?)null);
+    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName)
+    {
+        Guard.ThrowIfNull(check);
+
+        return check.WithHeader(headerName);
+    }
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name. Values are ignored.
@@ -21,15 +26,11 @@ public static class HttpRequestMessagesCheckExtensions
     /// <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) => WithRequestHeader(check, headerName, (int?)expectedNumberOfRequests);
-
-    [Obsolete("Use WithHeader instead.")]
-    private static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, int? expectedNumberOfRequests)
+    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, int expectedNumberOfRequests)
     {
         Guard.ThrowIfNull(check);
-        Guard.ThrowIfNullOrEmpty(headerName);
 
-        return check.WithFilter(x => x.HasRequestHeader(headerName), expectedNumberOfRequests, $"request header '{headerName}'");
+        return check.WithHeader(headerName, expectedNumberOfRequests);
     }
 
     /// <summary>
@@ -41,7 +42,12 @@ private static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMess
     /// <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) => WithRequestHeader(check, headerName, headerValue, null);
+    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue)
+    {
+        Guard.ThrowIfNull(check);
+
+        return check.WithHeader(headerName, headerValue);
+    }
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name and value.
@@ -53,16 +59,11 @@ private static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMess
     /// <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) => WithRequestHeader(check, headerName, headerValue, (int?)expectedNumberOfRequests);
-
-    [Obsolete("Use WithHeader instead.")]
-    private static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue, int? expectedNumberOfRequests)
+    public static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue, int expectedNumberOfRequests)
     {
         Guard.ThrowIfNull(check);
-        Guard.ThrowIfNullOrEmpty(headerName);
-        Guard.ThrowIfNullOrEmpty(headerValue);
 
-        return check.WithFilter(x => x.HasRequestHeader(headerName, headerValue), expectedNumberOfRequests, $"request header '{headerName}' and value '{headerValue}'");
+        return check.WithHeader(headerName, headerValue, expectedNumberOfRequests);
     }
 
     /// <summary>
@@ -73,7 +74,12 @@ private static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMess
     /// <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) => WithContentHeader(check, headerName, (int?)null);
+    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName)
+    {
+        Guard.ThrowIfNull(check);
+
+        return check.WithHeader(headerName);
+    }
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name. Values are ignored.
@@ -84,15 +90,11 @@ private static IHttpRequestMessagesCheck WithRequestHeader(this IHttpRequestMess
     /// <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) => WithContentHeader(check, headerName, (int?)expectedNumberOfRequests);
-
-    [Obsolete("Use WithHeader instead.")]
-    private static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, int? expectedNumberOfRequests)
+    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, int expectedNumberOfRequests)
     {
         Guard.ThrowIfNull(check);
-        Guard.ThrowIfNullOrEmpty(headerName);
 
-        return check.WithFilter(x => x.HasContentHeader(headerName), expectedNumberOfRequests, $"content header '{headerName}'");
+        return check.WithHeader(headerName, expectedNumberOfRequests);
     }
 
     /// <summary>
@@ -104,7 +106,12 @@ private static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMess
     /// <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) => WithContentHeader(check, headerName, headerValue, null);
+    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue)
+    {
+        Guard.ThrowIfNull(check);
+
+        return check.WithHeader(headerName, headerValue);
+    }
 
     /// <summary>
     /// Asserts whether requests were made with a specific header name and value.
@@ -116,16 +123,11 @@ private static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMess
     /// <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, string headerValue, int expectedNumberOfRequests) => WithContentHeader(check, headerName, headerValue, (int?)expectedNumberOfRequests);
-
-    [Obsolete("Use WithHeader instead.")]
-    private static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue, int? expectedNumberOfRequests)
+    public static IHttpRequestMessagesCheck WithContentHeader(this IHttpRequestMessagesCheck check, string headerName, string headerValue, int expectedNumberOfRequests)
     {
         Guard.ThrowIfNull(check);
-        Guard.ThrowIfNullOrEmpty(headerName);
-        Guard.ThrowIfNullOrEmpty(headerValue);
 
-        return check.WithFilter(x => x.HasContentHeader(headerName, headerValue), expectedNumberOfRequests, $"content header '{headerName}' and value '{headerValue}'");
+        return check.WithHeader(headerName, headerValue, expectedNumberOfRequests);
     }
 
     /// <summary>