Fix tests

Cysharp · Sep 18, 2024 · c7deb79 · c7deb79
1 parent 9d4165a
commit c7deb79
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 92 deletions.
diff --git a/test/YetAnotherHttpHandler.Test/ClientCertificateTest.cs b/test/YetAnotherHttpHandler.Test/ClientCertificateTest.cs
@@ -41,7 +41,7 @@ public async Task NotSet()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new YetAnotherHttpHandler()
+        using var httpHandler = new YetAnotherHttpHandler()
         {
             //ClientAuthCertificates = File.ReadAllText("./Certificates/client.crt"),
             //ClientAuthKey = File.ReadAllText("./Certificates/client.key"),
@@ -63,7 +63,7 @@ public async Task UseClientCertificate()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new YetAnotherHttpHandler()
+        using var httpHandler = new YetAnotherHttpHandler()
         {
             ClientAuthCertificates = File.ReadAllText("./Certificates/client.crt"),
             ClientAuthKey = File.ReadAllText("./Certificates/client.key"),
@@ -85,7 +85,7 @@ public async Task Invalid()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new YetAnotherHttpHandler()
+        using var httpHandler = new YetAnotherHttpHandler()
         {
             ClientAuthCertificates = File.ReadAllText("./Certificates/client_unknown.crt"), // CN=unknown.example.com
             ClientAuthKey = File.ReadAllText("./Certificates/client_unknown.key"),
@@ -106,7 +106,7 @@ public async Task Reference_SocketHttpHandler_NotSet()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new SocketsHttpHandler();
+        using var httpHandler = new SocketsHttpHandler();
         httpHandler.SslOptions.RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => true;
         var httpClient = new HttpClient(httpHandler);
 
@@ -123,7 +123,7 @@ public async Task Reference_SocketHttpHandler_UseClientCertificate()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new SocketsHttpHandler();
+        using var httpHandler = new SocketsHttpHandler();
         httpHandler.SslOptions.RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => true;
         httpHandler.SslOptions.ClientCertificates = new X509CertificateCollection()
         {
@@ -145,7 +145,7 @@ public async Task Reference_SocketHttpHandler_Invalid()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new SocketsHttpHandler();
+        using var httpHandler = new SocketsHttpHandler();
         httpHandler.SslOptions.RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => true;
         httpHandler.SslOptions.ClientCertificates = new X509CertificateCollection()
         {

diff --git a/test/YetAnotherHttpHandler.Test/Http1Test.cs b/test/YetAnotherHttpHandler.Test/Http1Test.cs
@@ -1,18 +1,11 @@
 using System.IO.Pipelines;
 using System.Net;
-using System.Runtime.ExceptionServices;
-using _YetAnotherHttpHandler.Test.Helpers;
 using Xunit.Abstractions;
-using Xunit.Sdk;
 
 namespace _YetAnotherHttpHandler.Test;
 
-public class Http1Test : UseTestServerTestBase
+public class Http1Test(ITestOutputHelper testOutputHelper) : UseTestServerTestBase(testOutputHelper)
 {
-    public Http1Test(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
-    {
-    }
-
     [Fact]
     public async Task FailedToConnect()
     {

diff --git a/test/YetAnotherHttpHandler.Test/Http2ClearTextTest.cs b/test/YetAnotherHttpHandler.Test/Http2ClearTextTest.cs
@@ -5,12 +5,8 @@
 
 namespace _YetAnotherHttpHandler.Test;
 
-public class Http2ClearTextTest : Http2TestBase
+public class Http2ClearTextTest(ITestOutputHelper testOutputHelper) : Http2TestBase(testOutputHelper)
 {
-    public Http2ClearTextTest(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
-    {
-    }
-
     protected override YetAnotherHttpHandler CreateHandler()
     {
         return new YetAnotherHttpHandler() { Http2Only = true };

diff --git a/test/YetAnotherHttpHandler.Test/Http2Test.cs b/test/YetAnotherHttpHandler.Test/Http2Test.cs
@@ -8,12 +8,8 @@
 namespace _YetAnotherHttpHandler.Test;
 
 [OSSkipCondition(OperatingSystems.MacOSX)] // .NET 7 or earlier does not support ALPN on macOS.
-public class Http2Test : Http2TestBase
+public class Http2Test(ITestOutputHelper testOutputHelper) : Http2TestBase(testOutputHelper)
 {
-    public Http2Test(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
-    {
-    }
-
     protected override YetAnotherHttpHandler CreateHandler()
     {
         // Use self-signed certificate for testing purpose.
@@ -47,7 +43,7 @@ public async Task SelfSignedCertificate_NotTrusted()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new YetAnotherHttpHandler() { SkipCertificateVerification = false }; // We need to verify server certificate.
+        using var httpHandler = new YetAnotherHttpHandler() { SkipCertificateVerification = false }; // We need to verify server certificate.
         var httpClient = new HttpClient(httpHandler);
 
         // Act
@@ -63,7 +59,7 @@ public async Task SelfSignedCertificate_NotTrusted_SkipValidation()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new YetAnotherHttpHandler() { SkipCertificateVerification = true };
+        using var httpHandler = new YetAnotherHttpHandler() { SkipCertificateVerification = true };
         var httpClient = new HttpClient(httpHandler);
 
         // Act
@@ -80,7 +76,7 @@ public async Task SelfSignedCertificate_Trusted_CustomRootCA()
     {
         // Arrange
         await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-        var httpHandler = new YetAnotherHttpHandler()
+        using var httpHandler = new YetAnotherHttpHandler()
         {
             // We need to verify server certificate.
             SkipCertificateVerification = false,

diff --git a/test/YetAnotherHttpHandler.Test/Http2TestBase.cs b/test/YetAnotherHttpHandler.Test/Http2TestBase.cs
@@ -10,12 +10,8 @@
 
 namespace _YetAnotherHttpHandler.Test;
 
-public abstract class Http2TestBase : UseTestServerTestBase
+public abstract class Http2TestBase(ITestOutputHelper testOutputHelper) : UseTestServerTestBase(testOutputHelper)
 {
-    protected Http2TestBase(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
-    {
-    }
-
     protected abstract YetAnotherHttpHandler CreateHandler();
     protected abstract Task<TestWebAppServer> LaunchServerAsyncCore<T>(Action<WebApplicationBuilder>? configure = null) where T : ITestServerBuilder;
 
@@ -424,65 +420,6 @@ public async Task Cancel_Post_BeforeRequest()
 #endif
     }
 
-
-    [ConditionalFact]
-    public async Task DisposeHandler_During_SendBuffer_Is_Full()
-    {
-        var runtimeHandle = NativeRuntime.Instance.Acquire();
-
-        // To prevent references remaining from local variables, make it a local function.
-        async Task RunAsync()
-        {
-            // Arrange
-            var httpHandler = CreateHandler();
-            var httpClient = new HttpClient(httpHandler);
-            await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>();
-
-            // Act
-            var pipe = new Pipe();
-            var writeTask = Task.Run(async () =>
-            {
-                var buffer = new byte[1024 * 1024];
-                while (true)
-                {
-                    await pipe.Writer.WriteAsync(buffer);
-                }
-            });
-            var content = new StreamContent(pipe.Reader.AsStream());
-            content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/octet-stream");
-            var request = new HttpRequestMessage(HttpMethod.Post, $"{server.BaseUri}/post-never-read")
-            {
-                Version = HttpVersion.Version20,
-                Content = content,
-            };
-            var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).WaitAsync(TimeoutToken);
-            await Task.Delay(TimeSpan.FromSeconds(5)); // Wait for the send buffer to overflow.
-
-            // Decrease the reference count of manually held internal handles for direct observation.
-            NativeRuntime.Instance.Release();
-
-            // Dispose all related resources.
-            request.Dispose();
-            response.Dispose();
-            httpHandler.Dispose();
-            httpClient.Dispose();
-        }
-
-        await RunAsync();
-
-        // Run Finalizer.
-        await Task.Delay(100);
-        GC.Collect();
-        GC.Collect();
-        GC.Collect();
-        GC.Collect();
-        await Task.Delay(100);
-
-        // Assert
-        Assert.Equal(0, NativeRuntime.Instance._refCount);
-        Assert.True(runtimeHandle.IsClosed);
-    }
-
     [ConditionalFact]
     public async Task Grpc_Unary()
     {

diff --git a/test/YetAnotherHttpHandler.Test/YetAnotherHttpHandlerTest.cs b/test/YetAnotherHttpHandler.Test/YetAnotherHttpHandlerTest.cs
@@ -1,8 +1,16 @@
 using Cysharp.Net.Http;
+using System.IO.Pipelines;
+using System.Net;
+using System.Net.Http.Headers;
+using Xunit.Abstractions;
 
 namespace _YetAnotherHttpHandler.Test;
 
-public class YetAnotherHttpHandlerTest
+[CollectionDefinition(nameof(YetAnotherHttpHandlerTest), DisableParallelization = true)]
+public class YetAnotherHttpHandlerTestCollection;
+
+[Collection(nameof(YetAnotherHttpHandlerTest))]
+public class YetAnotherHttpHandlerTest(ITestOutputHelper testOutputHelper) : UseTestServerTestBase(testOutputHelper)
 {
     [Fact]
     public async Task Disposed()
@@ -18,4 +26,68 @@ public async Task Disposed()
         // Assert
         Assert.IsType<ObjectDisposedException>(ex);
     }
+
+    [Fact]
+    public async Task DisposeHandler_During_SendBuffer_Is_Full()
+    {
+        GC.Collect();
+        GC.Collect();
+        GC.Collect();
+        GC.Collect();
+
+        var runtimeHandle = NativeRuntime.Instance.Acquire();
+
+        // To prevent references remaining from local variables, make it a local function.
+        async Task RunAsync()
+        {
+            // Arrange
+            var httpHandler = new YetAnotherHttpHandler() { Http2Only = true };
+            var httpClient = new HttpClient(httpHandler);
+            await using var server = await LaunchServerAsync<TestServerForHttp1AndHttp2>(TestWebAppServerListenMode.InsecureHttp2Only);
+
+            // Act
+            var pipe = new Pipe();
+            var writeTask = Task.Run(async () =>
+            {
+                var buffer = new byte[1024 * 1024];
+                while (true)
+                {
+                    await pipe.Writer.WriteAsync(buffer);
+                }
+            });
+            var content = new StreamContent(pipe.Reader.AsStream());
+            content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/octet-stream");
+            var request = new HttpRequestMessage(HttpMethod.Post, $"{server.BaseUri}/post-never-read")
+            {
+                Version = HttpVersion.Version20,
+                Content = content,
+            };
+            var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).WaitAsync(TimeoutToken);
+            await Task.Delay(TimeSpan.FromSeconds(5)); // Wait for the send buffer to overflow.
+
+            // Decrease the reference count of manually held internal handles for direct observation.
+            NativeRuntime.Instance.Release();
+
+            // Dispose all related resources.
+            request.Dispose();
+            response.Dispose();
+            httpHandler.Dispose();
+            httpClient.Dispose();
+        }
+
+        await RunAsync();
+
+        // Run Finalizer.
+        await Task.Delay(100);
+        GC.Collect();
+        GC.Collect();
+        GC.Collect();
+        GC.Collect();
+        await Task.Delay(100);
+
+        // Assert
+        Assert.Equal(0, NativeRuntime.Instance._refCount);
+        Assert.True(runtimeHandle.IsClosed);
+    }
+
 }