move to xunit v3 for transport integration tests

Mpdreamz · Mpdreamz · commit ba37577fb9a4 · 2025-11-12T21:56:18.000+01:00
diff --git a/tests/Elastic.Elasticsearch.IntegrationTests/Elastic.Elasticsearch.IntegrationTests.csproj b/tests/Elastic.Elasticsearch.IntegrationTests/Elastic.Elasticsearch.IntegrationTests.csproj
@@ -13,7 +13,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Elastic.Transport.IntegrationTests/Elastic.Transport.IntegrationTests.csproj b/tests/Elastic.Transport.IntegrationTests/Elastic.Transport.IntegrationTests.csproj
@@ -12,10 +12,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="Nullean.Xunit.Partitions" Version="0.10.0" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="xunit.v3" Version="3.2.0" />
+    <PackageReference Include="xunit.v3.extensibility.core" Version="3.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Elastic.Transport.IntegrationTests/Http/ApiCompatibilityHeaderTests.cs b/tests/Elastic.Transport.IntegrationTests/Http/ApiCompatibilityHeaderTests.cs
@@ -13,10 +13,8 @@
 
 namespace Elastic.Transport.IntegrationTests.Http;
 
-public class ApiCompatibilityHeaderTests : AssemblyServerTestsBase
+public class ApiCompatibilityHeaderTests(TestServerFixture instance) : AssemblyServerTestsBase(instance)
 {
-	public ApiCompatibilityHeaderTests(TransportTestServer instance) : base(instance) { }
-
 	[Fact]
 	public async Task AddsExpectedVendorInformationForRestApiCompaitbility()
 	{
@@ -38,7 +36,7 @@ public async Task AddsExpectedVendorInformationForRestApiCompaitbility()
 		var config = new TransportConfiguration(nodePool, requestInvoker, productRegistration: new ElasticsearchProductRegistration(typeof(Clients.Elasticsearch.ElasticsearchClient)));
 		var transport = new DistributedTransport(config);
 
-		var response = await transport.PostAsync<StringResponse>("/metaheader", PostData.String("{}"));
+		var response = await transport.PostAsync<StringResponse>("/metaheader", PostData.String("{}"), cancellationToken: TestContext.Current.CancellationToken);
 	}
 }
 
diff --git a/tests/Elastic.Transport.IntegrationTests/Http/TransferEncodingChunckedTests.cs b/tests/Elastic.Transport.IntegrationTests/Http/TransferEncodingChunckedTests.cs
@@ -23,7 +23,7 @@ public class ChunkedController : ControllerBase
 
 	public class NonParallelCollection { }
 	[CollectionDefinition(nameof(NonParallelCollection), DisableParallelization = true)]
-	public class TransferEncodingChunkedTests(TransportTestServer instance) : AssemblyServerTestsBase(instance)
+	public class TransferEncodingChunkedTests(TestServerFixture instance) : AssemblyServerTestsBase(instance)
 	{
 		private const string BodyString = "{\"query\":{\"match_all\":{}}}";
 		private static readonly PostData Body = PostData.String(BodyString);
@@ -46,8 +46,7 @@ private ITransport Setup(
 
 			config = disableAutomaticProxyDetection.HasValue
 				? config with { DisableAutomaticProxyDetection = disableAutomaticProxyDetection.Value }
-				//make sure we the requests in debugging proxy
-				: TransportTestServer.RerouteToProxyIfNeeded(config);
+				: config;
 
 			return new DistributedTransport(config);
 		}
diff --git a/tests/Elastic.Transport.IntegrationTests/OpenTelemetry/OpenTelemetryTests.cs b/tests/Elastic.Transport.IntegrationTests/OpenTelemetry/OpenTelemetryTests.cs
@@ -26,7 +26,7 @@ public class OpenTelemetryTests : AssemblyServerTestsBase
 	internal const string Cluster = "e9106fc68e3044f0b1475b04bf4ffd5f";
 	internal const string Instance = "instance-0000000001";
 
-	public OpenTelemetryTests(TransportTestServer instance) : base(instance) { }
+	public OpenTelemetryTests(TestServerFixture instance) : base(instance) { }
 
 	[Fact]
 	public async Task ElasticsearchTagsShouldBeSet_WhenUsingTheElasticsearchRegistration()
@@ -57,7 +57,7 @@ public async Task ElasticsearchTagsShouldBeSet_WhenUsingTheElasticsearchRegistra
 		};
 		ActivitySource.AddActivityListener(listener);
 
