Move logic for assert WithHeader to custom Request class.

Author: dnperfors

src/TestableHttpClient/HttpRequestMessageAsserter.cs

@@ -29,9 +29,28 @@ public HttpRequestMessageAsserter(IEnumerable<HttpRequestMessage> httpRequestMes
     /// </summary>
     public TestableHttpMessageHandlerOptions Options { get; }
 
+    private HttpRequestMessageAsserter Assert(int? expectedCount = null, string condition = "")
+    {
+        if (!string.IsNullOrEmpty(condition))
+        {
+            _expectedConditions.Add(condition);
+        }
+        Assert(expectedCount);
+        return this;
+    }
+
     private void Assert(int? expectedCount = null)
     {
-        var actualCount = Requests.Count();
+        int actualCount;
+        try
+        {
+            actualCount = Requests.Count(expectedRequest.Equals);
+        }
+        catch (ObjectDisposedException)
+        {
+            throw new HttpRequestMessageAssertionException("Can't validate requests, because one or more requests have content that is already disposed.");
+        }
+
         var pass = expectedCount switch
         {
             null => actualCount > 0,
@@ -72,15 +91,9 @@ public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> reque
             _expectedConditions.Add(condition);
         }
 
-        try
-        {
-            Requests = Requests.Where(requestFilter);
-            Assert(expectedNumberOfRequests);
-        }
-        catch (ObjectDisposedException)
-        {
-            throw new HttpRequestMessageAssertionException("Can't validate requests, because one or more requests have content that is already disposed.");
-        }
+        Requests = Requests.Where(requestFilter);
+        Assert(expectedNumberOfRequests);
+
         return this;
     }
 
@@ -112,7 +125,7 @@ private IHttpRequestMessagesCheck WithRequestUri(string pattern, int? expectedNu
         UriPattern uriPattern = UriPatternParser.Parse(pattern);
         expectedRequest = expectedRequest with { RequestUri = uriPattern };
 
-        return WithFilter(x => expectedRequest.Equals(x), expectedNumberOfRequests, condition);
+        return Assert(expectedNumberOfRequests, condition);
     }
 
     /// <summary>
@@ -134,7 +147,7 @@ private IHttpRequestMessagesCheck WithHttpMethod(HttpMethod httpMethod, int? exp
     {
         Guard.ThrowIfNull(httpMethod);
         expectedRequest = expectedRequest with { HttpMethod = httpMethod };
-        return WithFilter(x => expectedRequest.Equals(x), expectedNumberOfRequests, $"HTTP Method '{httpMethod}'");
+        return Assert(expectedNumberOfRequests, $"HTTP Method '{httpMethod}'");
     }
 
     /// <summary>
@@ -159,7 +172,7 @@ private IHttpRequestMessagesCheck WithHttpVersion(Version httpVersion, int? expe
 
         expectedRequest = expectedRequest with { HttpVersion = httpVersion };
 
-        return WithFilter(x => expectedRequest.Equals(x), expectedNumberOfRequests, $"HTTP Version '{httpVersion}'");
+        return Assert(expectedNumberOfRequests, $"HTTP Version '{httpVersion}'");
     }
 
     /// <summary>
@@ -181,7 +194,8 @@ private IHttpRequestMessagesCheck WithHeader(string headerName, int? expectedNum
     {
         Guard.ThrowIfNullOrEmpty(headerName);
 
-        return WithFilter(x => x.HasHeader(headerName), expectedNumberOfRequests, $"header '{headerName}'");
+        expectedRequest = expectedRequest.AddHeader(headerName);
+        return Assert(expectedNumberOfRequests, $"header '{headerName}'");
     }
 
     /// <summary>
@@ -206,7 +220,9 @@ private IHttpRequestMessagesCheck WithHeader(string headerName, string headerVal
         Guard.ThrowIfNullOrEmpty(headerName);
         Guard.ThrowIfNullOrEmpty(headerValue);
 
-        return WithFilter(x => x.HasHeader(headerName, headerValue), expectedNumberOfRequests, $"header '{headerName}' and value '{headerValue}'");
+        expectedRequest = expectedRequest.AddHeader(headerName, headerValue);
+
+        return Assert(expectedNumberOfRequests, $"header '{headerName}' and value '{headerValue}'");
     }
 
     /// <summary>
@@ -229,6 +245,6 @@ private IHttpRequestMessagesCheck WithContent(string pattern, int? expectedNumbe
         Guard.ThrowIfNull(pattern);
 
         expectedRequest = expectedRequest with { Content = pattern };
-        return WithFilter(x => expectedRequest.Equals(x), expectedNumberOfRequests, $"content '{pattern}'");
+        return Assert(expectedNumberOfRequests, $"content '{pattern}'");
     }
 }

src/TestableHttpClient/HttpRequestMessageExtensions.cs

@@ -13,8 +13,39 @@ public Request(UriPatternMatchingOptions uriPatternMatchingOptions)
     public UriPattern? RequestUri { get; init; }
     public Version? HttpVersion { get; init; }
 
+    public List<string>? HeaderNames { get; init; }
+    public Dictionary<string, string>? HeaderValues { get; init; }
+
     public string? Content { get; init; }
 
+    public Request AddHeader(string headerName)
+    {
+        if (HeaderNames is null)
+        {
+            List<string> headerNames = [headerName];
+            return this with { HeaderNames = headerNames };
+        }
+        else
+        {
+            HeaderNames.Add(headerName);
+            return this;
+        }
+    }
+
+    public Request AddHeader(string headerName, string headerValue)
+    {
+        if (HeaderValues is null)
+        {
+            Dictionary<string, string> headerValues = new() { [headerName] = headerValue };
+            return this with { HeaderValues = headerValues };
+        }
+        else
+        {
+            HeaderValues[headerName] = headerValue;
+            return this;
+        }
+    }
+
     public bool Equals(HttpRequestMessage? other)
     {
         if (other is null)
@@ -37,9 +68,31 @@ public bool Equals(HttpRequestMessage? other)
             return false;
         }
 
+        if (HeaderNames is not null)
+        {
+            foreach (var headerName in HeaderNames)
+            {
+                if (!other.Headers.HasHeader(headerName) && (other.Content is null || !other.Content.Headers.HasHeader(headerName)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        if (HeaderValues is not null)
+        {
+            foreach (var keyValuePair in HeaderValues)
+            {
+                if (!other.Headers.HasHeader(keyValuePair.Key, keyValuePair.Value) && (other.Content is null || !other.Content.Headers.HasHeader(keyValuePair.Key, keyValuePair.Value)))
+                {
+                    return false;
+                }
+            }
+        }
+
         if (Content is not null)
         {
-            if(other.Content is null)
+            if (other.Content is null)
             {
                 return false;
             }