Migrate to NUnit 4 based on https://docs.nunit.org/articles/nunit/rel…

…ease-notes/Nunit4.0-MigrationGuide.html. Needed fix for nunit/nunit#4564

Directory.Packages.props

@@ -29,7 +29,7 @@
 	<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
 	<PackageVersion Include="NSubstitute" Version="5.0.0" />
 	<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.16" />
-	<PackageVersion Include="NUnit" Version="3.14.0" />
+	<PackageVersion Include="NUnit" Version="4.0.0" />
 	<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
 	<PackageVersion Include="NuGet.Protocol" Version="6.8.0" />
 	<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />

ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs

@@ -46,7 +46,7 @@ public void AllFilesHaveTests()
 				if (file.Extension == ".txt" || file.Extension == ".exe" || file.Extension == ".config")
 					continue;
 				var testName = Path.GetFileNameWithoutExtension(file.Name);
-				Assert.Contains(testName, testNames);
+				Assert.That(testNames, Has.Member(testName));
 			}
 		}
 
@@ -486,7 +486,7 @@ async Task RunIL(string testFileName, CompilerOptions options = CompilerOptions.
 			bool optionsForce32Bit = options.HasFlag(CompilerOptions.Force32Bit);
 			bool asmOptionsForce32Bit = asmOptions.HasFlag(AssemblerOptions.Force32Bit);
 
-			Assert.AreEqual(optionsForce32Bit, asmOptionsForce32Bit, "Inconsistent architecture.");
+			Assert.That(asmOptionsForce32Bit, Is.EqualTo(optionsForce32Bit), "Inconsistent architecture.");
 
 			try
 			{

ICSharpCode.Decompiler.Tests/DataFlowTest.cs

@@ -45,11 +45,11 @@ public RDTest(ILFunction f, ILVariable v) : base(f, _ => true, CancellationToken
 
 			protected internal override void VisitTryFinally(TryFinally inst)
 			{
-				Assert.IsTrue(IsPotentiallyUninitialized(state, v));
+				Assert.That(IsPotentiallyUninitialized(state, v));
 				base.VisitTryFinally(inst);
-				Assert.IsTrue(state.IsReachable);
-				Assert.AreEqual(1, GetStores(state, v).Count());
-				Assert.IsFalse(IsPotentiallyUninitialized(state, v));
+				Assert.That(state.IsReachable);
+				Assert.That(GetStores(state, v).Count(), Is.EqualTo(1));
+				Assert.That(!IsPotentiallyUninitialized(state, v));
 			}
 		}
 

ICSharpCode.Decompiler.Tests/DisassemblerPrettyTestRunner.cs

@@ -47,7 +47,7 @@ public void AllFilesHaveTests()
 				if (file.Extension.Equals(".il", StringComparison.OrdinalIgnoreCase))
 				{
 					var testName = file.Name.Split('.')[0];
-					Assert.Contains(testName, testNames);
+					Assert.That(testNames, Has.Member(testName));
 				}
 			}
 		}

ICSharpCode.Decompiler.Tests/Helpers/Tester.VB.cs

@@ -133,7 +133,7 @@ public static async Task<CompilerResults> CompileVB(string sourceFileName, Compi
 				{
 					Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 				}
-				Assert.AreEqual(0, result.ExitCode, "vbc failed");
+				Assert.That(result.ExitCode, Is.EqualTo(0), "vbc failed");
 
 				return results;
 			}

ICSharpCode.Decompiler.Tests/Helpers/Tester.cs

@@ -198,7 +198,7 @@ public static async Task<string> AssembleIL(string sourceFileName, AssemblerOpti
 			{
 				Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 			}
-			Assert.AreEqual(0, result.ExitCode, "ilasm failed");
+			Assert.That(result.ExitCode, Is.EqualTo(0), "ilasm failed");
 
 			return outputFile;
 		}
@@ -251,7 +251,7 @@ public static async Task<string> Disassemble(string sourceFileName, string outpu
 			{
 				Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 			}
-			Assert.AreEqual(0, result.ExitCode, "ildasm failed");
+			Assert.That(result.ExitCode, Is.EqualTo(0), "ildasm failed");
 
 			// Unlike the .imagebase directive (which is a fixed value when compiling with /deterministic),
 			// the image base comment still varies... ildasm putting a random number here?
@@ -520,7 +520,7 @@ public static async Task<CompilerResults> CompileCSharp(string sourceFileName, C
 					Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 				}
 
-				Assert.AreEqual(0, result.ExitCode, "csc failed");
+				Assert.That(result.ExitCode, Is.EqualTo(0), "csc failed");
 
 				return results;
 			}