-		_ = await transport.GetAsync<VoidResponse>("/opentelemetry");
+		_ = await transport.GetAsync<VoidResponse>("/opentelemetry", cancellationToken: TestContext.Current.CancellationToken);
 
 		mre.WaitOne(TimeSpan.FromSeconds(1)).Should().BeTrue();
 
diff --git a/tests/Elastic.Transport.IntegrationTests/Plumbing/AssemblyServerTestsBase.cs b/tests/Elastic.Transport.IntegrationTests/Plumbing/AssemblyServerTestsBase.cs
@@ -2,19 +2,23 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using Nullean.Xunit.Partitions.Sdk;
+using Elastic.Transport.IntegrationTests.Plumbing;
+using Elastic.Transport.IntegrationTests.Plumbing.Examples;
 using Xunit;
 
+[assembly: CaptureConsole, AssemblyFixture(typeof(TestServerFixture))]
+[assembly: AssemblyFixture(typeof(BufferedServerFixture))]
+
 namespace Elastic.Transport.IntegrationTests.Plumbing
 {
 	public class AssemblyServerTestsBase<TServer>(TServer instance)
-		: IPartitionFixture<TServer>, IClassFixture<TServer> where TServer : class, HttpTransportTestServer, IPartitionLifetime
+		: IClassFixture<TServer> where TServer : class, IHttpTransportTestServer
 	{
 		protected TServer Server { get; } = instance;
 
 		protected ITransport RequestHandler => Server.DefaultRequestHandler;
 	}
 
-	public class AssemblyServerTestsBase(TransportTestServer instance)
-		: AssemblyServerTestsBase<TransportTestServer>(instance);
+	public class AssemblyServerTestsBase(TestServerFixture instance)
+		: AssemblyServerTestsBase<TestServerFixture>(instance);
 }
