Bump to NUnit 4.1.0

This commit is contained in:
Zoltan Csizmadia 2024-07-17 11:12:45 -05:00
parent 6fbf279fac
commit dafa24004a
4 changed files with 22 additions and 4 deletions

View file

@ -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>
</Project>

View file

@ -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>

View file

@ -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

View file

@ -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" />