Fix CI hangs and address performance feedback

- **Fix**: Disabled `AuditLogger` in `ClientEndpointTests` to prevent deadlocks during test cleanup.
- **Optimization**: Updated `CustomWebApplicationFactory` to remove its own container management and reuse the shared `TestDbFixture` database, reducing container count from 2 to 1 and speeding up execution.
- **Refactoring**: Implemented all review feedback (helper methods, constants, stronger assertions, null guards).
- **CI**: Added 10-minute timeout to test steps to catch hangs early.

Author: google-labs-jules[bot]

.github/workflows/ci.yml

@@ -45,6 +45,7 @@ jobs:
             --configuration Release \
             --filter "Category!=Integration" \
             --collect:"XPlat Code Coverage"
+        timeout-minutes: 10
 
       - name: Run Integration Tests
         env:
@@ -54,6 +55,7 @@ jobs:
             --configuration Release \
             --filter "Category=Integration" \
             --collect:"XPlat Code Coverage"
+        timeout-minutes: 10
 
       - name: Install ReportGenerator
         run: dotnet tool install -g dotnet-reportgenerator-globaltool

Rgt.Space.Tests/Integration/Api/ClientEndpointTests.cs

@@ -1,27 +1,50 @@
 using System.Net;
 using System.Net.Http.Json;
 using FluentAssertions;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Rgt.Space.Core.Abstractions.Tenancy;
 using Rgt.Space.Core.Domain.Entities.PortalRouting;
+using Rgt.Space.Tests.Integration.Fixtures;
 
 namespace Rgt.Space.Tests.Integration.Api;
 
 [Trait("Category", "Integration")]
+[Collection("IntegrationTests")]
 public class ClientEndpointTests : IClassFixture<CustomWebApplicationFactory>
 {
     private readonly HttpClient _client;
-    private readonly CustomWebApplicationFactory _factory;
 
-    public ClientEndpointTests(CustomWebApplicationFactory factory)
+    public ClientEndpointTests(CustomWebApplicationFactory factory, TestDbFixture dbFixture)
     {
-        _factory = factory;
-        _client = factory.CreateClient();
+        _client = factory.WithWebHostBuilder(builder =>
+        {
+            builder.ConfigureServices(services =>
+            {
+                services.RemoveAll<ISystemConnectionFactory>();
+                services.AddSingleton<ISystemConnectionFactory>(new TestSystemConnectionFactory(dbFixture.ConnectionString));
+            });
+
+            builder.ConfigureAppConfiguration((context, config) =>
+            {
+                config.AddInMemoryCollection(new Dictionary<string, string?>
+                {
+                    { "ConnectionStrings:PortalDb", dbFixture.ConnectionString },
+                    { "ConnectionStrings:Redis", "localhost:6379" },
+                    { "Auth:Authority", "https://demo.duendesoftware.com" },
+                    { "Auth:Audience", "api" },
+                    { "AuditSettings:Enabled", "false" } // Disable Audit Logger to prevent hang
+                });
+            });
+        }).CreateClient();
     }
 
     [Fact]
     public async Task Get_Health_Live_ShouldReturnHealthy()
     {
         // Act
-        // Use liveness check to avoid dependency failures (like Redis) in test env
         var response = await _client.GetAsync("/health/live");
 
         // Assert

Rgt.Space.Tests/Integration/Api/CustomWebApplicationFactory.cs

@@ -14,65 +14,10 @@ namespace Rgt.Space.Tests.Integration.Api;
 /// Custom WebApplicationFactory that spins up a test database container
 /// and configures the API to use it.
 /// </summary>
-public class CustomWebApplicationFactory : WebApplicationFactory<Program>, IAsyncLifetime
+public class CustomWebApplicationFactory : WebApplicationFactory<Program>
 {
-    private readonly PostgreSqlContainer _postgres;
-
-    public CustomWebApplicationFactory()
-    {
-        // Use the same image as Integration Tests
-        _postgres = new PostgreSqlBuilder()
-            .WithImage("public.ecr.aws/docker/library/postgres:15-alpine")
-            .WithDatabase("portal_db")
-            .WithUsername("postgres")
-            .WithPassword("postgres")
-            .Build();
-
-        // Note: we can't easily get the connection string until we start the container.
-        // But the constructor must return.
-    }
-
-    public async Task InitializeAsync()
-    {
-        await _postgres.StartAsync();
-
-        // Initialize Schema
-        await TestDatabaseInitializer.InitializeAsync(_postgres.GetConnectionString());
-    }
-
-    public new async Task DisposeAsync()
-    {
-        await _postgres.DisposeAsync();
-        await base.DisposeAsync();
-    }
-
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
-        builder.ConfigureServices(services =>
-        {
-            // Remove existing IDbConnection or ConnectionFactory registrations if any
-            services.RemoveAll<ISystemConnectionFactory>();
-
-            // Register our Test Connection Factory
-            services.AddSingleton<ISystemConnectionFactory>(new TestSystemConnectionFactory(_postgres.GetConnectionString()));
-
-            // Also need to override the Configuration "PortalDb" connection string because
-            // the API might use it for HealthChecks or other services directly.
-            // However, Configuration is usually built before ConfigureServices.
-            // We can use ConfigureAppConfiguration.
-        });
-
-        builder.ConfigureAppConfiguration((context, config) =>
-        {
-            config.AddInMemoryCollection(new Dictionary<string, string?>
-            {
-                { "ConnectionStrings:PortalDb", _postgres.GetConnectionString() },
-                { "ConnectionStrings:Redis", "localhost:6379" }, // Mock or ignore Redis
-                { "Auth:Authority", "https://demo.duendesoftware.com" }, // Fake Auth
-                { "Auth:Audience", "api" }
-            });
-        });
-
         builder.ConfigureLogging(logging =>
         {
             logging.ClearProviders(); // Reduce noise