Fixing various tests to work with NUnit 4.1

Author: tannergooding

tests/ClangSharp.PInvokeGenerator.UnitTests/PInvokeGeneratorTest.cs

@@ -89,7 +89,7 @@ protected static Task ValidateGeneratedXmlCompatibleUnixBindingsAsync(string inp
 
     private static async Task ValidateGeneratedBindingsAsync(string inputContents, string expectedOutputContents, PInvokeGeneratorOutputMode outputMode, PInvokeGeneratorConfigurationOptions configOptions, string[]? excludedNames, IReadOnlyDictionary<string, string>? remappedNames, IReadOnlyDictionary<string, AccessSpecifier>? withAccessSpecifiers, IReadOnlyDictionary<string, IReadOnlyList<string>>? withAttributes, IReadOnlyDictionary<string, string>? withCallConvs, IReadOnlyDictionary<string, string>? withClasses, IReadOnlyDictionary<string, string>? withLibraryPaths, IReadOnlyDictionary<string, string>? withNamespaces, string[]? withSetLastErrors, IReadOnlyDictionary<string, (string, PInvokeGeneratorTransparentStructKind)>? withTransparentStructs, IReadOnlyDictionary<string, string>? withTypes, IReadOnlyDictionary<string, IReadOnlyList<string>>? withUsings, IReadOnlyDictionary<string, string>? withPackings, IEnumerable<Diagnostic>? expectedDiagnostics, string libraryPath, string[]? commandLineArgs, string language, string languageStandard)
     {
-        Assert.True(File.Exists(DefaultInputFileName));
+        Assert.That(DefaultInputFileName, Does.Exist);
         commandLineArgs ??= DefaultCppClangCommandLineArgs;
 
         configOptions |= PInvokeGeneratorConfigurationOptions.GenerateMacroBindings;
@@ -133,17 +133,17 @@ private static async Task ValidateGeneratedBindingsAsync(string inputContents, s
 
             if (expectedDiagnostics is null)
             {
-                Assert.IsEmpty(pinvokeGenerator.Diagnostics);
+                Assert.That(pinvokeGenerator.Diagnostics, Is.Empty);
             }
             else
             {
-                Assert.AreEqual(expectedDiagnostics, pinvokeGenerator.Diagnostics);
+                Assert.That(pinvokeGenerator.Diagnostics, Is.EqualTo(expectedDiagnostics));
             }
         }
         outputStream.Position = 0;
 
         using var streamReader = new StreamReader(outputStream);
         var actualOutputContents = await streamReader.ReadToEndAsync().ConfigureAwait(false);
-        Assert.AreEqual(expectedOutputContents, actualOutputContents);
+        Assert.That(actualOutputContents, Is.EqualTo(expectedOutputContents));
     }
 }

tests/ClangSharp.UnitTests/CXModuleMapDescriptorTest.cs

@@ -23,7 +23,7 @@ public void Basic()
         _ = mmd.SetUmbrellaHeader("TestFrame.h");
 
         var buffer = mmd.WriteToBuffer(options: 0, errorCode: out _);
-        Assert.AreEqual(contents, buffer.AsString());
+        Assert.That(buffer.AsString(), Is.EqualTo(contents));
         buffer.ClangFree();
     }
 }

tests/ClangSharp.UnitTests/CXTranslationUnitTest.cs

@@ -29,7 +29,7 @@ public void Basic(string name)
             using var index = CXIndex.Create();
             using var translationUnit = CXTranslationUnit.Parse(index, file.FullName, [], [], CXTranslationUnit_None);
             var clangFile = translationUnit.GetFile(file.FullName);
-            Assert.AreEqual(file.FullName, clangFile.Name.CString);
+            Assert.That(clangFile.Name.CString, Is.EqualTo(file.FullName));
         }
         finally
         {
@@ -58,7 +58,7 @@ public void BasicWrapper(string name)
             var clangFileName = clangFile.Name;
             var clangFileNameString = clangFileName.CString;
 
-            Assert.AreEqual(file.FullName, clangFileNameString);
+            Assert.That(clangFileNameString, Is.EqualTo(file.FullName));
         }
         finally
         {

tests/ClangSharp.UnitTests/CXVirtualFileOverlayTest.cs

@@ -33,7 +33,7 @@ public void Map(string? vPath, string? rPath)
             rPath = Fix(rPath);
 
             var err = VFO.AddFileMapping(vPath, rPath);
-            Assert.AreEqual(CXError_Success, err);
+            Assert.That(err, Is.EqualTo(CXError_Success));
         }
 
         public void MapError(string? vPath, string? rPath, CXErrorCode expErr)