diff --git a/tests/Elastic.Transport.IntegrationTests/Plumbing/ClassServerTestsBase.cs b/tests/Elastic.Transport.IntegrationTests/Plumbing/ClassServerTestsBase.cs
@@ -6,7 +6,8 @@
 
 namespace Elastic.Transport.IntegrationTests.Plumbing
 {
-	public class ClassServerTestsBase<TServer>(TServer instance) : IClassFixture<TServer> where TServer : class, HttpTransportTestServer
+	public class ClassServerTestsBase<TServer>(TServer instance)
+		where TServer : class, IHttpTransportTestServer
 	{
 		protected TServer Server { get; } = instance;
 
diff --git a/tests/Elastic.Transport.IntegrationTests/Plumbing/Examples/ControllerIntegrationTests.cs b/tests/Elastic.Transport.IntegrationTests/Plumbing/Examples/ControllerIntegrationTests.cs
@@ -19,14 +19,13 @@ namespace Elastic.Transport.IntegrationTests.Plumbing.Examples
 	/// Tests that the test framework loads a controller and the exposed transport can talk to its endpoints.
 	/// Tests runs against a server that started up once and its server instance shared among many test classes
 	/// </summary>
-	public class ControllerIntegrationTests : AssemblyServerTestsBase
+	public class ControllerIntegrationTests(BufferedServerFixture instance)
+		: AssemblyServerTestsBase<BufferedServerFixture>(instance)
 	{
-		public ControllerIntegrationTests(TransportTestServer instance) : base(instance) { }
-
 		[Fact]
 		public async Task CanCallIntoController()
 		{
-			var response = await RequestHandler.GetAsync<StringResponse>("/dummy/20");
+			var response = await RequestHandler.GetAsync<StringResponse>("/dummy/20", cancellationToken: TestContext.Current.CancellationToken);
 			response.ApiCallDetails.HasSuccessfulStatusCode.Should().BeTrue("{0}", response.ApiCallDetails.DebugInformation);
 		}
 	}
diff --git a/tests/Elastic.Transport.IntegrationTests/Plumbing/Examples/EndpointIntegrationTests.cs b/tests/Elastic.Transport.IntegrationTests/Plumbing/Examples/EndpointIntegrationTests.cs
@@ -17,21 +17,21 @@ namespace Elastic.Transport.IntegrationTests.Plumbing.Examples
 	/// Since it extends <see cref="ClassServerTestsBase{TServer}"/> it server is only shared between the tests inside this class.
 	/// The server is also started and stopped after all the tests in this class run.
 	/// </summary>
-	public class EndpointIntegrationTests : ClassServerTestsBase<TransportTestServer<DummyStartup>>
+	public class EndpointIntegrationTests(BufferedServerFixture instance)
+		: ClassServerTestsBase<BufferedServerFixture>(instance)
 	{
-		public EndpointIntegrationTests(TransportTestServer<DummyStartup> instance) : base(instance) { }
-
 		[Fact]
 		public async Task CanCallIntoEndpoint()
 		{
-			var response = await RequestHandler.GetAsync<StringResponse>(DummyStartup.Endpoint);
+			var response = await RequestHandler.GetAsync<StringResponse>(BufferedStartup.Endpoint, cancellationToken: TestContext.Current.CancellationToken);
 			response.ApiCallDetails.HasSuccessfulStatusCode.Should().BeTrue("{0}", response.ApiCallDetails.DebugInformation);
 		}
 	}
 
-	public class DummyStartup : DefaultStartup
+	public class BufferedServerFixture : TransportTestServer<BufferedStartup>;
+	public class BufferedStartup : DefaultStartup
 	{
-		public DummyStartup(IConfiguration configuration) : base(configuration) { }
+		public BufferedStartup(IConfiguration configuration) : base(configuration) { }
 
 		public static string Endpoint { get; } = "buffered";
 
diff --git a/tests/Elastic.Transport.IntegrationTests/Plumbing/Setup.cs b/tests/Elastic.Transport.IntegrationTests/Plumbing/Setup.cs
diff --git a/tests/Elastic.Transport.IntegrationTests/Plumbing/TransportTestServer.cs b/tests/Elastic.Transport.IntegrationTests/Plumbing/TransportTestServer.cs
@@ -10,45 +10,31 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
-using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Nullean.Xunit.Partitions.Sdk;
 using Xunit;
 
 namespace Elastic.Transport.IntegrationTests.Plumbing
 {
-	public interface HttpTransportTestServer
+	public interface IHttpTransportTestServer
 	{
 		Uri Uri { get;  }
 
 		ITransport DefaultRequestHandler { get;  }
 	}
 
-	public class TransportTestServer : TransportTestServer<DefaultStartup>
-	{
-		private static readonly bool RunningMitmProxy = Process.GetProcessesByName("mitmproxy").Any();
-		private static readonly bool RunningFiddler = Process.GetProcessesByName("fiddler").Any();
-		private static string Localhost => "127.0.0.1";
-		public static string LocalOrProxyHost => RunningFiddler || RunningMitmProxy ? "ipv4.fiddler" : Localhost;
-		public static TransportConfiguration RerouteToProxyIfNeeded(TransportConfiguration config)
-		{
-			if (!RunningMitmProxy) return config;
+	public class TestServerFixture : TransportTestServer<DefaultStartup>;
 
-			return config with { ProxyAddress = "http://127.0.0.1:8080" };
-		}
-	}
-
-	public class TransportTestServer<TStartup> : HttpTransportTestServer, IDisposable, IAsyncDisposable, IPartitionLifetime
+	public abstract class TransportTestServer<TStartup> : IHttpTransportTestServer, IDisposable, IAsyncLifetime
 		where TStartup : class
 	{
 		private readonly IHost _host;
 		private readonly IServer _server;
 
 		public TransportTestServer()
 		{
-			var url = $"http://{TransportTestServer.LocalOrProxyHost}:0";
+			var url = $"http://127.0.0.1:0";
 
 			var configuration =
 				new ConfigurationBuilder()
@@ -78,25 +64,21 @@ public ITransport DefaultRequestHandler
 			private set;
 		}
 
-		public async Task<TransportTestServer<TStartup>> StartAsync(CancellationToken token = default)
+		public async ValueTask StartAsync(CancellationToken token = default)
 		{
 			await _host.StartAsync(token);
 			var port = _server.GetServerPort();
-			var url = $"http://{TransportTestServer.LocalOrProxyHost}:{port}";
+			var url = $"http://127.0.0.1:{port}";
 			Uri = new Uri(url);
 			DefaultRequestHandler = CreateTransport(c => new DistributedTransport(c));
-			return this;
 		}
 
 		public ITransport CreateTransport(Func<TransportConfiguration, ITransport> create) =>
-			create(TransportTestServer.RerouteToProxyIfNeeded(new TransportConfiguration(Uri)));
+			create(new TransportConfiguration(Uri));
 
 		public void Dispose() => _host?.Dispose();
 
-		public Task InitializeAsync() => StartAsync();
-
-		Task IAsyncLifetime.DisposeAsync() => DisposeAsync().AsTask();
-
+		public ValueTask InitializeAsync() => StartAsync();
 
 		public ValueTask DisposeAsync()
 		{
diff --git a/tests/Elastic.Transport.IntegrationTests/Responses/SpecialisedResponseTests.cs b/tests/Elastic.Transport.IntegrationTests/Responses/SpecialisedResponseTests.cs

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,8 @@`
`13`	`13`
`14`	`14`	`namespace Elastic.Transport.IntegrationTests.Http;`
`15`	`15`
`16`		`-public class ApiCompatibilityHeaderTests : AssemblyServerTestsBase`
	`16`	`+public class ApiCompatibilityHeaderTests(TestServerFixture instance) : AssemblyServerTestsBase(instance)`
`17`	`17`	`{`
`18`		`- public ApiCompatibilityHeaderTests(TransportTestServer instance) : base(instance) { }`
`19`		`-`
`20`	`18`	`[Fact]`
`21`	`19`	`public async Task AddsExpectedVendorInformationForRestApiCompaitbility()`
`22`	`20`	`{`
`@@ -38,7 +36,7 @@ public async Task AddsExpectedVendorInformationForRestApiCompaitbility()`
`38`	`36`	`var config = new TransportConfiguration(nodePool, requestInvoker, productRegistration: new ElasticsearchProductRegistration(typeof(Clients.Elasticsearch.ElasticsearchClient)));`
`39`	`37`	`var transport = new DistributedTransport(config);`
`40`	`38`
`41`		`- var response = await transport.PostAsync<StringResponse>("/metaheader", PostData.String("{}"));`
	`39`	`+ var response = await transport.PostAsync<StringResponse>("/metaheader", PostData.String("{}"), cancellationToken: TestContext.Current.CancellationToken);`
`42`	`40`	`}`
`43`	`41`	`}`
`44`	`42`
Original file line number	Diff line number	Diff line change
`@@ -2,19 +2,23 @@`
`2`	`2`	`// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.`
`3`	`3`	`// See the LICENSE file in the project root for more information`
`4`	`4`
`5`		`-using Nullean.Xunit.Partitions.Sdk;`
	`5`	`+using Elastic.Transport.IntegrationTests.Plumbing;`
	`6`	`+using Elastic.Transport.IntegrationTests.Plumbing.Examples;`
`6`	`7`	`using Xunit;`
`7`	`8`
	`9`	`+[assembly: CaptureConsole, AssemblyFixture(typeof(TestServerFixture))]`
	`10`	`+[assembly: AssemblyFixture(typeof(BufferedServerFixture))]`
	`11`	`+`
`8`	`12`	`namespace Elastic.Transport.IntegrationTests.Plumbing`
`9`	`13`	`{`
`10`	`14`	`public class AssemblyServerTestsBase<TServer>(TServer instance)`
`11`		`- : IPartitionFixture<TServer>, IClassFixture<TServer> where TServer : class, HttpTransportTestServer, IPartitionLifetime`
	`15`	`+ : IClassFixture<TServer> where TServer : class, IHttpTransportTestServer`
`12`	`16`	`{`
`13`	`17`	`protected TServer Server { get; } = instance;`
`14`	`18`
`15`	`19`	`protected ITransport RequestHandler => Server.DefaultRequestHandler;`
`16`	`20`	`}`
`17`	`21`
`18`		`- public class AssemblyServerTestsBase(TransportTestServer instance)`
`19`		`- : AssemblyServerTestsBase<TransportTestServer>(instance);`
	`22`	`+ public class AssemblyServerTestsBase(TestServerFixture instance)`
	`23`	`+ : AssemblyServerTestsBase<TestServerFixture>(instance);`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace Elastic.Transport.IntegrationTests.Plumbing`
`8`	`8`	`{`
`9`		`- public class ClassServerTestsBase<TServer>(TServer instance) : IClassFixture<TServer> where TServer : class, HttpTransportTestServer`
	`9`	`+ public class ClassServerTestsBase<TServer>(TServer instance)`
	`10`	`+ where TServer : class, IHttpTransportTestServer`
`10`	`11`	`{`
`11`	`12`	`protected TServer Server { get; } = instance;`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,13 @@ namespace Elastic.Transport.IntegrationTests.Plumbing.Examples`
`19`	`19`	`/// Tests that the test framework loads a controller and the exposed transport can talk to its endpoints.`
`20`	`20`	`/// Tests runs against a server that started up once and its server instance shared among many test classes`
`21`	`21`	`/// </summary>`
`22`		`- public class ControllerIntegrationTests : AssemblyServerTestsBase`
	`22`	`+ public class ControllerIntegrationTests(BufferedServerFixture instance)`
	`23`	`+ : AssemblyServerTestsBase<BufferedServerFixture>(instance)`
`23`	`24`	`{`
`24`		`- public ControllerIntegrationTests(TransportTestServer instance) : base(instance) { }`
`25`		`-`
`26`	`25`	`[Fact]`
`27`	`26`	`public async Task CanCallIntoController()`
`28`	`27`	`{`
`29`		`- var response = await RequestHandler.GetAsync<StringResponse>("/dummy/20");`
	`28`	`+ var response = await RequestHandler.GetAsync<StringResponse>("/dummy/20", cancellationToken: TestContext.Current.CancellationToken);`
`30`	`29`	`response.ApiCallDetails.HasSuccessfulStatusCode.Should().BeTrue("{0}", response.ApiCallDetails.DebugInformation);`
`31`	`30`	`}`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,21 +17,21 @@ namespace Elastic.Transport.IntegrationTests.Plumbing.Examples`
`17`	`17`	`/// Since it extends <see cref="ClassServerTestsBase{TServer}"/> it server is only shared between the tests inside this class.`
`18`	`18`	`/// The server is also started and stopped after all the tests in this class run.`
`19`	`19`	`/// </summary>`
`20`		`- public class EndpointIntegrationTests : ClassServerTestsBase<TransportTestServer<DummyStartup>>`
	`20`	`+ public class EndpointIntegrationTests(BufferedServerFixture instance)`
	`21`	`+ : ClassServerTestsBase<BufferedServerFixture>(instance)`
`21`	`22`	`{`
`22`		`- public EndpointIntegrationTests(TransportTestServer<DummyStartup> instance) : base(instance) { }`
`23`		`-`
`24`	`23`	`[Fact]`
`25`	`24`	`public async Task CanCallIntoEndpoint()`
`26`	`25`	`{`
`27`		`- var response = await RequestHandler.GetAsync<StringResponse>(DummyStartup.Endpoint);`
	`26`	`+ var response = await RequestHandler.GetAsync<StringResponse>(BufferedStartup.Endpoint, cancellationToken: TestContext.Current.CancellationToken);`
`28`	`27`	`response.ApiCallDetails.HasSuccessfulStatusCode.Should().BeTrue("{0}", response.ApiCallDetails.DebugInformation);`
`29`	`28`	`}`
`30`	`29`	`}`
`31`	`30`
`32`		`- public class DummyStartup : DefaultStartup`
	`31`	`+ public class BufferedServerFixture : TransportTestServer<BufferedStartup>;`
	`32`	`+ public class BufferedStartup : DefaultStartup`
`33`	`33`	`{`
`34`		`- public DummyStartup(IConfiguration configuration) : base(configuration) { }`
	`34`	`+ public BufferedStartup(IConfiguration configuration) : base(configuration) { }`
`35`	`35`
`36`	`36`	`public static string Endpoint { get; } = "buffered";`
`37`	`37`