Migrate to xUnit v3

Tsingis · Tsingis · commit ba15475b939e · 2025-01-26T12:10:22.000+02:00
diff --git a/Tests/Directory.Packages.props b/Tests/Directory.Packages.props
@@ -8,7 +8,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.v3" Version="1.0.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.5.0.109200"/>
   </ItemGroup>
diff --git a/Tests/IntegrationTests/ApiEndpointsTests.cs b/Tests/IntegrationTests/ApiEndpointsTests.cs
@@ -24,12 +24,12 @@ public class ApiEndpointsTests(ApiFixture fixture) : IClassFixture<ApiFixture>
     [MemberData(nameof(Cases))]
     public async Task LongestDownwardTrend(string? fromDate, string? toDate, HttpStatusCode status)
     {
-        var result = await _fixture.Client.GetAsync($"{BaseUrl}/longestdownwardtrend?fromDate={fromDate}&toDate={toDate}");
+        var result = await _fixture.Client.GetAsync($"{BaseUrl}/longestdownwardtrend?fromDate={fromDate}&toDate={toDate}", cancellationToken: TestContext.Current.CancellationToken);
         result.StatusCode.ShouldBeOneOf(status, HttpStatusCode.TooManyRequests);
 
         if (result.StatusCode == HttpStatusCode.OK)
         {
-            var data = await result.Content.ReadFromJsonAsync<LongestDownwardTrendResponse>();
+            var data = await result.Content.ReadFromJsonAsync<LongestDownwardTrendResponse>(cancellationToken: TestContext.Current.CancellationToken);
             data.ShouldNotBeNull();
         }
     }
