Use HttpClientTestServer

Author: mayuki

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/HttpClientTestServer"]
+	path = external/HttpClientTestServer
+	url = https://github.com/Cysharp/HttpClientTestServer.git

YetAnotherHttpHandler.slnx

@@ -17,5 +17,10 @@
     <Project Path="test/YetAnotherHttpHandler.StandaloneTestServer/YetAnotherHttpHandler.StandaloneTestServer.csproj" />
     <Project Path="test/YetAnotherHttpHandler.Test/YetAnotherHttpHandler.Test.csproj" />
   </Folder>
+  <Folder Name="/tests/external/">
+    <Project Path="external/HttpClientTestServer/src/HttpClientTestServer.Abstractions/HttpClientTestServer.Abstractions.csproj" />
+    <Project Path="external/HttpClientTestServer/src/HttpClientTestServer.Launcher.Container/HttpClientTestServer.Launcher.Container.csproj" />
+    <Project Path="external/HttpClientTestServer/src/HttpClientTestServer/HttpClientTestServer.csproj" />
+  </Folder>
   <Project Path="src/YetAnotherHttpHandler/YetAnotherHttpHandler.csproj" />
 </Solution>

external/HttpClientTestServer

@@ -15,7 +15,7 @@ public async Task FlushTest(int size)
     {
         using var httpHandler = new YetAnotherHttpHandler();
         using var client = new HttpClient(httpHandler);
-        await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>(TestWebAppServerListenMode.InsecureHttp1Only);
+        await using var server = await LaunchServerAsync(TestServerListenMode.InsecureHttp1Only);
 
         var numRequests = Environment.ProcessorCount + 1; // more than the number of tokio worker threads
 
@@ -36,4 +36,4 @@ public async Task FlushTest(int size)
 
         foreach (var stream in pendingStreams) await stream.DisposeAsync();
     }
-}
+}

test/YetAnotherHttpHandler.Test/BackPressureTest.cs

@@ -1,8 +1,6 @@
-using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.X509Certificates;
 using Cysharp.Net.Http;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Server.Kestrel.Https;
+using HttpClientTestServer;
 
 namespace _YetAnotherHttpHandler.Test;
 
@@ -12,34 +10,14 @@ public ClientCertificateTest(ITestOutputHelper testOutputHelper) : base(testOutp
     {
     }
 
-    protected Task<TestWebAppServer> LaunchServerAsync<T>(Action<WebApplicationBuilder>? configure = null)
-        where T : ITestServerBuilder
-    {
-        return LaunchServerAsync<T>(TestWebAppServerListenMode.SecureHttp1AndHttp2, builder =>
-        {
-            // Use self-signed certificate for testing purpose.
-            builder.WebHost.ConfigureKestrel(options =>
-            {
-                options.ConfigureHttpsDefaults(options =>
-                {
-                    options.ServerCertificate = new X509Certificate2("Certificates/localhost.pfx");
-                    options.ClientCertificateMode = ClientCertificateMode.RequireCertificate;
-                    options.ClientCertificateValidation = (certificate2, chain, policyError) =>
-                    {
-                        return certificate2.Subject == "CN=client.example.com";
-                    };
-                });
-            });
-
-            configure?.Invoke(builder);
-        });
-    }
+    protected Task<ITestServer> LaunchServerAsync()
+        => LaunchServerAsync(new TestServerOptions(ListenHttpProtocols.Http1AndHttp2, isSecure: true) { EnableClientCertificateValidation = true });
 
     [Fact]
     public async Task NotSet()
     {
         // Arrange
-        await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
+        await using var server = await LaunchServerAsync();
         using var httpHandler = new YetAnotherHttpHandler()
         {
             //ClientAuthCertificates = File.ReadAllText("./Certificates/client.crt"),
@@ -61,7 +39,7 @@ public async Task NotSet()
     public async Task UseClientCertificate()
     {
         // Arrange
-        await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
+        await using var server = await LaunchServerAsync();
         using var httpHandler = new YetAnotherHttpHandler()
         {
             ClientAuthCertificates = File.ReadAllText("./Certificates/client.crt"),
@@ -78,12 +56,12 @@ public async Task UseClientCertificate()
         // Assert
         Assert.Equal("__OK__", result);
     }
-    
+
     [Fact]
     public async Task Invalid()
     {
         // Arrange
-        await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
+        await using var server = await LaunchServerAsync();
         using var httpHandler = new YetAnotherHttpHandler()
         {
             ClientAuthCertificates = File.ReadAllText("./Certificates/client_unknown.crt"), // CN=unknown.example.com
@@ -104,7 +82,7 @@ public async Task Invalid()
     public async Task Reference_SocketHttpHandler_NotSet()
     {
         // Arrange
-        await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
+        await using var server = await LaunchServerAsync();
         using var httpHandler = new SocketsHttpHandler();
         httpHandler.SslOptions.RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => true;
         var httpClient = new HttpClient(httpHandler);
@@ -121,7 +99,7 @@ public async Task Reference_SocketHttpHandler_NotSet()
     public async Task Reference_SocketHttpHandler_UseClientCertificate()
     {
         // Arrange
-        await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
+        await using var server = await LaunchServerAsync();
         using var httpHandler = new SocketsHttpHandler();
         httpHandler.SslOptions.RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => true;
         httpHandler.SslOptions.ClientCertificates = new X509CertificateCollection()
@@ -143,7 +121,7 @@ public async Task Reference_SocketHttpHandler_UseClientCertificate()
     public async Task Reference_SocketHttpHandler_Invalid()
     {
         // Arrange
-        await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
+        await using var server = await LaunchServerAsync();
         using var httpHandler = new SocketsHttpHandler();
         httpHandler.SslOptions.RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => true;
         httpHandler.SslOptions.ClientCertificates = new X509CertificateCollection()
@@ -159,4 +137,4 @@ public async Task Reference_SocketHttpHandler_Invalid()
         // Assert
         Assert.IsType<HttpRequestException>(ex);
     }
-}
+}