chore(deps): Update MSTest to v4

Youssef1313 · Youssef1313 · commit eb21b9710514 · 2025-12-19T18:07:46.000+01:00
diff --git a/src/TestApp/shared/PointersInjectionTests.cs b/src/TestApp/shared/PointersInjectionTests.cs
@@ -23,7 +23,7 @@ public class PointersInjectionTests
 	[InjectedPointer(PointerDeviceType.Mouse)]
 	[InjectedPointer(PointerDeviceType.Touch)]
 #if !HAS_UNO_SKIA && !WINDOWS
-	[ExpectedException(typeof(NotSupportedException))]
+	[Ignore("Input injection not supported")]
 #endif
 	public async Task When_TapCoordinates()
 	{
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Mobile/Uno.UI.RuntimeTests.Engine.Mobile.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Mobile/Uno.UI.RuntimeTests.Engine.Mobile.csproj
@@ -27,7 +27,7 @@
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3552" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 	<Choose>
 		<When Condition="'$(TargetFramework)'=='net7.0-android'">
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
@@ -20,7 +20,7 @@
 		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.3552" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3552" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
@@ -20,7 +20,7 @@
 		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.3552" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3552" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj
@@ -24,7 +24,7 @@
 		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.3552"/><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3552" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<UpToDateCheckInput Include="..\..\shared\**\*.xaml" />
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj
@@ -13,7 +13,7 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
 		<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.2" />
 		<PackageReference Include="Uno.UI" Version="4.6.19" />
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj
@@ -50,7 +50,7 @@
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.5" />
 		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.5" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Mobile/Uno.UI.RuntimeTests.Engine.Mobile.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Mobile/Uno.UI.RuntimeTests.Engine.Mobile.csproj
@@ -23,7 +23,7 @@
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3552" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 	<Choose>
 		<When Condition="'$(TargetFramework)'=='net7.0-android'">
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
@@ -20,7 +20,7 @@
 		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.3552" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3552" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
@@ -20,7 +20,7 @@
 		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.3552" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3552" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj
@@ -24,7 +24,7 @@
 		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.3552" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3552" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<UpToDateCheckInput Include="..\..\shared\**\*.xaml" />
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj
@@ -50,7 +50,7 @@
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.5" />
 		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.5" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Windows/Uno.UI.RuntimeTests.Engine.Windows.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Windows/Uno.UI.RuntimeTests.Engine.Windows.csproj
@@ -29,7 +29,7 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 
 		<Manifest Include="$(ApplicationManifest)" />
 	</ItemGroup>
diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.cs
@@ -911,18 +911,8 @@ async ValueTask DoInvoke()
 
 						var console = consoleRecorder?.GetContentAndReset();
 
-						if (test.ExpectedException is null)
-						{
-							_currentRun.Succeeded++;
-							ReportTestResult(fullTestName, sw.Elapsed, TestResult.Passed, console: console);
-						}
-						else
-						{
-							_currentRun.Failed++;
-							ReportTestResult(fullTestName, sw.Elapsed, TestResult.Failed,
-								message: $"Test did not throw the excepted exception of type {test.ExpectedException.Name}",
-								console: console);
-						}
+						_currentRun.Succeeded++;
+						ReportTestResult(fullTestName, sw.Elapsed, TestResult.Passed, console: console);
 					}
 					catch (Exception ex)
 					{
@@ -947,7 +937,7 @@ async ValueTask DoInvoke()
 							_currentRun.Ignored++;
 							ReportTestResult(fullTestName, sw.Elapsed, TestResult.Skipped, message: e.Message, console: console);
 						}
-						else if (test.ExpectedException is null || !test.ExpectedException.IsInstanceOfType(e))
+						else
 						{
 							if (_currentRun.CurrentRepeatCount < config.Attempts - 1 && !Debugger.IsAttached)
 							{
@@ -962,11 +952,6 @@ async ValueTask DoInvoke()
 								ReportTestResult(fullTestName, sw.Elapsed, TestResult.Failed, e, console: console);
 							}
 						}
-						else
-						{
-							_currentRun.Succeeded++;
-							ReportTestResult(fullTestName, sw.Elapsed, TestResult.Passed, e, console: console);
-						}
 					}
 					finally
 					{
diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestMethodInfo.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestMethodInfo.cs
@@ -30,10 +30,6 @@ public UnitTestMethodInfo(MethodInfo method)
 		RequiresFullWindow =
 			HasCustomAttribute<RequiresFullWindowAttribute>(method) ||
 			HasCustomAttribute<RequiresFullWindowAttribute>(method.DeclaringType);
-		ExpectedException = method
-			.GetCustomAttributes<ExpectedExceptionAttribute>()
-			.SingleOrDefault()
-			?.ExceptionType;
 
 		_casesParameters = method
 			.GetCustomAttributes()
@@ -52,8 +48,6 @@ public UnitTestMethodInfo(MethodInfo method)
 
 	public MethodInfo Method { get; }
 
-	public Type? ExpectedException { get; }
-
 	public bool RequiresFullWindow { get; }
 
 	public bool RunsOnUIThread { get; }
diff --git a/src/Uno.UI.RuntimeTests.Engine.Package/Uno.UI.RuntimeTests.Engine.Package.csproj b/src/Uno.UI.RuntimeTests.Engine.Package/Uno.UI.RuntimeTests.Engine.Package.csproj
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+		<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
 	</ItemGroup>
 	
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class PointersInjectionTests`
`23`	`23`	`[InjectedPointer(PointerDeviceType.Mouse)]`
`24`	`24`	`[InjectedPointer(PointerDeviceType.Touch)]`
`25`	`25`	`#if !HAS_UNO_SKIA && !WINDOWS`
`26`		`- [ExpectedException(typeof(NotSupportedException))]`
	`26`	`+ [Ignore("Input injection not supported")]`
`27`	`27`	`#endif`
`28`	`28`	`public async Task When_TapCoordinates()`
`29`	`29`	`{`