@@ -42,7 +42,7 @@ public void MapError(string? vPath, string? rPath, CXErrorCode expErr)
             rPath = Fix(rPath);
 
             var err = VFO.AddFileMapping(vPath, rPath);
-            Assert.AreEqual(expErr, err);
+            Assert.That(err, Is.EqualTo(expErr));
         }
 
         private static string? Fix(string? text)
@@ -73,7 +73,7 @@ private void Dispose(bool isDisposing)
             if (_contents != null)
             {
                 var buffer = VFO.WriteToBuffer(options: 0, errorCode: out _);
-                Assert.AreEqual(_contents, buffer.AsString());
+                Assert.That(buffer.AsString(), Is.EqualTo(_contents));
                 buffer.ClangFree();
             }
 

tests/ClangSharp.UnitTests/CursorTests/DeclTest.cs

@@ -26,7 +26,7 @@ public void AccessSpecDeclTest(string accessSpecifier, CX_CXXAccessSpecifier exp
         var recordDecl = translationUnit.TranslationUnitDecl.Decls.OfType<RecordDecl>().Where((recordDecl) => recordDecl.Name.Equals("MyStruct", StringComparison.Ordinal)).Single();
         var accessSpecDecl = recordDecl.Decls.OfType<AccessSpecDecl>().Single();
 
-        Assert.AreEqual(expectedAccessSpecifier, accessSpecDecl.Access);
+        Assert.That(accessSpecDecl.Access, Is.EqualTo(expectedAccessSpecifier));
     }
 
     [Test]
@@ -42,10 +42,10 @@ class MyClass
         using var translationUnit = CreateTranslationUnit(inputContents);
 
         var classTemplateDecl = translationUnit.TranslationUnitDecl.Decls.OfType<ClassTemplateDecl>().Single();
-        Assert.AreEqual("MyClass", classTemplateDecl.Name);
+        Assert.That(classTemplateDecl.Name, Is.EqualTo("MyClass"));
 
         var templateParameter = classTemplateDecl.TemplateParameters.Single();
-        Assert.AreEqual("T", templateParameter.Name);
+        Assert.That(templateParameter.Name, Is.EqualTo("T"));
     }
 
     [Test]
@@ -69,9 +69,9 @@ class MyClass<int, U>
         using var translationUnit = CreateTranslationUnit(inputContents);
 
         var classTemplatePartialSpecializationDecl = translationUnit.TranslationUnitDecl.Decls.OfType<ClassTemplatePartialSpecializationDecl>().Single();
-        Assert.AreEqual("MyClass", classTemplatePartialSpecializationDecl.Name);
+        Assert.That(classTemplatePartialSpecializationDecl.Name, Is.EqualTo("MyClass"));
 
         var templateParameter = classTemplatePartialSpecializationDecl.TemplateParameters.Single();
-        Assert.AreEqual("U", templateParameter.Name);
+        Assert.That(templateParameter.Name, Is.EqualTo("U"));
     }
 }

tests/ClangSharp.UnitTests/TranslationUnitTest.cs

@@ -26,7 +26,7 @@ public abstract class TranslationUnitTest
 
     protected static TranslationUnit CreateTranslationUnit(string inputContents)
     {
-        Assert.True(File.Exists(DefaultInputFileName));
+        Assert.That(DefaultInputFileName, Does.Exist);
 
         using var unsavedFile = CXUnsavedFile.Create(DefaultInputFileName, inputContents);
         var unsavedFiles = new CXUnsavedFile[] { unsavedFile };
@@ -52,7 +52,7 @@ protected static TranslationUnit CreateTranslationUnit(string inputContents)
                 }
             }
 
-            Assert.False(invalidTranslationUnitHandle, errorDiagnostics.ToString());
+            Assert.That(invalidTranslationUnitHandle, Is.False, errorDiagnostics.ToString());
         }
 
         return TranslationUnit.GetOrCreate(translationUnit);