From dafa24004a369dc9b682fba68c8d2221e6e4f403 Mon Sep 17 00:00:00 2001
From: Zoltan Csizmadia <Zoltan.Csizmadia@vericast.com>
Date: Wed, 17 Jul 2024 11:12:45 -0500
Subject: [PATCH] Bump to NUnit 4.1.0

---
 Directory.Packages.props                             | 6 +++---
 src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj | 9 +++++++++
 src/Ryujinx.Tests.Memory/TrackingTests.cs            | 2 +-
 src/Ryujinx.Tests/Ryujinx.Tests.csproj               | 9 +++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6919a2485e..daae794732 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -25,8 +25,8 @@
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
     <PackageVersion Include="NetCoreServer" Version="8.0.7" />
-    <PackageVersion Include="NUnit" Version="3.13.3" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageVersion Include="NUnit" Version="4.1.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="OpenTK.Core" Version="4.8.2" />
     <PackageVersion Include="OpenTK.Graphics" Version="4.8.2" />
     <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.8.2" />
@@ -49,4 +49,4 @@
     <PackageVersion Include="System.Management" Version="8.0.0" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj b/src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj
index f050608383..b454a1cb2e 100644
--- a/src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj
+++ b/src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj
@@ -11,6 +11,15 @@
     <PackageReference Include="NUnit3TestAdapter" />
   </ItemGroup>
 
+  <!--
+    NUnit 4+ moved the original/non-constraint Asserts into ClassicAssert namespace, To be transparent with the test code, we alias it to Assert.
+    https://docs.nunit.org/articles/nunit/release-notes/Nunit4.0-MigrationGuide.html
+    https://docs.nunit.org/articles/nunit/writing-tests/assertions/assertions.html
+  -->
+  <ItemGroup>
+    <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Ryujinx.Memory\Ryujinx.Memory.csproj" />
   </ItemGroup>
diff --git a/src/Ryujinx.Tests.Memory/TrackingTests.cs b/src/Ryujinx.Tests.Memory/TrackingTests.cs
index c74446cfb3..baa92135eb 100644
--- a/src/Ryujinx.Tests.Memory/TrackingTests.cs
+++ b/src/Ryujinx.Tests.Memory/TrackingTests.cs
@@ -191,7 +191,7 @@ namespace Ryujinx.Tests.Memory
             Assert.False(alignedAfterTriggers);
         }
 
-        [Test, Explicit, Timeout(1000)]
+        [Test, Explicit, CancelAfter(1000)]
         public void Multithreading()
         {
             // Multithreading sanity test
diff --git a/src/Ryujinx.Tests/Ryujinx.Tests.csproj b/src/Ryujinx.Tests/Ryujinx.Tests.csproj
index 3be9787a30..7ac90d47c2 100644
--- a/src/Ryujinx.Tests/Ryujinx.Tests.csproj
+++ b/src/Ryujinx.Tests/Ryujinx.Tests.csproj
@@ -23,6 +23,15 @@
     <PackageReference Include="NUnit3TestAdapter" />
   </ItemGroup>
 
+  <!--
+    NUnit 4+ moved the original/non-constraint Asserts into ClassicAssert namespace, To be transparent with the test code, we alias it to Assert.
+    https://docs.nunit.org/articles/nunit/release-notes/Nunit4.0-MigrationGuide.html
+    https://docs.nunit.org/articles/nunit/writing-tests/assertions/assertions.html
+  -->
+  <ItemGroup>
+    <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Ryujinx.Audio\Ryujinx.Audio.csproj" />
     <ProjectReference Include="..\Ryujinx.Cpu\Ryujinx.Cpu.csproj" />