Reduce differences between .netstandard and .net by adding more pollyfills.

Reduce netframework specific tests, since they are no longer needed because of the cloning.

Author: dnperfors

CHANGELOG.md

@@ -12,7 +12,8 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Support for .NET 9.0
 - Support for .NET 10.0
 ### Changed
-- The TestableHttpMessageHandler now makes a clone of the original request, so that the original request can be disposed.
+- 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.
 
 ## [0.11] - 2024-06-15
 ### Removed

src/TestableHttpClient/HttpRequestMessagesCheckExtensions.cs

@@ -258,7 +258,6 @@ private static IHttpRequestMessagesCheck WithHeader(this IHttpRequestMessagesChe
     /// <param name="check">The implementation that hold all the request messages.</param>
     /// <param name="pattern">The expected content, supports wildcards.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    /// <remarks>Note that on .NET Framework, the HttpClient might dispose the content after sending the request.</remarks>
     public static IHttpRequestMessagesCheck WithContent(this IHttpRequestMessagesCheck check, string pattern) => WithContent(check, pattern, null);
 
     /// <summary>
@@ -268,7 +267,6 @@ private static IHttpRequestMessagesCheck WithHeader(this IHttpRequestMessagesChe
     /// <param name="pattern">The expected content, supports wildcards.</param>
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    /// <remarks>Note that on .NET Framework, the HttpClient might dispose the content after sending the request.</remarks>
     public static IHttpRequestMessagesCheck WithContent(this IHttpRequestMessagesCheck check, string pattern, int expectedNumberOfRequests) => WithContent(check, pattern, (int?)expectedNumberOfRequests);
 
     private static IHttpRequestMessagesCheck WithContent(this IHttpRequestMessagesCheck check, string pattern, int? expectedNumberOfRequests)
@@ -285,7 +283,6 @@ private static IHttpRequestMessagesCheck WithContent(this IHttpRequestMessagesCh
     /// <param name="check">The implementation that hold all the request messages.</param>
     /// <param name="jsonObject">The object representation of the expected request content.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    /// <remarks>Note that on .NET Framework, the HttpClient might dispose the content after sending the request.</remarks>
     public static IHttpRequestMessagesCheck WithJsonContent(this IHttpRequestMessagesCheck check, object? jsonObject) => WithJsonContent(check, jsonObject, null, null);
 
     /// <summary>
@@ -295,7 +292,6 @@ private static IHttpRequestMessagesCheck WithContent(this IHttpRequestMessagesCh
     /// <param name="jsonObject">The object representation of the expected request content.</param>
     /// <param name="jsonSerializerOptions">The serializer options that should be used for serializing te content.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    /// <remarks>Note that on .NET Framework, the HttpClient might dispose the content after sending the request.</remarks>
     public static IHttpRequestMessagesCheck WithJsonContent(this IHttpRequestMessagesCheck check, object? jsonObject, JsonSerializerOptions jsonSerializerOptions) => WithJsonContent(check, jsonObject, jsonSerializerOptions, null);
 
     /// <summary>
@@ -305,7 +301,6 @@ private static IHttpRequestMessagesCheck WithContent(this IHttpRequestMessagesCh
     /// <param name="jsonObject">The object representation of the expected request content.</param>
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    /// <remarks>Note that on .NET Framework, the HttpClient might dispose the content after sending the request.</remarks>
     public static IHttpRequestMessagesCheck WithJsonContent(this IHttpRequestMessagesCheck check, object? jsonObject, int expectedNumberOfRequests) => WithJsonContent(check, jsonObject, null, (int?)expectedNumberOfRequests);
 
     /// <summary>
@@ -316,7 +311,6 @@ private static IHttpRequestMessagesCheck WithContent(this IHttpRequestMessagesCh
     /// <param name="jsonSerializerOptions">The serializer options that should be used for serializing the content.</param>
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    /// <remarks>Note that on .NET Framework, the HttpClient might dispose the content after sending the request.</remarks>
     public static IHttpRequestMessagesCheck WithJsonContent(this IHttpRequestMessagesCheck check, object? jsonObject, JsonSerializerOptions jsonSerializerOptions, int expectedNumberOfRequests) => WithJsonContent(check, jsonObject, jsonSerializerOptions, (int?)expectedNumberOfRequests);
 
     private static IHttpRequestMessagesCheck WithJsonContent(this IHttpRequestMessagesCheck check, object? jsonObject, JsonSerializerOptions? jsonSerializerOptions, int? expectedNumberOfRequests)
@@ -334,7 +328,6 @@ private static IHttpRequestMessagesCheck WithJsonContent(this IHttpRequestMessag
     /// <param name="check">The implementation that hold all the request messages.</param>
     /// <param name="nameValueCollection">The collection of key/value pairs that should be url encoded.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    /// <remarks>Note that on .NET Framework, the HttpClient might dispose the content after sending the request.</remarks>
     public static IHttpRequestMessagesCheck WithFormUrlEncodedContent(this IHttpRequestMessagesCheck check, IEnumerable<KeyValuePair<string?, string?>> nameValueCollection) => WithFormUrlEncodedContent(check, nameValueCollection, null);
 
     /// <summary>
@@ -344,7 +337,6 @@ private static IHttpRequestMessagesCheck WithJsonContent(this IHttpRequestMessag
     /// <param name="nameValueCollection">The collection of key/value pairs that should be url encoded.</param>
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    /// <remarks>Note that on .NET Framework, the HttpClient might dispose the content after sending the request.</remarks>
     public static IHttpRequestMessagesCheck WithFormUrlEncodedContent(this IHttpRequestMessagesCheck check, IEnumerable<KeyValuePair<string?, string?>> nameValueCollection, int expectedNumberOfRequests) => WithFormUrlEncodedContent(check, nameValueCollection, (int?)expectedNumberOfRequests);
 
     private static IHttpRequestMessagesCheck WithFormUrlEncodedContent(this IHttpRequestMessagesCheck check, IEnumerable<KeyValuePair<string?, string?>> nameValueCollection, int? expectedNumberOfRequests)

src/TestableHttpClient/TestableHttpMessageHandler.cs

@@ -26,9 +26,7 @@ protected override void Dispose(bool disposing)
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "It gets disposed in the dispose method")]
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
-#if NET8_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(request);
-#endif
+        Guard.ThrowIfNull(request);
 
         httpRequestMessages.Enqueue(await HttpRequestMessageCloner.ClonaAsync(request, cancellationToken).ConfigureAwait(false));
 
@@ -38,9 +36,8 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
         responseMessage.RequestMessage ??= request;
 
-#if !NET6_0_OR_GREATER
+        // In .NET Standard, a response message can be null, but we need it to be at least empty like in newe version.
         responseMessage.Content ??= new StringContent("");
-#endif
 
         return responseMessage;
     }

src/TestableHttpClient/Utils/Guard.cs

@@ -29,7 +29,7 @@ internal static void ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgum
             throw new ArgumentException("String should not be empty", paramName);
         }
 #else
-        ArgumentNullException.ThrowIfNullOrEmpty(argument, paramName);
+        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
 #endif
     }
 }

src/TestableHttpClient/Utils/HttpRequestMessageCloner.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace TestableHttpClient.Utils;
+namespace TestableHttpClient.Utils;
 
 internal static class HttpRequestMessageCloner
 {
@@ -18,12 +16,13 @@ internal static async Task<HttpRequestMessage> ClonaAsync(HttpRequestMessage req
             clone.Headers.TryAddWithoutValidation(item.Key, item.Value);
         }
 
-        // Copy content (buffered)
         if (request.Content is not null)
         {
-            var bytes = await request.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
+            var bytes = await request.Content
+                .ReadAsByteArrayAsync(cancellationToken)
+                .ConfigureAwait(false);
             var contentClone = new ByteArrayContent(bytes);
-
+            contentClone.Headers.Clear();
             // copy content headers
             foreach (var header in request.Content.Headers)
             {

src/TestableHttpClient/Utils/NetStandardPollyFill.cs

@@ -0,0 +1,19 @@
+#if NETSTANDARD
+
+namespace TestableHttpClient.Utils;
+
+
+internal static class NetStandardPollyFill
+{
+    public static Task<byte[]> ReadAsByteArrayAsync(this HttpContent content, CancellationToken cancellationToken = default)
+    {
+        return content.ReadAsByteArrayAsync();
+    }
+
+    public static string Replace(this string input, string oldValue, string newValue, StringComparison comparisonType)
+    {
+        return input.Replace(oldValue, newValue);
+    }
+}
+
+#endif

src/TestableHttpClient/Utils/StringMatcher.cs

@@ -7,11 +7,8 @@ internal static class StringMatcher
     internal static bool Matches(string value, string pattern, bool ignoreCase = false)
     {
         var escapedPattern = Regex.Escape(pattern);
-#if NETSTANDARD2_0
-        var regex = escapedPattern.Replace("\\*", "(.*)");
-#else
+
         var regex = escapedPattern.Replace("\\*", "(.*)", StringComparison.InvariantCultureIgnoreCase);
-#endif
         RegexOptions options = ignoreCase ? RegexOptions.IgnoreCase : RegexOptions.None;
         return Regex.IsMatch(value, $"^{regex}$", options);
     }

test/TestableHttpClient.IntegrationTests/AssertingRequests.cs

@@ -162,17 +162,12 @@ public async Task AssertingContent()
         using StringContent content = new("my special content");
         _ = await client.PostAsync("https://httpbin.org/post", content, TestContext.Current.CancellationToken);
 
-#if NETFRAMEWORK
-        // On .NET Framework the HttpClient disposes the content automatically. So we can't perform the same test.
-        testHandler.ShouldHaveMadeRequests();
-#else
         testHandler.ShouldHaveMadeRequests().WithContent("my special content");
         testHandler.ShouldHaveMadeRequests().WithContent("my*content");
         testHandler.ShouldHaveMadeRequests().WithContent("*");
 
         Assert.Throws<HttpRequestMessageAssertionException>(() => testHandler.ShouldHaveMadeRequests().WithContent(""));
         Assert.Throws<HttpRequestMessageAssertionException>(() => testHandler.ShouldHaveMadeRequests().WithContent("my"));
-#endif
     }
 
     [Fact]
@@ -186,17 +181,12 @@ public async Task AssertingContent_WhenOriginalContentIsDisposed()
             _ = await client.PostAsync("https://httpbin.org/post", content, TestContext.Current.CancellationToken);
         }
 
-#if NETFRAMEWORK
-        // On .NET Framework the HttpClient disposes the content automatically. So we can't perform the same test.
-        testHandler.ShouldHaveMadeRequests();
-#else
         testHandler.ShouldHaveMadeRequests().WithContent("my special content");
         testHandler.ShouldHaveMadeRequests().WithContent("my*content");
         testHandler.ShouldHaveMadeRequests().WithContent("*");
 
         Assert.Throws<HttpRequestMessageAssertionException>(() => testHandler.ShouldHaveMadeRequests().WithContent(""));
         Assert.Throws<HttpRequestMessageAssertionException>(() => testHandler.ShouldHaveMadeRequests().WithContent("my"));
-#endif
     }
 
     [Fact]
@@ -208,12 +198,7 @@ public async Task AssertJsonContent()
         using StringContent content = new("{}", Encoding.UTF8, "application/json");
         _ = await client.PostAsync("https://httpbin.org/post", content, TestContext.Current.CancellationToken);
 
-#if NETFRAMEWORK
-        // On .NET Framework the HttpClient disposes the content automatically. So we can't perform the same test.
-        testHandler.ShouldHaveMadeRequests();
-#else
         testHandler.ShouldHaveMadeRequests().WithJsonContent(new { });
-#endif
     }
 
     [Fact]

test/TestableHttpClient.IntegrationTests/CustomizeJsonSerialization.cs

@@ -14,11 +14,7 @@ public async Task ByDefault_CamelCasing_is_used_for_json_serialization()
         sut.RespondWith(Json(new { Name = "Charlie" }));
         using HttpClient client = sut.CreateClient();
 
-#if NETFRAMEWORK
-        string json = await client.GetStringAsync("http://localhost/myjson");
-#else
         string json = await client.GetStringAsync("http://localhost/myjson", TestContext.Current.CancellationToken);
-#endif
 
         Assert.Equal("{\"name\":\"Charlie\"}", json);
     }
