Switch to NUnit v4 (#7504)

NethermindEth · Sep 30, 2024 · f825abd · f825abd
1 parent ec8d3fa
commit f825abd
Show file tree

Hide file tree

Showing 323 changed files with 27,044 additions and 27,366 deletions.
diff --git a/src/Nethermind/Directory.Packages.props b/src/Nethermind/Directory.Packages.props
@@ -57,9 +57,9 @@
     <PackageVersion Include="NLog.Targets.Seq" Version="4.0.1" />
     <PackageVersion Include="NonBlocking" Version="2.1.2" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
-    <PackageVersion Include="NUnit" Version="3.14.0" />
-    <PackageVersion Include="NUnit.Analyzers" Version="3.9.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="NUnit" Version="4.2.2" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
     <PackageVersion Include="PierTwo.Lantern.Discv5.WireProtocol" Version="1.0.0-preview.4" />
     <PackageVersion Include="Polly" Version="8.4.1" />

diff --git a/src/Nethermind/Ethereum.Abi.Test/Tests.cs b/src/Nethermind/Ethereum.Abi.Test/Tests.cs
@@ -53,7 +53,7 @@ public void Test_abi_encoding()
                 }
                 catch (IOException)
                 {
-                    TestContext.WriteLine($"Could not find test in {potentialLocation}");
+                    TestContext.Out.WriteLine($"Could not find test in {potentialLocation}");
                 }
             }
 

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ArgsZeroOneBalanceTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ArgsZeroOneBalanceTests.cs
@@ -5,22 +5,20 @@
 using Ethereum.Test.Base;
 using NUnit.Framework;
 
-namespace Ethereum.Blockchain.Legacy.Test
+namespace Ethereum.Blockchain.Legacy.Test;
+
+[Parallelizable(ParallelScope.All)]
+public class ArgsZeroOneBalanaceTests : GeneralStateTestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.All)]
-    public class ArgsZeroOneBalanaceTests : GeneralStateTestBase
+    [TestCaseSource(nameof(LoadTests))]
+    public void Test(GeneralStateTest test)
     {
-        [TestCaseSource(nameof(LoadTests))]
-        public void Test(GeneralStateTest test)
-        {
-            Assert.True(RunTest(test).Pass);
-        }
+        Assert.That(RunTest(test).Pass, Is.True);
+    }
 
-        public static IEnumerable<GeneralStateTest> LoadTests()
-        {
-            var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stArgsZeroOneBalance");
-            return (IEnumerable<GeneralStateTest>)loader.LoadTests();
-        }
+    public static IEnumerable<GeneralStateTest> LoadTests()
+    {
+        var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stArgsZeroOneBalance");
+        return (IEnumerable<GeneralStateTest>)loader.LoadTests();
     }
 }
diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/AttackTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/AttackTests.cs
@@ -5,22 +5,20 @@
 using Ethereum.Test.Base;
 using NUnit.Framework;
 
-namespace Ethereum.Blockchain.Legacy.Test
+namespace Ethereum.Blockchain.Legacy.Test;
+
+[Parallelizable(ParallelScope.All)]
+public class AttackTests : GeneralStateTestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.All)]
-    public class AttackTests : GeneralStateTestBase
+    [TestCaseSource(nameof(LoadTests))]
+    public void Test(GeneralStateTest test)
     {
-        [TestCaseSource(nameof(LoadTests))]
-        public void Test(GeneralStateTest test)
-        {
-            Assert.True(RunTest(test).Pass);
-        }
+        Assert.That(RunTest(test).Pass, Is.True);
+    }
 
-        public static IEnumerable<GeneralStateTest> LoadTests()
-        {
-            var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stAttackTest");
-            return (IEnumerable<GeneralStateTest>)loader.LoadTests();
-        }
+    public static IEnumerable<GeneralStateTest> LoadTests()
+    {
+        var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stAttackTest");
+        return (IEnumerable<GeneralStateTest>)loader.LoadTests();
     }
 }
diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/BadOpCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/BadOpCodeTests.cs
@@ -5,22 +5,20 @@
 using Ethereum.Test.Base;
 using NUnit.Framework;
 
-namespace Ethereum.Blockchain.Legacy.Test
+namespace Ethereum.Blockchain.Legacy.Test;
+
+[Parallelizable(ParallelScope.All)]
+public class BadOpCodeTests : GeneralStateTestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.All)]
-    public class BadOpCodeTests : GeneralStateTestBase
+    [TestCaseSource(nameof(LoadTests))]
+    public void Test(GeneralStateTest test)
     {
-        [TestCaseSource(nameof(LoadTests))]
-        public void Test(GeneralStateTest test)
-        {
-            Assert.True(RunTest(test).Pass);
-        }
+        Assert.That(RunTest(test).Pass, Is.True);
+    }
 
-        public static IEnumerable<GeneralStateTest> LoadTests()
-        {
-            var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stBadOpcode");
-            return (IEnumerable<GeneralStateTest>)loader.LoadTests();
-        }
+    public static IEnumerable<GeneralStateTest> LoadTests()
+    {
+        var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stBadOpcode");
+        return (IEnumerable<GeneralStateTest>)loader.LoadTests();
     }
 }
diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/BugsTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/BugsTests.cs
@@ -5,22 +5,20 @@
 using Ethereum.Test.Base;
 using NUnit.Framework;
 