@@ -582,7 +582,7 @@ public static async Task<CompilerResults> CompileCSharp(string sourceFileName, C
 				{
 					Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 				}
-				Assert.AreEqual(0, result.ExitCode, "mcs failed");
+				Assert.That(result.ExitCode, Is.EqualTo(0), "mcs failed");
 
 				return results;
 			}
@@ -764,8 +764,8 @@ public static async Task RunAndCompareOutput(string testFileName, string outputF
 				(result2, output2, error2) = await Run(decompiledOutputFile).ConfigureAwait(false);
 			}
 
-			Assert.AreEqual(0, result1, "Exit code != 0; did the test case crash?" + Environment.NewLine + error1);
-			Assert.AreEqual(0, result2, "Exit code != 0; did the decompiled code crash?" + Environment.NewLine + error2);
+			Assert.That(result1, Is.EqualTo(0), "Exit code != 0; did the test case crash?" + Environment.NewLine + error1);
+			Assert.That(result2, Is.EqualTo(0), "Exit code != 0; did the decompiled code crash?" + Environment.NewLine + error2);
 
 			if (output1 != output2 || error1 != error2)
 			{
@@ -851,7 +851,7 @@ public static async Task SignAssembly(string assemblyPath, string keyFilePath)
 				.WithValidation(CommandResultValidation.None);
 
 			var result = await command.ExecuteBufferedAsync().ConfigureAwait(false);
-			Assert.AreEqual(0, result.ExitCode, "sn failed");
+			Assert.That(result.ExitCode, Is.EqualTo(0), "sn failed");
 
 			if (!string.IsNullOrWhiteSpace(result.StandardOutput))
 			{

ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@@ -109,6 +109,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="..\ILSpy.Tests\Workaround4564.cs" Link="Workaround4564.cs" />
     <Compile Include="DisassemblerPrettyTestRunner.cs" />
     <Compile Include="Helpers\RoslynToolset.cs" />
     <Compile Include="Output\InsertParenthesesVisitorTests.cs" />

ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs

@@ -45,8 +45,8 @@ public void AllFilesHaveTests()
 				if (file.Extension.Equals(".il", StringComparison.OrdinalIgnoreCase))
 				{
 					var testName = file.Name.Split('.')[0];
-					Assert.Contains(testName, testNames);
-					Assert.IsTrue(File.Exists(Path.Combine(TestCasePath, testName + ".cs")));
+					Assert.That(testNames, Has.Member(testName));
+					Assert.That(File.Exists(Path.Combine(TestCasePath, testName + ".cs")));
 				}
 			}
 		}

ICSharpCode.Decompiler.Tests/Output/CSharpAmbienceTests.cs

@@ -55,7 +55,7 @@ ITypeDefinition GetDefinition(Type type)
 			}
 
 			var foundType = compilation.FindType(type).GetDefinition();
-			Assert.IsNotNull(foundType);
+			Assert.That(foundType, Is.Not.Null);
 			return foundType;
 		}
 
@@ -76,7 +76,7 @@ public void GenericType(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(Dictionary<,>));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(None, "Object")]
@@ -92,7 +92,7 @@ public void SimpleType(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(object));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(None, "IEnumerable")]
@@ -104,7 +104,7 @@ public void GenericInterface(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(IEnumerable<>));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(None, "Enumerator")]
@@ -121,7 +121,7 @@ public void GenericTypeWithNested(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(List<>.Enumerator));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(None, "StaticClass")]
@@ -137,7 +137,7 @@ public void StaticClassTest(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(StaticClass));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(None, "SealedClass")]
@@ -153,7 +153,7 @@ public void SealedClassTest(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(SealedClass));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(None, "RefStruct")]
@@ -169,7 +169,7 @@ public void RefStructTest(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(RefStruct));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(None, "ReadonlyStruct")]
@@ -185,7 +185,7 @@ public void ReadonlyStructTest(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(ReadonlyStruct));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(None, "ReadonlyRefStruct")]
@@ -201,7 +201,7 @@ public void ReadonlyRefStructTest(ConversionFlags flags, string expectedOutput)
 		{
 			var typeDef = GetDefinition(typeof(ReadonlyRefStruct));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(typeDef));
