add UseTestServerAndClient extension

src/Xunit.DependencyInjection.AspNetCoreTesting/MinimalApiHostBuilderFactory.cs

@@ -89,10 +89,7 @@ public static IHostBuilder GetHostBuilder<TEntryPoint>(Action<IWebHostBuilder>?
 
             configure?.Invoke(webHostBuilder);
 
-            webHostBuilder.UseTestServer(options => options.PreserveExecutionContext = true);
-
-            webHostBuilder.ConfigureServices(x => x.TryAddSingleton<HttpClient>(sp =>
-                ((TestServer)sp.GetRequiredService<IServer>()).CreateClient()));
+            webHostBuilder.UseTestServerAndClient();
 
             webHostBuilder.ConfigureServices((context, services) =>
             {

src/Xunit.DependencyInjection.AspNetCoreTesting/WebHostBuilderExtensions.cs

@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Xunit.DependencyInjection.AspNetCoreTesting;
+
+public static class WebHostBuilderExtensions
+{
+    public static IWebHostBuilder UseTestServerAndClient(this IWebHostBuilder webHostBuilder)
+    {
+        ArgumentNullException.ThrowIfNull(webHostBuilder);
+
+        webHostBuilder.UseTestServer(x => x.PreserveExecutionContext = true);
+        webHostBuilder.ConfigureServices(x =>
+        {
+            x.TryAddSingleton<HttpClient>(sp =>
+                ((TestServer)sp.GetRequiredService<IServer>()).CreateClient());
+        });
+
+        return webHostBuilder;
+    }
+
+    public static IWebHostBuilder UseTestServerAndClient(this IWebHostBuilder webHostBuilder,
+        Action<TestServerOptions> testServerConfigure)
+    {
+        ArgumentNullException.ThrowIfNull(testServerConfigure);
+
+        webHostBuilder.UseTestServerAndClient()
+            .ConfigureServices(x => x.Configure(testServerConfigure));
+
+        return webHostBuilder;
+    }
+}

test/MinimalApiSample/Program.cs

@@ -8,7 +8,7 @@
 
 var app = builder.Build();
 
-// app.Map("/", () => "Hello world");
+app.Map("/hello", () => "Hello world");
 app.MapDefaultControllerRoute();
 
 await app.RunAsync();

test/Xunit.DependencyInjection.Test.AspNetCore/MinimalApiTest.cs

@@ -7,7 +7,14 @@ namespace Xunit.DependencyInjection.Test.AspNetCore;
 public class MinimalApiTest(HttpClient httpClient, IRandomService randomService)
 {
     [Fact]
-    public async Task ResponseTest()
+    public async Task MinimalApiRouteResponseTest()
+    {
+        var responseText = await httpClient.GetStringAsync("/hello");
+        Assert.Equal("Hello world", responseText);
+    }
+
+    [Fact]
+    public async Task ControllerRouteResponseTest()
     {
         var responseText = await httpClient.GetStringAsync("/");
         Assert.Equal("Hello world", responseText);

test/Xunit.DependencyInjection.Test.AspNetCore/Startup.cs

@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Xunit;
+using Xunit.DependencyInjection.AspNetCoreTesting;
 using Xunit.DependencyInjection.Logging;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
@@ -14,7 +15,7 @@ public class Startup
 {
     public void ConfigureHost(IHostBuilder hostBuilder) =>
         hostBuilder.ConfigureWebHost(webHostBuilder => webHostBuilder
-            .UseTestServer(options => options.PreserveExecutionContext = true)
+            .UseTestServerAndClient()
             .UseStartup<AspNetCoreStartup>());
 
     private class AspNetCoreStartup

test/Xunit.DependencyInjection.Test.AspNetCore/TestServerTest.cs

@@ -3,16 +3,14 @@
 
 namespace Xunit.DependencyInjection.Test.AspNetCore;
 
-public class TestServerTest(IServer server)
+public class TestServerTest(HttpClient httpClient)
 {
     public static string Key { get; } = Guid.NewGuid().ToString("N");
 
-    private readonly HttpClient _httpClient = ((TestServer)server).CreateClient();
-
     [Fact]
     public async Task HttpTest()
     {
-        using var response = await _httpClient.GetAsync("/");
+        using var response = await httpClient.GetAsync("/");
 
         response.EnsureSuccessStatusCode();