Fix HTTP/3 test errors on .NET 6 (#2423)

grpc · Apr 29, 2024 · 8199f66 · 8199f66
1 parent 2d9df58
commit 8199f66
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 29 deletions.
diff --git a/test/FunctionalTests/Client/ClientFactoryTests.cs b/test/FunctionalTests/Client/ClientFactoryTests.cs
@@ -1,4 +1,4 @@
-#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -81,7 +81,7 @@ Task<HelloReply> UnaryCall(HelloRequest request, ServerCallContext context)
         Assert.AreEqual("Hello world", response2.Message);
     }
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Test]
     [RequireHttp3]
     public async Task ClientFactory_Http3_Success()

diff --git a/test/FunctionalTests/Client/ConnectionTests.cs b/test/FunctionalTests/Client/ConnectionTests.cs
@@ -98,7 +98,7 @@ Task<HelloReply> UnaryUds(HelloRequest request, ServerCallContext context)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Test]
     [RequireHttp3]
     public async Task Http3()

diff --git a/test/FunctionalTests/Web/Client/AuthTests.cs b/test/FunctionalTests/Web/Client/AuthTests.cs
@@ -28,16 +28,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
 
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
 #endif
 public class AuthTests : GrpcWebFunctionalTestBase

diff --git a/test/FunctionalTests/Web/Client/ClientFactoryTests.cs b/test/FunctionalTests/Web/Client/ClientFactoryTests.cs
@@ -28,16 +28,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
 
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
 #endif
 public class ClientFactoryTests : GrpcWebFunctionalTestBase

diff --git a/test/FunctionalTests/Web/Client/ConnectionTests.cs b/test/FunctionalTests/Web/Client/ConnectionTests.cs
@@ -72,7 +72,7 @@ private GrpcChannel CreateGrpcWebChannel(TestServerEndpointName endpointName, Ve
     [TestCase(TestServerEndpointName.Http2WithTls, "1.1", false)]
 #endif
     [TestCase(TestServerEndpointName.Http2WithTls, null, true)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [TestCase(TestServerEndpointName.Http3WithTls, null, true)]
 #endif
     public async Task SendValidRequest_WithConnectionOptions(TestServerEndpointName endpointName, string? version, bool success)

diff --git a/test/FunctionalTests/Web/Client/IssueTests.cs b/test/FunctionalTests/Web/Client/IssueTests.cs
@@ -27,16 +27,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
 
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
 #endif
 public class IssueTests : GrpcWebFunctionalTestBase

diff --git a/test/FunctionalTests/Web/Client/ServerStreamingMethodTests.cs b/test/FunctionalTests/Web/Client/ServerStreamingMethodTests.cs
@@ -29,16 +29,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
 
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
 #endif
 public class ServerStreamingMethodTests : GrpcWebFunctionalTestBase

diff --git a/test/FunctionalTests/Web/Client/TrailerMetadataTests.cs b/test/FunctionalTests/Web/Client/TrailerMetadataTests.cs
@@ -1,4 +1,4 @@
-#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -26,16 +26,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
 
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
 #endif
 public class TrailerMetadataTests : GrpcWebFunctionalTestBase

diff --git a/test/FunctionalTests/Web/Client/UnaryMethodTests.cs b/test/FunctionalTests/Web/Client/UnaryMethodTests.cs
@@ -26,16 +26,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
 
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
 #endif
 public class UnaryMethodTests : GrpcWebFunctionalTestBase

diff --git a/test/FunctionalTests/Web/Server/DeadlineTests.cs b/test/FunctionalTests/Web/Server/DeadlineTests.cs
@@ -28,16 +28,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Server;
 
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
 #endif
 public class DeadlineTests : GrpcWebFunctionalTestBase

diff --git a/test/FunctionalTests/Web/Server/UnaryMethodTests.cs b/test/FunctionalTests/Web/Server/UnaryMethodTests.cs
@@ -27,16 +27,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Server;
 
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
 #endif
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 [TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
 #endif
 public class UnaryMethodTests : GrpcWebFunctionalTestBase