Update test project to .NET 6

0xced · 0xced · commit 0fbee29733d3 · 2022-08-25T19:43:08.000+02:00
Also update all the test dependencies to their latest versions and adapt the code.
diff --git a/HttpRecorder.Tests/ContextTests.cs b/HttpRecorder.Tests/ContextTests.cs
@@ -91,7 +91,7 @@ public async Task ItShouldWorkWithHttpRecorderContextWhenNotRecording()
             {
                 var client = services.BuildServiceProvider().GetRequiredService<IHttpClientFactory>().CreateClient("TheClient");
                 Func<Task> act = async () => await client.GetAsync(ApiController.JsonUri);
-                act.Should().Throw<HttpRecorderException>();
+                await act.Should().ThrowAsync<HttpRecorderException>();
             }
         }
 
diff --git a/HttpRecorder.Tests/HttpRecorder.Tests.csproj b/HttpRecorder.Tests/HttpRecorder.Tests.csproj
@@ -1,18 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
-    <PackageReference Include="Moq" Version="4.10.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HttpRecorder.Tests/HttpRecorderIntegrationTests.cs b/HttpRecorder.Tests/HttpRecorderIntegrationTests.cs
@@ -1,7 +1,9 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using System.Net.Http;
+using System.Net.Http.Json;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -43,7 +45,7 @@ await ExecuteModeIterations(async (client, mode) =>
                 if (mode == HttpRecorderMode.Passthrough)
                 {
                     passthroughResponse = response;
-                    var result = await response.Content.ReadAsAsync<SampleModel>();
+                    var result = await response.Content.ReadFromJsonAsync<SampleModel>();
                     result.Name.Should().Be(SampleModel.DefaultName);
                 }
                 else
@@ -68,7 +70,7 @@ await ExecuteModeIterations(async (client, mode) =>
                 if (mode == HttpRecorderMode.Passthrough)
                 {
                     passthroughResponse = response;
-                    var result = await response.Content.ReadAsAsync<SampleModel>();
+                    var result = await response.Content.ReadFromJsonAsync<SampleModel>();
                     result.Name.Should().Be(name);
                 }
                 else
@@ -94,7 +96,7 @@ await ExecuteModeIterations(async (client, mode) =>
                 if (mode == HttpRecorderMode.Passthrough)
                 {
                     passthroughResponse = response;
-                    var result = await response.Content.ReadAsAsync<SampleModel>();
+                    var result = await response.Content.ReadFromJsonAsync<SampleModel>();
                     result.Name.Should().Be(sampleModel.Name);
                 }
                 else
@@ -124,7 +126,7 @@ await ExecuteModeIterations(async (client, mode) =>
                 if (mode == HttpRecorderMode.Passthrough)
                 {
                     passthroughResponse = response;
-                    var result = await response.Content.ReadAsAsync<SampleModel>();
+                    var result = await response.Content.ReadFromJsonAsync<SampleModel>();
                     result.Name.Should().Be(sampleModel.Name);
                 }
                 else
@@ -162,7 +164,7 @@ await ExecuteModeIterations(async (client, mode) =>
                     {
                         var response = responses[i];
                         response.EnsureSuccessStatusCode();
-                        var result = await response.Content.ReadAsAsync<SampleModel>();
+                        var result = await response.Content.ReadFromJsonAsync<SampleModel>();
                         result.Name.Should().Be($"{i}");
                     }
                 }
@@ -188,10 +190,10 @@ public async Task ItShouldExecuteMultipleRequestsInSequenceWithRecorderModeAuto(
                 nameof(ItShouldExecuteMultipleRequestsInSequenceWithRecorderModeAuto));
             var response1 = await client.GetAsync($"{ApiController.JsonUri}?name=1");
             var response2 = await client.GetAsync($"{ApiController.JsonUri}?name=2");
-            var result1 = await response1.Content.ReadAsAsync<SampleModel>();
+            var result1 = await response1.Content.ReadFromJsonAsync<SampleModel>();
             result1.Name.Should().Be("1");
 
-            var result2 = await response2.Content.ReadAsAsync<SampleModel>();
+            var result2 = await response2.Content.ReadFromJsonAsync<SampleModel>();
             result2.Name.Should().Be("2");
 
             // We resolve to replay at this point.
@@ -239,7 +241,7 @@ public async Task ItShouldThrowIfDoesNotFindFile()
 
             Func<Task> act = async () => await client.GetAsync(ApiController.JsonUri);
 
-            act.Should().Throw<HttpRecorderException>()
+            await act.Should().ThrowAsync<HttpRecorderException>()
                 .WithMessage($"*{TestFile}*");
         }
 
@@ -251,7 +253,7 @@ public async Task ItShouldThrowIfFileIsCorrupted()
 
             Func<Task> act = async () => await client.GetAsync(ApiController.JsonUri);
 
-            act.Should().Throw<HttpRecorderException>()
+            await act.Should().ThrowAsync<HttpRecorderException>()
                 .WithMessage($"*{file}*");
         }
 
@@ -268,24 +270,24 @@ public async Task ItShouldThrowIfNoRequestCanBeMatched()
 
             Func<Task> act = async () => await client.GetAsync(ApiController.JsonUri);
 
-            act.Should().Throw<HttpRecorderException>()
+            await act.Should().ThrowAsync<HttpRecorderException>()
                 .WithMessage($"*{ApiController.JsonUri}*");
         }
 
         [Theory]
-        [InlineData(202)]
-        [InlineData(301)]
-        [InlineData(303)]
-        [InlineData(404)]
-        [InlineData(500)]
-        [InlineData(502)]
-        public async Task ItShouldGetStatus(int statusCode)
+        [InlineData(HttpStatusCode.Accepted)]
+        [InlineData(HttpStatusCode.MovedPermanently)]
+        [InlineData(HttpStatusCode.RedirectMethod)]
+        [InlineData(HttpStatusCode.NotFound)]
+        [InlineData(HttpStatusCode.InternalServerError)]
+        [InlineData(HttpStatusCode.BadGateway)]
+        public async Task ItShouldGetStatus(HttpStatusCode statusCode)
         {
             HttpResponseMessage passthroughResponse = null;
 
             await ExecuteModeIterations(async (client, mode) =>
             {
-                var response = await client.GetAsync($"{ApiController.StatusCodeUri}?statusCode={statusCode}");
+                var response = await client.GetAsync($"{ApiController.StatusCodeUri}?statusCode={(int)statusCode}");
                 response.StatusCode.Should().Be(statusCode);
                 response.Headers.Remove("Date");
 
@@ -310,7 +312,7 @@ public async Task ItShouldOverrideModeWithEnvironmentVariable()
 
                 Func<Task> act = () => client.GetAsync(ApiController.JsonUri);
 
-                act.Should().Throw<HttpRecorderException>();
+                await act.Should().ThrowAsync<HttpRecorderException>();
             }
             finally
             {
@@ -326,8 +328,8 @@ public async Task ItShouldAnonymize()
                 HttpRecorderMode.Record,
                 repository: repositoryMock.Object,
                 anonymizer: RulesInteractionAnonymizer.Default.AnonymizeRequestQueryStringParameter("key"));
-            Func<Task> act = async () => await client.GetAsync($"{ApiController.JsonUri}?key=foo");
-            act.Should().Throw<InvalidOperationException>(); // Because we don't act on the stream in the repository. That's fine.
+
+            await client.GetAsync($"{ApiController.JsonUri}?key=foo");
 
             repositoryMock.Verify(
                 x => x.StoreAsync(
diff --git a/HttpRecorder.Tests/Server/Startup.cs b/HttpRecorder.Tests/Server/Startup.cs
@@ -9,7 +9,7 @@ public class Startup
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
+            services.AddMvc(o => o.EnableEndpointRouting = false);
         }
 
         public void Configure(IApplicationBuilder app)
diff --git a/HttpRecorder/HttpRecorderDelegatingHandler.cs b/HttpRecorder/HttpRecorderDelegatingHandler.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -190,17 +189,12 @@ private async Task ResolveExecutionMode(CancellationToken cancellationToken)
         /// <returns>The <see cref="HttpResponseMessage"/> returned as convenience.</returns>
         private async Task<HttpResponseMessage> PostProcessResponse(HttpResponseMessage response)
         {
-            if (response.Content != null)
+            // Trick to make sure a fake ContentLength is not artificially added by the HttpClient if none was provided by the server.
+            // Indeed, the ContentLength is _set_ in the _getter_, but explicitly setting a value opts out of this (undocumented) behaviour.
+            // See https://github.com/dotnet/runtime/blob/ebdb045532190ffc664bba9a0a1e3f2ce35cf23f/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpContentHeaders.cs#L51
+            if (!response.Content.Headers.Contains("Content-Length"))
             {
-                var stream = await response.Content.ReadAsStreamAsync();
-                if (stream.CanSeek)
-                {
-                    // The HTTP Client is adding the content length header on HttpConnectionResponseContent even when the server does not have a header.
-                    response.Content.Headers.ContentLength = stream.Length;
-
-                    // We do reset the stream in case it needs to be re-read.
-                    stream.Seek(0, SeekOrigin.Begin);
-                }
+                response.Content.Headers.ContentLength = null;
             }
 
             return response;

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public async Task ItShouldWorkWithHttpRecorderContextWhenNotRecording()`
`91`	`91`	`{`
`92`	`92`	`var client = services.BuildServiceProvider().GetRequiredService<IHttpClientFactory>().CreateClient("TheClient");`
`93`	`93`	`Func<Task> act = async () => await client.GetAsync(ApiController.JsonUri);`
`94`		`- act.Should().Throw<HttpRecorderException>();`
	`94`	`+ await act.Should().ThrowAsync<HttpRecorderException>();`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class Startup`
`9`	`9`	`{`
`10`	`10`	`public void ConfigureServices(IServiceCollection services)`
`11`	`11`	`{`
`12`		`- services.AddMvc();`
	`12`	`+ services.AddMvc(o => o.EnableEndpointRouting = false);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public void Configure(IApplicationBuilder app)`