@@ -31,11 +27,7 @@ public async Task But_this_can_be_changed()
         sut.RespondWith(Json(new { Name = "Charlie" }));
         using HttpClient client = sut.CreateClient();
 
-#if NETFRAMEWORK
-        string json = await client.GetStringAsync("http://localhost/myjson");
-#else
         string json = await client.GetStringAsync("http://localhost/myjson", TestContext.Current.CancellationToken);
-#endif
 
         Assert.Equal("{\"Name\":\"Charlie\"}", json);
     }
@@ -47,11 +39,7 @@ public async Task But_Also_directly_on_the_response()
         sut.RespondWith(Json(new { Name = "Charlie" }, jsonSerializerOptions: new JsonSerializerOptions()));
         using HttpClient client = sut.CreateClient();
 
-#if NETFRAMEWORK
-        string json = await client.GetStringAsync("http://localhost/myjson");
-#else
         string json = await client.GetStringAsync("http://localhost/myjson", TestContext.Current.CancellationToken);
-#endif
 
         Assert.Equal("{\"Name\":\"Charlie\"}", json);
     }
@@ -63,12 +51,7 @@ public async Task Asserting_also_works_this_way()
         using HttpClient client = sut.CreateClient();
         await client.PostAsJsonAsync("http://localhost", new { Name = "Charlie" }, cancellationToken: TestContext.Current.CancellationToken);
 
