Replace WebApplicationFactory in tests with WebApplicationBuilder

.github/workflows/build.yml

@@ -43,6 +43,12 @@ jobs:
       with:
         username: postgres
         password: postgres
+    - name: Configure PostgreSQL
+      shell: bash
+      run: |
+        PGDATA="$RUNNER_TEMP/pgdata"
+        echo "max_connections = 500" >> "$PGDATA/postgresql.conf"
+        pg_ctl restart --pgdata="$PGDATA" --wait
     - name: Setup .NET
       uses: actions/setup-dotnet@v5
       with:
@@ -104,7 +110,22 @@ jobs:
         Logging__LogLevel__Microsoft.Extensions.Hosting.Internal.Host: 'None'
         Logging__LogLevel__Microsoft.EntityFrameworkCore.Database.Command: 'None'
         Logging__LogLevel__JsonApiDotNetCore: 'None'
+        JADNC_THROTTLE_DIAG: '1'
       run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;annotations-title=@test (@framework);annotations-message=@error\n@trace;summary-include-passed=false"
+    - name: Print throttle diagnostics
+      if: always()
+      shell: bash
+      run: |
+        shopt -s nullglob
+        files=("$RUNNER_TEMP"/jadnc-throttle-*.log)
+        if [[ ${#files[@]} -eq 0 ]]; then
+          echo "No throttle diagnostic files found."
+        else
+          for f in "${files[@]}"; do
+            echo "=== $f ==="
+            cat "$f"
+          done
+        fi
     - name: Upload coverage to codecov.io
       if: ${{ matrix.os == 'ubuntu-latest' }}
       env:

package-versions.props

@@ -30,6 +30,7 @@
     <SwashbuckleVersion>10.*-*</SwashbuckleVersion>
     <SystemTextJsonVersion>10.0.*</SystemTextJsonVersion>
     <TestSdkVersion>18.5.*</TestSdkVersion>
+    <XunitDependencyInjectionVersion>9.9.*</XunitDependencyInjectionVersion>
     <XunitVersion>2.9.*</XunitVersion>
     <XunitVisualStudioVersion>3.1.*</XunitVisualStudioVersion>
   </PropertyGroup>

src/Examples/DapperExample/appsettings.json

@@ -3,7 +3,7 @@
   "ConnectionStrings": {
     // docker run --rm --detach --name dapper-example-postgresql-db -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432 postgres:latest
     // docker run --rm --detach --name dapper-example-postgresql-management --link dapper-example-postgresql-db:db -e PGADMIN_DEFAULT_EMAIL=admin@admin.com -e PGADMIN_DEFAULT_PASSWORD=postgres -p 5050:80 dpage/pgadmin4:latest
-    "DapperExamplePostgreSql": "Host=localhost;Database=DapperExample;User ID=postgres;Password=postgres;Include Error Detail=true",
+    "DapperExamplePostgreSql": "Host=localhost;Database=DapperExample;User ID=postgres;Password=postgres;Include Error Detail=true;Command Timeout=120",
     // docker run --rm --detach --name dapper-example-mysql-db -e MYSQL_ROOT_PASSWORD=mysql -e MYSQL_DATABASE=DapperExample -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -p 3306:3306 mysql:latest
     // docker run --rm --detach --name dapper-example-mysql-management --link dapper-example-mysql-db:db -p 8081:80 phpmyadmin/phpmyadmin
     "DapperExampleMySql": "Host=localhost;Database=DapperExample;User ID=mysql;Password=mysql;SSL Mode=None;AllowPublicKeyRetrieval=True",

src/Examples/DatabasePerTenantExample/appsettings.json

@@ -1,8 +1,8 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=localhost;Database=DefaultTenantDb;User ID=postgres;Password=postgres;Include Error Detail=true",
-    "AdventureWorks": "Host=localhost;Database=AdventureWorks;User ID=postgres;Password=postgres;Include Error Detail=true",
-    "Contoso": "Host=localhost;Database=Contoso;User ID=postgres;Password=postgres;Include Error Detail=true"
+    "Default": "Host=localhost;Database=DefaultTenantDb;User ID=postgres;Password=postgres;Include Error Detail=true;Command Timeout=120",
+    "AdventureWorks": "Host=localhost;Database=AdventureWorks;User ID=postgres;Password=postgres;Include Error Detail=true;Command Timeout=120",
+    "Contoso": "Host=localhost;Database=Contoso;User ID=postgres;Password=postgres;Include Error Detail=true;Command Timeout=120"
   },
   "Logging": {
     "LogLevel": {

src/Examples/JsonApiDotNetCoreExample/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=localhost;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=postgres;Include Error Detail=true"
+    "Default": "Host=localhost;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=postgres;Include Error Detail=true;Command Timeout=120"
   },
   "Logging": {
     "LogLevel": {

src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs

@@ -128,7 +128,7 @@ private bool ShouldIncludeTopLevelLink(LinkTypes linkType, ResourceType? resourc
 
     private string GetLinkForTopLevelSelf()
     {
-        // Note: in tests, this does not properly escape special characters due to WebApplicationFactory short-circuiting.
+        // Note: in tests, this does not properly escape special characters due to TestServer short-circuiting.
         return _options.UseRelativeLinks ? HttpContext.Request.GetEncodedPathAndQuery() : HttpContext.Request.GetEncodedUrl();
     }
 

test/DapperTests/IntegrationTests/DapperTestContext.cs

@@ -14,12 +14,13 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using TestBuildingBlocks;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace DapperTests.IntegrationTests;
 
 [PublicAPI]
-public sealed class DapperTestContext : IntegrationTest
+public sealed class DapperTestContext : IntegrationTest, IAsyncLifetime
 {
     private const string SqlServerClearAllTablesScript = """
         EXEC sp_MSForEachTable 'ALTER TABLE ? NOCHECK CONSTRAINT ALL';
@@ -48,6 +49,11 @@ public DapperTestContext()
         _lazyFactory = new Lazy<WebApplicationFactory<TodoItem>>(CreateFactory);
     }
 
+    public async Task InitializeAsync()
+    {
+        await AcquireDbThrottleAsync();
+    }
+
     private WebApplicationFactory<TodoItem> CreateFactory()
     {
 #pragma warning disable CA2000 // Dispose objects before losing scope
@@ -56,7 +62,7 @@ private WebApplicationFactory<TodoItem> CreateFactory()
 #pragma warning restore CA2000 // Dispose objects before losing scope
         {
             builder.UseSetting("ConnectionStrings:DapperExamplePostgreSql",
-                $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=postgres;Password=postgres;Include Error Detail=true");
+                $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=postgres;Password=postgres;Include Error Detail=true;Command Timeout=120");
 
             builder.UseSetting("ConnectionStrings:DapperExampleMySql",
                 $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=root;Password=mysql;SSL Mode=None;AllowPublicKeyRetrieval=True");
@@ -141,7 +147,7 @@ protected override HttpClient CreateClient()
         return Factory.CreateClient();
     }
 
-    public override async Task DisposeAsync()
+    public async Task DisposeAsync()
     {
         try
         {
@@ -159,7 +165,7 @@ public override async Task DisposeAsync()
         }
         finally
         {
-            await base.DisposeAsync();
+            ReleaseDbThrottle();
         }
     }
 }

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs

@@ -28,7 +28,7 @@ public AtomicTransactionConsistencyTests(IntegrationTestContext<TestableStartup<
             services.AddResourceRepository<LyricRepository>();
 
             string dbConnectionString =
-                $"Host=localhost;Database=JsonApiTest-Extra-{Guid.NewGuid():N};User ID=postgres;Password=postgres;Include Error Detail=true";
+                $"Host=localhost;Database=JsonApiTest-Extra-{Guid.NewGuid():N};User ID=postgres;Password=postgres;Include Error Detail=true;Command Timeout=120";
 
             services.AddDbContext<ExtraDbContext>(options => options.UseNpgsql(dbConnectionString));
         });

test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs

@@ -432,7 +432,7 @@ public async Task Denies_JsonApi_ContentType_header_with_CharSet()
         };
 
         const string route = "/policies";
-        string contentType = $"{JsonApiMediaType.Default}; charset=ISO-8859-4";
+        string contentType = $"{JsonApiMediaType.Default}; charset=utf-8";
 
         // Act
         (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);

test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeLogTests.cs

@@ -3,14 +3,16 @@
 using Microsoft.Extensions.Logging;
 using TestBuildingBlocks;
 using Xunit;
+using Xunit.DependencyInjection;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
 
 public sealed class ApiControllerAttributeLogTests : IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext>, IAsyncDisposable
 {
     private readonly CapturingLoggerProvider _loggerProvider;
 
-    public ApiControllerAttributeLogTests()
+    public ApiControllerAttributeLogTests(ITestOutputHelperAccessor accessor)
+        : base(accessor)
     {
         UseController<CiviliansController>();
 

test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/DuplicateResourceControllerTests.cs

@@ -2,12 +2,14 @@
 using JsonApiDotNetCore.Errors;
 using TestBuildingBlocks;
 using Xunit;
+using Xunit.DependencyInjection;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
 
 public sealed class DuplicateResourceControllerTests : IntegrationTestContext<TestableStartup<KnownDbContext>, KnownDbContext>
 {
-    public DuplicateResourceControllerTests()
+    public DuplicateResourceControllerTests(ITestOutputHelperAccessor accessor)
+        : base(accessor)
     {
         UseController<KnownResourcesController>();
         UseController<DuplicateKnownResourcesController>();

test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResourceControllerTests.cs

@@ -2,12 +2,14 @@
 using JsonApiDotNetCore.Errors;
 using TestBuildingBlocks;
 using Xunit;
+using Xunit.DependencyInjection;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
 
 public sealed class UnknownResourceControllerTests : IntegrationTestContext<TestableStartup<EmptyDbContext>, EmptyDbContext>
 {
-    public UnknownResourceControllerTests()
+    public UnknownResourceControllerTests(ITestOutputHelperAccessor accessor)
+        : base(accessor)
     {
         UseController<UnknownResourcesController>();
     }

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerIgnoreConditionTests.cs

@@ -7,14 +7,16 @@
 using Microsoft.Extensions.DependencyInjection;
 using TestBuildingBlocks;
 using Xunit;
+using Xunit.DependencyInjection;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
 
 public sealed class SerializerIgnoreConditionTests : IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>
 {
     private readonly QueryStringFakers _fakers = new();
 
-    public SerializerIgnoreConditionTests()
+    public SerializerIgnoreConditionTests(ITestOutputHelperAccessor accessor)
+        : base(accessor)
     {
         UseController<CalendarsController>();
     }

test/OpenApiKiotaEndToEndTests/TestableHttpClientRequestAdapterFactory.cs

@@ -1,5 +1,4 @@
 using JsonApiDotNetCore.OpenApi.Client.Kiota;
-using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Kiota.Abstractions.Authentication;
 using Microsoft.Kiota.Http.HttpClientLibrary;
 using Microsoft.Kiota.Http.HttpClientLibrary.Middleware;
@@ -21,10 +20,9 @@ public TestableHttpClientRequestAdapterFactory(ITestOutputHelper testOutputHelpe
         _logHttpMessageHandler = new XUnitLogHttpMessageHandler(testOutputHelper);
     }
 
-    public HttpClientRequestAdapter CreateAdapter<TStartup>(WebApplicationFactory<TStartup> webApplicationFactory)
-        where TStartup : class
+    public HttpClientRequestAdapter CreateAdapter(FactoryBridge bridge)
     {
-        ArgumentNullException.ThrowIfNull(webApplicationFactory);
+        ArgumentNullException.ThrowIfNull(bridge);
 
         DelegatingHandler[] handlers =
         [
@@ -33,7 +31,7 @@ public HttpClientRequestAdapter CreateAdapter<TStartup>(WebApplicationFactory<TS
             _logHttpMessageHandler
         ];
 
-        HttpClient httpClient = webApplicationFactory.CreateDefaultClient(handlers);
+        HttpClient httpClient = bridge.GetTestClient(handlers);
         return new HttpClientRequestAdapter(new AnonymousAuthenticationProvider(), httpClient: httpClient);
     }
 

test/OpenApiTests/LegacyOpenApi/LegacyTests.cs

@@ -4,20 +4,21 @@
 using FluentAssertions;
 using TestBuildingBlocks;
 using Xunit;
-using Xunit.Abstractions;
+using Xunit.DependencyInjection;
 
 namespace OpenApiTests.LegacyOpenApi;
 
 public sealed class LegacyTests : OpenApiTestContext<LegacyStartup<LegacyIntegrationDbContext>, LegacyIntegrationDbContext>
 {
-    public LegacyTests(ITestOutputHelper testOutputHelper)
+    public LegacyTests(ITestOutputHelperAccessor accessor)
+        : base(accessor)
     {
         UseController<AirplanesController>();
         UseController<FlightsController>();
         UseController<FlightAttendantsController>();
         UseController<PassengersController>();
 
-        SetTestOutputHelper(testOutputHelper);
+        SetTestOutputHelper(accessor.Output);
         OpenApiDocumentOutputDirectory = $"{GetType().Namespace!.Replace('.', '/')}/GeneratedSwagger";
     }
 

test/OpenApiTests/OpenApiGenerationFailures/MissingFromBody/MissingFromBodyOnPatchMethodTests.cs

@@ -1,17 +1,18 @@
 using FluentAssertions;
 using JsonApiDotNetCore.Errors;
 using Xunit;
-using Xunit.Abstractions;
+using Xunit.DependencyInjection;
 
 namespace OpenApiTests.OpenApiGenerationFailures.MissingFromBody;
 
 public sealed class MissingFromBodyOnPatchMethodTests : OpenApiTestContext<OpenApiStartup<MissingFromBodyDbContext>, MissingFromBodyDbContext>
 {
-    public MissingFromBodyOnPatchMethodTests(ITestOutputHelper testOutputHelper)
+    public MissingFromBodyOnPatchMethodTests(ITestOutputHelperAccessor accessor)
+        : base(accessor)
     {
         UseController<MissingFromBodyOnPatchController>();
 
-        SetTestOutputHelper(testOutputHelper);
+        SetTestOutputHelper(accessor.Output);
     }
 
     [Fact]

test/OpenApiTests/OpenApiGenerationFailures/MissingFromBody/MissingFromBodyOnPostMethodTests.cs

@@ -1,17 +1,18 @@
-using FluentAssertions;
+using FluentAssertions;
 using JsonApiDotNetCore.Errors;
 using Xunit;
-using Xunit.Abstractions;
+using Xunit.DependencyInjection;
 
 namespace OpenApiTests.OpenApiGenerationFailures.MissingFromBody;
 
 public sealed class MissingFromBodyOnPostMethodTests : OpenApiTestContext<OpenApiStartup<MissingFromBodyDbContext>, MissingFromBodyDbContext>
 {
-    public MissingFromBodyOnPostMethodTests(ITestOutputHelper testOutputHelper)
+    public MissingFromBodyOnPostMethodTests(ITestOutputHelperAccessor accessor)
+        : base(accessor)
     {
         UseController<MissingFromBodyOnPostController>();
 
-        SetTestOutputHelper(testOutputHelper);
+        SetTestOutputHelper(accessor.Output);
     }
 
     [Fact]

test/OpenApiTests/OpenApiTestContext.cs

@@ -4,21 +4,24 @@
 using Microsoft.Extensions.Logging;
 using TestBuildingBlocks;
 using Xunit.Abstractions;
+using Xunit.DependencyInjection;
 
 namespace OpenApiTests;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public class OpenApiTestContext<TStartup, TDbContext> : IntegrationTestContext<TStartup, TDbContext>
-    where TStartup : class
+    where TStartup : IStartup, new()
     where TDbContext : TestableDbContext
 {
     private readonly Lazy<Task<JsonElement>> _lazyDocument;
     private ITestOutputHelper? _testOutputHelper;
 
     internal string? OpenApiDocumentOutputDirectory { get; set; }
 
-    public OpenApiTestContext()
+    public OpenApiTestContext(ITestOutputHelperAccessor accessor)
+        : base(accessor)
     {
+        CaptureHttpTraffic = false;
         _lazyDocument = new Lazy<Task<JsonElement>>(CreateOpenApiDocumentAsync, LazyThreadSafetyMode.ExecutionAndPublication);
     }
 
@@ -39,7 +42,7 @@ internal async Task<JsonElement> CreateOpenApiDocumentAsync()
         return rootElement;
     }
 
-    internal void SetTestOutputHelper(ITestOutputHelper testOutputHelper)
+    internal void SetTestOutputHelper(ITestOutputHelper? testOutputHelper)
     {
         ArgumentNullException.ThrowIfNull(testOutputHelper);