+			Assert.That(ambience.ConvertSymbol(typeDef), Is.EqualTo(expectedOutput));
 		}
 		#endregion
 
@@ -219,7 +219,7 @@ public void FuncDelegate(ConversionFlags flags, string expectedOutput)
 		{
 			var func = GetDefinition(typeof(Func<,>));
 			ambience.ConversionFlags = flags;
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(func));
+			Assert.That(ambience.ConvertSymbol(func), Is.EqualTo(expectedOutput));
 		}
 		#endregion
 
@@ -232,7 +232,7 @@ public void SimpleField(ConversionFlags flags, string expectedOutput)
 			var field = GetDefinition(typeof(CSharpAmbienceTests.Program)).GetFields(f => f.Name == "test").Single();
 			ambience.ConversionFlags = flags;
 
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(field));
+			Assert.That(ambience.ConvertSymbol(field), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(All & ~PlaceReturnTypeAfterParameterList, "private const int ICSharpCode.Decompiler.Tests.Output.CSharpAmbienceTests.Program.TEST2;")]
@@ -242,7 +242,7 @@ public void SimpleConstField(ConversionFlags flags, string expectedOutput)
 			var field = compilation.FindType(typeof(CSharpAmbienceTests.Program)).GetFields(f => f.Name == "TEST2").Single();
 			ambience.ConversionFlags = flags;
 
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(field));
+			Assert.That(ambience.ConvertSymbol(field), Is.EqualTo(expectedOutput));
 		}
 		#endregion
 
@@ -254,7 +254,7 @@ public void EventWithDeclaringType()
 			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType;
 			string result = ambience.ConvertSymbol(ev);
 
-			Assert.AreEqual("public event EventHandler Program.ProgramChanged;", result);
+			Assert.That(result, Is.EqualTo("public event EventHandler Program.ProgramChanged;"));
 		}
 
 		[Test]
@@ -264,7 +264,7 @@ public void CustomEvent()
 			ambience.ConversionFlags = ConversionFlags.StandardConversionFlags;
 			string result = ambience.ConvertSymbol(ev);
 
-			Assert.AreEqual("public event EventHandler SomeEvent;", result);
+			Assert.That(result, Is.EqualTo("public event EventHandler SomeEvent;"));
 		}
 		#endregion
 
@@ -276,7 +276,7 @@ public void AutomaticProperty(ConversionFlags flags, string expectedOutput)
 			var prop = compilation.FindType(typeof(CSharpAmbienceTests.Program)).GetProperties(p => p.Name == "Test").Single();
 			ambience.ConversionFlags = flags;
 
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(prop));
+			Assert.That(ambience.ConvertSymbol(prop), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(StandardConversionFlags, "public int this[int index] { get; }")]
@@ -286,7 +286,7 @@ public void Indexer(ConversionFlags flags, string expectedOutput)
 			var prop = compilation.FindType(typeof(CSharpAmbienceTests.Program)).GetProperties(p => p.IsIndexer).Single();
 			ambience.ConversionFlags = flags;
 
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(prop));
+			Assert.That(ambience.ConvertSymbol(prop), Is.EqualTo(expectedOutput));
 		}
 		#endregion
 
@@ -298,7 +298,7 @@ public void ConstructorTests(ConversionFlags flags, string expectedOutput)
 			var prop = compilation.FindType(typeof(CSharpAmbienceTests.Program)).GetConstructors().Single();
 			ambience.ConversionFlags = flags;
 
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(prop));
+			Assert.That(ambience.ConvertSymbol(prop), Is.EqualTo(expectedOutput));
 		}
 
 		[TestCase(StandardConversionFlags, "~Program();")]
@@ -309,7 +309,7 @@ public void DestructorTests(ConversionFlags flags, string expectedOutput)
 				.GetMembers(m => m.SymbolKind == SymbolKind.Destructor, GetMemberOptions.IgnoreInheritedMembers).Single();
 			ambience.ConversionFlags = flags;
 
-			Assert.AreEqual(expectedOutput, ambience.ConvertSymbol(dtor));
+			Assert.That(ambience.ConvertSymbol(dtor), Is.EqualTo(expectedOutput));
 		}
 		#endregion