-namespace Ethereum.Blockchain.Legacy.Test
+namespace Ethereum.Blockchain.Legacy.Test;
+
+[Parallelizable(ParallelScope.All)]
+public class BugsTets : GeneralStateTestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.All)]
-    public class BugsTets : GeneralStateTestBase
+    [TestCaseSource(nameof(LoadTests))]
+    public void Test(GeneralStateTest test)
     {
-        [TestCaseSource(nameof(LoadTests))]
-        public void Test(GeneralStateTest test)
-        {
-            Assert.True(RunTest(test).Pass);
-        }
+        Assert.That(RunTest(test).Pass, Is.True);
+    }
 
-        public static IEnumerable<GeneralStateTest> LoadTests()
-        {
-            var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stBugs");
-            return (IEnumerable<GeneralStateTest>)loader.LoadTests();
-        }
+    public static IEnumerable<GeneralStateTest> LoadTests()
+    {
+        var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stBugs");
+        return (IEnumerable<GeneralStateTest>)loader.LoadTests();
     }
 }
diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCodesTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCodesTests.cs
@@ -5,21 +5,19 @@
 using Ethereum.Test.Base;
 using NUnit.Framework;
 
-namespace Ethereum.Blockchain.Legacy.Test
+namespace Ethereum.Blockchain.Legacy.Test;
+
+[Parallelizable(ParallelScope.All)]
+public class CallCodesTests : GeneralStateTestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.All)]
-    public class CallCodesTests : GeneralStateTestBase
+    [TestCaseSource(nameof(LoadTests))]
+    public void Test(GeneralStateTest test)
+    {
+        Assert.That(RunTest(test).Pass, Is.True);
+    }
+    public static IEnumerable<GeneralStateTest> LoadTests()
     {
-        [TestCaseSource(nameof(LoadTests))]
-        public void Test(GeneralStateTest test)
-        {
-            Assert.True(RunTest(test).Pass);
-        }
-        public static IEnumerable<GeneralStateTest> LoadTests()
-        {
-            var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCallCodes");
-            return (IEnumerable<GeneralStateTest>)loader.LoadTests();
-        }
+        var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCallCodes");
+        return (IEnumerable<GeneralStateTest>)loader.LoadTests();
     }
 }
diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCreateCallCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCreateCallCodeTests.cs
@@ -14,7 +14,7 @@ public class CallCreateCallCodeTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesCallCodeHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesCallCodeHomesteadTests.cs
@@ -14,7 +14,7 @@ public class CallDelegateCodesCallCodeHomesteadTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesHomesteadTests.cs
@@ -14,7 +14,7 @@ public class CallDelegateCodesHomesteadTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
         public static IEnumerable<GeneralStateTest> LoadTests()
         {

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ChangedEIP150Tests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ChangedEIP150Tests.cs
@@ -14,7 +14,7 @@ public class ChangedEIP150Tests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeCopyTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeCopyTests.cs
@@ -14,7 +14,7 @@ public class CodeCopyTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeSizeLimitTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeSizeLimitTests.cs
@@ -14,7 +14,7 @@ public class CodeSizeLimitTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Create2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Create2Tests.cs
@@ -14,7 +14,7 @@ public class Create2Tests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CreateTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CreateTests.cs
@@ -14,7 +14,7 @@ public class CreateTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/DelegateCallTestHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/DelegateCallTestHomesteadTests.cs
@@ -14,7 +14,7 @@ public class DelegateCallTestHomesteadTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/EIP150SingleCodeGasPricesTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/EIP150SingleCodeGasPricesTests.cs
@@ -14,7 +14,7 @@ public class EIP150SingleCodeGasPricesTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip150SpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip150SpecificTests.cs
@@ -14,7 +14,7 @@ public class Eip150SpecificTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip158SpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip158SpecificTests.cs
@@ -14,7 +14,7 @@ public class Eip158SpecificTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExampleTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExampleTests.cs
@@ -14,7 +14,7 @@ public class ExampleTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExtCodeHashTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExtCodeHashTests.cs
@@ -14,7 +14,7 @@ public class ExtCodeHashTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/HomesteadSpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/HomesteadSpecificTests.cs
@@ -14,7 +14,7 @@ public class HomesteadSpecificTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/InitCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/InitCodeTests.cs
@@ -14,7 +14,7 @@ public class InitCodeTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/LogTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/LogTests.cs
@@ -14,7 +14,7 @@ public class LogTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemExpandingEip150CallsTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemExpandingEip150CallsTests.cs
@@ -14,7 +14,7 @@ public class MemExpandingEip150CallsTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryStressTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryStressTests.cs
@@ -14,7 +14,7 @@ public class MemoryStressTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryTests.cs
@@ -14,7 +14,7 @@ public class MemoryTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
         public static IEnumerable<GeneralStateTest> LoadTests()
         {

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/NonZeroCallTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/NonZeroCallTests.cs
@@ -14,7 +14,7 @@ public class NonZeroCallTests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()

diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/PreCompiledContracts2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/PreCompiledContracts2Tests.cs
@@ -14,7 +14,7 @@ public class PreCompiledContracts2Tests : GeneralStateTestBase
         [TestCaseSource(nameof(LoadTests))]
         public void Test(GeneralStateTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            Assert.That(RunTest(test).Pass, Is.True);
         }
 
         public static IEnumerable<GeneralStateTest> LoadTests()