Refactor acceptance tests to each have their own HttpClient instance

Author: commonsensesoftware

src/Common/test/Common.Acceptance.Tests/AcceptanceTest.cs

@@ -13,14 +13,36 @@ namespace Asp.Versioning;
 #else
 [Trait( "ASP.NET", "Core" )]
 #endif
-public abstract partial class AcceptanceTest
+public abstract partial class AcceptanceTest : IDisposable
 {
     private static readonly HttpMethod Patch = new( "PATCH" );
-    private readonly HttpServerFixture fixture;
+    private readonly Lazy<HttpClient> client;
+    private bool disposed;
 
-    protected AcceptanceTest( HttpServerFixture fixture ) => this.fixture = fixture;
+    protected AcceptanceTest( HttpServerFixture fixture ) => client = new( fixture.CreateClient );
 
-    protected HttpClient Client => fixture.Client;
+    protected HttpClient Client => client.Value;
+
+    public void Dispose()
+    {
+        Dispose( true );
+        GC.SuppressFinalize( this );
+    }
+
+    protected virtual void Dispose( bool disposing )
+    {
+        if ( disposed )
+        {
+            return;
+        }
+
+        disposed = true;
+
+        if ( disposing && client.IsValueCreated )
+        {
+            client.Value.Dispose();
+        }
+    }
 
     private HttpRequestMessage CreateRequest<TEntity>( string requestUri, TEntity entity, HttpMethod method )
     {

src/Common/test/Common.Acceptance.Tests/HttpServerFixture.cs

@@ -11,21 +11,25 @@ namespace Asp.Versioning;
 public abstract partial class HttpServerFixture : IDisposable
 {
     private readonly Lazy<TestServer> server;
-    private readonly Lazy<HttpClient> client;
     private bool disposed;
 
-    protected HttpServerFixture()
-    {
-        server = new( CreateServer );
-        client = new( CreateClient );
-    }
+    protected HttpServerFixture() => server = new( CreateServer );
 
     public TestServer Server => server.Value;
 
-    public HttpClient Client => client.Value;
-
     public ICollection<Type> FilteredControllerTypes { get; } = new FilteredControllerTypes();
 
+    public HttpClient CreateClient()
+    {
+#if NETFRAMEWORK
+        var newClient = Server.HttpClient;
+#else
+        var newClient = Server.CreateClient();
+#endif
+        newClient.BaseAddress = new Uri( "http://localhost" );
+        return newClient;
+    }
+
     public void Dispose()
     {
         Dispose( true );
@@ -46,27 +50,11 @@ protected virtual void Dispose( bool disposing )
             return;
         }
 
-        if ( client.IsValueCreated )
-        {
-            client.Value.Dispose();
-        }
-
         if ( server.IsValueCreated )
         {
             server.Value.Dispose();
         }
     }
 
     protected virtual void OnAddApiVersioning( ApiVersioningOptions options ) { }
-
-    private HttpClient CreateClient()
-    {
-#if NETFRAMEWORK
-        var newClient = Server.HttpClient;
-#else
-        var newClient = Server.CreateClient();
-#endif
-        newClient.BaseAddress = new Uri( "http://localhost" );
-        return newClient;
-    }
 }