test: fix integration factory disposal and traced redirects

Author: BenjaminMichaelis

EssentialCSharp.Web.Tests/FunctionalTests.cs

@@ -13,8 +13,7 @@ public class FunctionalTests : IntegrationTestBase
     [Arguments("/alive")]
     public async Task WhenTheApplicationStarts_ItCanLoadLoadPages(string relativeUrl)
     {
-        HttpClient client = CreateRedirectFollowingClient();
-        using HttpResponseMessage response = await client.GetAsync(relativeUrl);
+        using HttpResponseMessage response = await GetWithRedirectsAsync(relativeUrl);
 
         await Assert.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK);
     }
@@ -29,8 +28,7 @@ public async Task WhenTheApplicationStarts_ItCanLoadLoadPages(string relativeUrl
     [Arguments("/about?someOtherParam=value")]
     public async Task WhenPagesAreAccessed_TheyReturnHtml(string relativeUrl)
     {
-        HttpClient client = CreateRedirectFollowingClient();
-        using HttpResponseMessage response = await client.GetAsync(relativeUrl);
+        using HttpResponseMessage response = await GetWithRedirectsAsync(relativeUrl);
 
         await Assert.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK);
 
@@ -45,8 +43,7 @@ public async Task WhenPagesAreAccessed_TheyReturnHtml(string relativeUrl)
     [Test]
     public async Task WhenTheApplicationStarts_NonExistingPage_GivesCorrectStatusCode()
     {
-        HttpClient client = CreateRedirectFollowingClient();
-        using HttpResponseMessage response = await client.GetAsync("/non-existing-page1234");
+        using HttpResponseMessage response = await GetWithRedirectsAsync("/non-existing-page1234");
 
         await Assert.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound);
     }

EssentialCSharp.Web.Tests/IntegrationTestBase.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc.Testing;
+using System.Net;
 using Microsoft.Extensions.DependencyInjection;
 using TUnit.AspNetCore;
 
@@ -7,14 +7,38 @@ namespace EssentialCSharp.Web.Tests;
 public abstract class IntegrationTestBase : WebApplicationTest<WebApplicationFactory, Program>
 {
     /// <summary>
-    /// Creates an HTTP client with redirect following enabled.
-    /// NOTE: This bypasses TUnit trace correlation because <see cref="TracedWebApplicationFactory{T}"/>
-    /// does not expose a <c>CreateClient(WebApplicationFactoryClientOptions)</c> overload.
-    /// Use <see cref="TUnit.AspNetCore.TracedWebApplicationFactory{T}.CreateClient()"/> for all
-    /// other tests where AllowAutoRedirect=false is acceptable.
+    /// Executes a GET request and follows redirect responses while preserving
+    /// TUnit trace correlation by using <see cref="TracedWebApplicationFactory{T}.CreateClient()"/>.
     /// </summary>
-    protected HttpClient CreateRedirectFollowingClient() =>
-        Factory.Inner.CreateClient(new WebApplicationFactoryClientOptions { AllowAutoRedirect = true });
+    protected async Task<HttpResponseMessage> GetWithRedirectsAsync(string relativeUrl, int maxRedirects = 10)
+    {
+        HttpClient client = Factory.CreateClient();
+        HttpResponseMessage response = await client.GetAsync(relativeUrl);
+
+        for (int redirectCount = 0;
+             redirectCount < maxRedirects && IsRedirectStatusCode(response.StatusCode);
+             redirectCount++)
+        {
+            Uri? location = response.Headers.Location;
+            if (location is null)
+            {
+                return response;
+            }
+
+            response.Dispose();
+
+            response = await client.GetAsync(location);
+        }
+
+        return response;
+    }
+
+    private static bool IsRedirectStatusCode(HttpStatusCode statusCode) =>
+        statusCode == HttpStatusCode.Moved ||
+        statusCode == HttpStatusCode.Found ||
+        statusCode == HttpStatusCode.RedirectMethod ||
+        statusCode == HttpStatusCode.TemporaryRedirect ||
+        statusCode == HttpStatusCode.PermanentRedirect;
 
     public T InServiceScope<T>(Func<IServiceProvider, T> action)
     {

EssentialCSharp.Web.Tests/WebApplicationFactory.cs

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using System.Data.Common;
 using EssentialCSharp.Web.Data;
 using EssentialCSharp.Web.Services;
@@ -16,9 +15,6 @@ public sealed class WebApplicationFactory : TestWebApplicationFactory<Program>
 {
     private static string SqlConnectionString => $"DataSource=file:{Guid.NewGuid()}?mode=memory&cache=shared";
 
-    // Each per-test factory's ConfigureWebHost creates a new connection; track all for disposal.
-    private readonly ConcurrentBag<SqliteConnection> _connections = [];
-
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
         builder.ConfigureServices(services =>
@@ -55,17 +51,20 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
             // to its own connection, not to a shared field that gets overwritten.
             SqliteConnection connection = new(SqlConnectionString);
             connection.Open();
-            _connections.Add(connection);
 
-            services.AddDbContext<EssentialCSharpWebContext>(options =>
+            services.AddSingleton<DbConnection>(connection);
+
+            services.AddDbContext<EssentialCSharpWebContext>((serviceProvider, options) =>
             {
-                options.UseSqlite(connection);
+                DbConnection dbConnection = serviceProvider.GetRequiredService<DbConnection>();
+                options.UseSqlite(dbConnection);
             });
 
-            using ServiceProvider serviceProvider = services.BuildServiceProvider();
-            using IServiceScope scope = serviceProvider.CreateScope();
-            IServiceProvider scopedServices = scope.ServiceProvider;
-            EssentialCSharpWebContext db = scopedServices.GetRequiredService<EssentialCSharpWebContext>();
+            DbContextOptions<EssentialCSharpWebContext> dbContextOptions =
+                new DbContextOptionsBuilder<EssentialCSharpWebContext>()
+                    .UseSqlite(connection)
+                    .Options;
+            using EssentialCSharpWebContext db = new(dbContextOptions);
 
             db.Database.EnsureCreated();
 
@@ -75,26 +74,4 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                 _ => TestListingSourceCodeServiceHelper.CreateService());
         });
     }
-
-    private int _connectionsDisposed;
-
-    public override async ValueTask DisposeAsync()
-    {
-        await base.DisposeAsync().ConfigureAwait(false);
-        if (Interlocked.Exchange(ref _connectionsDisposed, 1) == 0)
-        {
-            foreach (SqliteConnection connection in _connections)
-                await connection.DisposeAsync().ConfigureAwait(false);
-        }
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing && Interlocked.Exchange(ref _connectionsDisposed, 1) == 0)
-        {
-            foreach (SqliteConnection connection in _connections)
-                connection.Dispose();
-        }
-    }
 }