Complete conversion of RequestBuilderTests, ClientHandlerTests, and WebSocketClientTests to HostBuilder

Co-authored-by: BrennanConroy <[email protected]>

Author: Copilot

src/Hosting/TestHost/test/ClientHandlerTests.cs

@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
@@ -691,19 +692,25 @@ public async Task ClientHandlerCreateContextWithDefaultRequestParameters()
     {
         // This logger will attempt to access information from HttpRequest once the HttpContext is created
         var logger = new VerifierLogger();
-        var builder = new WebHostBuilder()
-            .ConfigureServices(services =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                services.AddSingleton<ILogger<IWebHost>>(logger);
+                webHostBuilder
+                    .UseTestServer()
+                    .ConfigureServices(services =>
+                    {
+                        services.AddSingleton<ILogger<IWebHost>>(logger);
+                    })
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            return Task.FromResult(0);
+                        });
+                    });
             })
-            .Configure(app =>
-            {
-                app.Run(context =>
-                {
-                    return Task.FromResult(0);
-                });
-            });
-        var server = new TestServer(builder);
+            .Build();
+        var server = host.GetTestServer();
 
         // The HttpContext will be created and the logger will make sure that the HttpRequest exists and contains reasonable values
         var result = await server.CreateClient().GetStringAsync("/");

src/Hosting/TestHost/test/RequestBuilderTests.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AspNetCore.TestHost;
 
@@ -10,8 +11,15 @@ public class RequestBuilderTests
     [Fact]
     public void AddRequestHeader()
     {
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
         server.CreateRequest("/")
             .AddHeader("Host", "MyHost:90")
             .And(request =>
@@ -23,8 +31,15 @@ public void AddRequestHeader()
     [Fact]
     public void AddContentHeaders()
     {
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
         server.CreateRequest("/")
             .AddHeader("Content-Type", "Test/Value")
             .And(request =>
@@ -38,8 +53,15 @@ public void AddContentHeaders()
     public void TestServer_PropertyShouldHoldTestServerInstance()
     {
         // Arrange
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
 
         // Act
         var requestBuilder = server.CreateRequest("/");