-#if NETFRAMEWORK
-        // Well this doesn't really work on .NET Framework.
-        sut.ShouldHaveMadeRequests();
-#else
         sut.ShouldHaveMadeRequests().WithJsonContent(new { Name = "Charlie" });
-#endif
     }
 
     [Fact]
@@ -84,11 +67,6 @@ public async Task And_we_can_go_crazy_with_it()
 
         await client.PostAsJsonAsync("http://localhost", new { Name = "Charlie" }, options, cancellationToken: TestContext.Current.CancellationToken);
 
-#if NETFRAMEWORK
-        // Well this doesn't really work on .NET Framework.
-        sut.ShouldHaveMadeRequests();
-#else
         sut.ShouldHaveMadeRequests().WithJsonContent(new { Name = "Charlie" }, options);
-#endif
     }
 }

test/TestableHttpClient.IntegrationTests/NetFrameworkPollyFill.cs

@@ -1,15 +1,21 @@
-using System.Threading;
+#if NETFRAMEWORK
+
+using System.Threading;
 
 namespace TestableHttpClient.IntegrationTests;
 
-#if NETFRAMEWORK
 
 internal static class NetFrameworkPollyFill
 {
     public static Task<string> ReadAsStringAsync(this HttpContent content, CancellationToken cancellationToken = default)
     {
         return content.ReadAsStringAsync();
     }
+
+    public static Task<string> GetStringAsync(this HttpClient client, string requestUri, CancellationToken cancellationToken = default)
+    {
+        return client.GetStringAsync(requestUri);
+    }
 }
 
 #endif