fix: upgrade xunit to 2.5.2

egil · egil · commit 5a6f8b512880 · 2023-10-14T10:22:42.000Z
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -24,16 +24,6 @@
 		<PackageReference Include="Xunit.Combinatorial" Version="1.6.24" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<!-- DO NOT UPGRADE TO versions > 2.4.2 as they do not support .net5 or older -->
-		<PackageReference Include="xunit" Version="2.4.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-			<NoWarn>NU1701</NoWarn>
-		</PackageReference>
-	</ItemGroup>
-
 	<ItemGroup Label="Implicit usings" Condition="$(MSBuildProjectName) != 'bunit.testassets' AND $(MSBuildProjectName) != 'AngleSharpWrappers.Tests'">
 		<Using Include="AutoFixture" />
 		<Using Include="AutoFixture.Xunit2" />
diff --git a/tests/bunit.core.tests/Rendering/TestRendererTest.cs b/tests/bunit.core.tests/Rendering/TestRendererTest.cs
@@ -410,7 +410,7 @@ public async Task Test202()
 	}
 
 	[Fact(DisplayName = "UnhandledException has a reference to latest unhandled exception thrown by a component during OnAfterRenderAsync")]
-	public void Test203()
+	public async Task Test203()
 	{
 		// Arrange
 		var planned = JSInterop.SetupVoid("foo");
@@ -421,7 +421,7 @@ public void Test203()
 
 		// Assert
 		planned.VerifyInvoke("foo");
-		Renderer.UnhandledException.Result.ShouldBeOfType<InvalidOperationException>();
+		(await Renderer.UnhandledException).ShouldBeOfType<InvalidOperationException>();
 	}
 
 	[Fact(DisplayName = "Multiple calls to StateHasChanged from OnParametersSet with SetParametersAndRender")]
diff --git a/tests/bunit.core.tests/bunit.core.tests.csproj b/tests/bunit.core.tests/bunit.core.tests.csproj
@@ -12,4 +12,14 @@
 		<ProjectReference Include="..\bunit.testassets\bunit.testassets.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="xunit" Version="2.5.2" />
+		<!-- DO NOT UPGRADE TO versions > 2.4.5 as they do not support .net5 or older -->
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+			<NoWarn>NU1701</NoWarn>
+		</PackageReference>
+	</ItemGroup>
+
 </Project>
diff --git a/tests/bunit.testassets/bunit.testassets.csproj b/tests/bunit.testassets/bunit.testassets.csproj
@@ -15,6 +15,9 @@
 	<ItemGroup>
 		<PackageReference Include="Serilog" Version="3.0.1" />
 		<PackageReference Include="Serilog.Expressions" Version="3.4.1" />
+		<PackageReference Include="xunit.extensibility.execution" Version="2.5.2" />
+		<PackageReference Include="xunit.abstractions" Version="2.0.3" />
+		<PackageReference Include="xunit.assert" Version="2.5.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
diff --git a/tests/bunit.web.tests/TestDoubles/FakeSignOutSessionStateManagerTest.cs b/tests/bunit.web.tests/TestDoubles/FakeSignOutSessionStateManagerTest.cs
@@ -1,4 +1,4 @@
-﻿namespace Bunit.TestDoubles;
+namespace Bunit.TestDoubles;
 
 public class FakeSignOutSessionStateManagerTest : TestContext
 {
@@ -16,12 +16,12 @@ public void ShouldSignOut(string randomUserName)
 	}
 
 	[Fact]
-	public void ShouldReturnSignOutStateOnValidateSignOutState()
+	public async Task ShouldReturnSignOutStateOnValidateSignOutState()
 	{
 		var cut = new FakeSignOutSessionStateManager(Substitute.For<IJSRuntime>());
-		cut.SetSignOutState();
+		await cut.SetSignOutState();
 
-		var wasValidate = cut.ValidateSignOutState().Result;
+		var wasValidate = await cut.ValidateSignOutState();
 
 		wasValidate.ShouldBeTrue();
 		cut.IsSignedOut.ShouldBeFalse();
diff --git a/tests/bunit.web.tests/bunit.web.tests.csproj b/tests/bunit.web.tests/bunit.web.tests.csproj
@@ -12,4 +12,14 @@
 		<ProjectReference Include="..\bunit.testassets\bunit.testassets.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="xunit" Version="2.5.2" />
+		<!-- DO NOT UPGRADE TO versions > 2.4.5 as they do not support .net5 or older -->
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+			<NoWarn>NU1701</NoWarn>
+		</PackageReference>
+	</ItemGroup>
+	
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ public async Task Test202()`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`[Fact(DisplayName = "UnhandledException has a reference to latest unhandled exception thrown by a component during OnAfterRenderAsync")]`
`413`		`- public void Test203()`
	`413`	`+ public async Task Test203()`
`414`	`414`	`{`
`415`	`415`	`// Arrange`
`416`	`416`	`var planned = JSInterop.SetupVoid("foo");`
`@@ -421,7 +421,7 @@ public void Test203()`
`421`	`421`
`422`	`422`	`// Assert`
`423`	`423`	`planned.VerifyInvoke("foo");`
`424`		`- Renderer.UnhandledException.Result.ShouldBeOfType<InvalidOperationException>();`
	`424`	`+ (await Renderer.UnhandledException).ShouldBeOfType<InvalidOperationException>();`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`[Fact(DisplayName = "Multiple calls to StateHasChanged from OnParametersSet with SetParametersAndRender")]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Bunit.TestDoubles;`
	`1`	`+namespace Bunit.TestDoubles;`
`2`	`2`
`3`	`3`	`public class FakeSignOutSessionStateManagerTest : TestContext`
`4`	`4`	`{`
`@@ -16,12 +16,12 @@ public void ShouldSignOut(string randomUserName)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`[Fact]`
`19`		`- public void ShouldReturnSignOutStateOnValidateSignOutState()`
	`19`	`+ public async Task ShouldReturnSignOutStateOnValidateSignOutState()`
`20`	`20`	`{`
`21`	`21`	`var cut = new FakeSignOutSessionStateManager(Substitute.For<IJSRuntime>());`
`22`		`- cut.SetSignOutState();`
	`22`	`+ await cut.SetSignOutState();`
`23`	`23`
`24`		`- var wasValidate = cut.ValidateSignOutState().Result;`
	`24`	`+ var wasValidate = await cut.ValidateSignOutState();`
`25`	`25`
`26`	`26`	`wasValidate.ShouldBeTrue();`
`27`	`27`	`cut.IsSignedOut.ShouldBeFalse();`