@@ -38,12 +38,12 @@ public async Task LongestDownwardTrend(string? fromDate, string? toDate, HttpSta
     [MemberData(nameof(Cases))]
     public async Task HighestTradingVolume(string? fromDate, string? toDate, HttpStatusCode status)
     {
-        var result = await _fixture.Client.GetAsync($"{BaseUrl}/highestradingvolume?fromDate={fromDate}&toDate={toDate}");
+        var result = await _fixture.Client.GetAsync($"{BaseUrl}/highestradingvolume?fromDate={fromDate}&toDate={toDate}", cancellationToken: TestContext.Current.CancellationToken);
         result.StatusCode.ShouldBeOneOf(status, HttpStatusCode.TooManyRequests);
 
         if (result.StatusCode == HttpStatusCode.OK)
         {
-            var data = await result.Content.ReadFromJsonAsync<HighestTradingVolumeResponse>();
+            var data = await result.Content.ReadFromJsonAsync<HighestTradingVolumeResponse>(cancellationToken: TestContext.Current.CancellationToken);
             data.ShouldNotBeNull();
         }
     }
@@ -52,27 +52,27 @@ public async Task HighestTradingVolume(string? fromDate, string? toDate, HttpSta
     [MemberData(nameof(Cases))]
     public async Task BuyAndSell(string? fromDate, string? toDate, HttpStatusCode status)
     {
-        var result = await _fixture.Client.GetAsync($"{BaseUrl}/buyandsell?fromDate={fromDate}&toDate={toDate}");
+        var result = await _fixture.Client.GetAsync($"{BaseUrl}/buyandsell?fromDate={fromDate}&toDate={toDate}", cancellationToken: TestContext.Current.CancellationToken);
         result.StatusCode.ShouldBeOneOf(status, HttpStatusCode.TooManyRequests);
 
         if (result.StatusCode == HttpStatusCode.OK)
         {
-            var data = await result.Content.ReadFromJsonAsync<BuyAndSellResponse>();
+            var data = await result.Content.ReadFromJsonAsync<BuyAndSellResponse>(cancellationToken: TestContext.Current.CancellationToken);
             data.ShouldNotBeNull();
         }
     }
 
     [Fact]
     public async Task Swagger()
     {
-        var result = await _fixture.Client.GetAsync("/");
+        var result = await _fixture.Client.GetAsync("/", cancellationToken: TestContext.Current.CancellationToken);
         result.StatusCode.ShouldBe(HttpStatusCode.OK);
     }
 
     [Fact]
     public async Task Health()
     {
-        var result = await _fixture.Client.GetAsync("/health");
+        var result = await _fixture.Client.GetAsync("/health", cancellationToken: TestContext.Current.CancellationToken);
         result.StatusCode.ShouldBe(HttpStatusCode.OK);
     }
 }
diff --git a/Tests/IntegrationTests/IntegrationTests.csproj b/Tests/IntegrationTests/IntegrationTests.csproj
@@ -7,7 +7,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Shouldly" />
-    <PackageReference Include="xunit"/>
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Tests/UnitTests/UnitTests.csproj b/Tests/UnitTests/UnitTests.csproj
@@ -7,7 +7,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NSubstitute" />
     <PackageReference Include="Shouldly" />
-    <PackageReference Include="xunit"/>
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ public class ApiEndpointsTests(ApiFixture fixture) : IClassFixture<ApiFixture>`
`24`	`24`	`[MemberData(nameof(Cases))]`
`25`	`25`	`public async Task LongestDownwardTrend(string? fromDate, string? toDate, HttpStatusCode status)`
`26`	`26`	`{`
`27`		`- var result = await _fixture.Client.GetAsync($"{BaseUrl}/longestdownwardtrend?fromDate={fromDate}&toDate={toDate}");`
	`27`	`+ var result = await _fixture.Client.GetAsync($"{BaseUrl}/longestdownwardtrend?fromDate={fromDate}&toDate={toDate}", cancellationToken: TestContext.Current.CancellationToken);`
`28`	`28`	`result.StatusCode.ShouldBeOneOf(status, HttpStatusCode.TooManyRequests);`
`29`	`29`
`30`	`30`	`if (result.StatusCode == HttpStatusCode.OK)`
`31`	`31`	`{`
`32`		`- var data = await result.Content.ReadFromJsonAsync<LongestDownwardTrendResponse>();`
	`32`	`+ var data = await result.Content.ReadFromJsonAsync<LongestDownwardTrendResponse>(cancellationToken: TestContext.Current.CancellationToken);`
`33`	`33`	`data.ShouldNotBeNull();`
`34`	`34`	`}`
`35`	`35`	`}`
`@@ -38,12 +38,12 @@ public async Task LongestDownwardTrend(string? fromDate, string? toDate, HttpSta`
`38`	`38`	`[MemberData(nameof(Cases))]`
`39`	`39`	`public async Task HighestTradingVolume(string? fromDate, string? toDate, HttpStatusCode status)`
`40`	`40`	`{`
`41`		`- var result = await _fixture.Client.GetAsync($"{BaseUrl}/highestradingvolume?fromDate={fromDate}&toDate={toDate}");`
	`41`	`+ var result = await _fixture.Client.GetAsync($"{BaseUrl}/highestradingvolume?fromDate={fromDate}&toDate={toDate}", cancellationToken: TestContext.Current.CancellationToken);`
`42`	`42`	`result.StatusCode.ShouldBeOneOf(status, HttpStatusCode.TooManyRequests);`
`43`	`43`
`44`	`44`	`if (result.StatusCode == HttpStatusCode.OK)`
`45`	`45`	`{`
`46`		`- var data = await result.Content.ReadFromJsonAsync<HighestTradingVolumeResponse>();`
	`46`	`+ var data = await result.Content.ReadFromJsonAsync<HighestTradingVolumeResponse>(cancellationToken: TestContext.Current.CancellationToken);`
`47`	`47`	`data.ShouldNotBeNull();`
`48`	`48`	`}`
`49`	`49`	`}`
`@@ -52,27 +52,27 @@ public async Task HighestTradingVolume(string? fromDate, string? toDate, HttpSta`
`52`	`52`	`[MemberData(nameof(Cases))]`
`53`	`53`	`public async Task BuyAndSell(string? fromDate, string? toDate, HttpStatusCode status)`
`54`	`54`	`{`
`55`		`- var result = await _fixture.Client.GetAsync($"{BaseUrl}/buyandsell?fromDate={fromDate}&toDate={toDate}");`
	`55`	`+ var result = await _fixture.Client.GetAsync($"{BaseUrl}/buyandsell?fromDate={fromDate}&toDate={toDate}", cancellationToken: TestContext.Current.CancellationToken);`
`56`	`56`	`result.StatusCode.ShouldBeOneOf(status, HttpStatusCode.TooManyRequests);`
`57`	`57`
`58`	`58`	`if (result.StatusCode == HttpStatusCode.OK)`
`59`	`59`	`{`
`60`		`- var data = await result.Content.ReadFromJsonAsync<BuyAndSellResponse>();`
	`60`	`+ var data = await result.Content.ReadFromJsonAsync<BuyAndSellResponse>(cancellationToken: TestContext.Current.CancellationToken);`
`61`	`61`	`data.ShouldNotBeNull();`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`[Fact]`
`66`	`66`	`public async Task Swagger()`
`67`	`67`	`{`
`68`		`- var result = await _fixture.Client.GetAsync("/");`
	`68`	`+ var result = await _fixture.Client.GetAsync("/", cancellationToken: TestContext.Current.CancellationToken);`
`69`	`69`	`result.StatusCode.ShouldBe(HttpStatusCode.OK);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`[Fact]`
`73`	`73`	`public async Task Health()`
`74`	`74`	`{`
`75`		`- var result = await _fixture.Client.GetAsync("/health");`
	`75`	`+ var result = await _fixture.Client.GetAsync("/health", cancellationToken: TestContext.Current.CancellationToken);`
`76`	`76`	`result.StatusCode.ShouldBe(HttpStatusCode.OK);`
`77`	`77`	`}`
`78`	`78`	`}`