Support for NUnit 4 classic asserts (#25)

meziantou · Dec 5, 2023 · 67d22fd · 67d22fd
1 parent af216ac
commit 67d22fd
Show file tree

Hide file tree

Showing 8 changed files with 1,330 additions and 756 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,7 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Meziantou.DotNet.CodingStandard" Version="1.0.16">
+      <PackageReference Include="Meziantou.DotNet.CodingStandard" Version="1.0.96">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

diff --git a/Meziantou.FluentAssertionsAnalyzers.Tests/Helpers/ProjectBuilder.Validation.cs b/Meziantou.FluentAssertionsAnalyzers.Tests/Helpers/ProjectBuilder.Validation.cs
@@ -56,10 +56,10 @@ private async Task VerifyDiagnostics(DiagnosticAnalyzer analyzer, IList<Diagnost
     }
 
     [DebuggerStepThrough]
-    private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResults, DiagnosticAnalyzer analyzer, IList<DiagnosticResult> expectedResults)
+    private static void VerifyDiagnosticResults(IReadOnlyCollection<Diagnostic> actualResults, DiagnosticAnalyzer analyzer, IList<DiagnosticResult> expectedResults)
     {
         var expectedCount = expectedResults.Count;
-        var actualCount = actualResults.Count();
+        var actualCount = actualResults.Count;
 
         if (expectedCount != actualCount)
         {
@@ -238,7 +238,9 @@ private async Task<Diagnostic[]> GetSortedDiagnosticsFromDocuments(DiagnosticAna
             // Enable diagnostic
             options = options.WithSpecificDiagnosticOptions(analyzer.SupportedDiagnostics.Select(diag => new KeyValuePair<string, ReportDiagnostic>(diag.Id, GetReportDiagnostic(diag))));
 
-            var compilation = (await project.GetCompilationAsync().ConfigureAwait(false)).WithOptions(options);
+            var compilation = await project.GetCompilationAsync().ConfigureAwait(false);
+            Assert.NotNull(compilation);
+            compilation = compilation.WithOptions(options);
             if (compileSolution)
             {
                 using var ms = new MemoryStream();

diff --git a/Meziantou.FluentAssertionsAnalyzers.Tests/Helpers/ProjectBuilder.cs b/Meziantou.FluentAssertionsAnalyzers.Tests/Helpers/ProjectBuilder.cs
@@ -97,7 +97,9 @@ private ProjectBuilder AddNuGetReference(string packageName, string version, str
 
     public ProjectBuilder AddMSTestApi() => AddNuGetReference("MSTest.TestFramework", "2.2.10", "lib/netstandard1.0/");
 
-    public ProjectBuilder AddNUnitApi() => AddNuGetReference("NUnit", "3.13.3", "lib/netstandard2.0/");
+    public ProjectBuilder AddNUnit3Api() => AddNuGetReference("NUnit", "3.13.3", "lib/netstandard2.0/");
+
+    public ProjectBuilder AddNUnit4Api() => AddNuGetReference("NUnit", "4.0.1", "lib/net6.0/");
 
     public ProjectBuilder AddXUnitApi() =>
         AddNuGetReference("xunit.extensibility.core", "2.4.1", "lib/netstandard1.1/")

diff --git a/...nitToFluentAssertionsAnalyzerUnitTests.cs → ...it3ToFluentAssertionsAnalyzerUnitTests.cs b/...nitToFluentAssertionsAnalyzerUnitTests.cs → ...it3ToFluentAssertionsAnalyzerUnitTests.cs
diff --git a/Meziantou.FluentAssertionsAnalyzers.Tests/NUnit4ToFluentAssertionsAnalyzerUnitTests.cs b/Meziantou.FluentAssertionsAnalyzers.Tests/NUnit4ToFluentAssertionsAnalyzerUnitTests.cs
diff --git a/Meziantou.FluentAssertionsAnalyzers.sln b/Meziantou.FluentAssertionsAnalyzers.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
 		README.md = README.md
+		global.json = global.json
 	EndProjectSection
 EndProject
 Global

diff --git a/Meziantou.FluentAssertionsAnalyzers/AssertAnalyzer.cs b/Meziantou.FluentAssertionsAnalyzers/AssertAnalyzer.cs
@@ -148,6 +148,7 @@ private static bool IsNunitAssertClass(Compilation compilation, ITypeSymbol type
             || typeSymbol.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.CollectionAssert"), SymbolEqualityComparer.Default)
             || typeSymbol.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.DirectoryAssert"), SymbolEqualityComparer.Default)
             || typeSymbol.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.FileAssert"), SymbolEqualityComparer.Default)
-            || typeSymbol.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.StringAssert"), SymbolEqualityComparer.Default);
+            || typeSymbol.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.StringAssert"), SymbolEqualityComparer.Default)
+            || typeSymbol.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.Legacy.ClassicAssert"), SymbolEqualityComparer.Default);
     }
 }
diff --git a/Meziantou.FluentAssertionsAnalyzers/NunitAssertAnalyzerCodeFixProvider.cs b/Meziantou.FluentAssertionsAnalyzers/NunitAssertAnalyzerCodeFixProvider.cs
@@ -173,7 +173,8 @@ private static async Task<Document> Rewrite(Document document, SyntaxNode nodeTo
 
         SyntaxNode result = null;
         var addImports = true;
-        if (method.ContainingType.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.Assert"), SymbolEqualityComparer.Default))
+        if (method.ContainingType.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.Assert"), SymbolEqualityComparer.Default)
+            || method.ContainingType.Equals(compilation.GetTypeByMetadataName("NUnit.Framework.Legacy.ClassicAssert"), SymbolEqualityComparer.Default))
         {
             if (methodName is "AreEqual")
             {
@@ -881,7 +882,7 @@ private static IEnumerable<ArgumentSyntax> ArgumentList(ExpressionSyntax express
         return list;
     }
 
-    private class Rewriter
+    private sealed class Rewriter
     {
         private readonly bool _isDynamic;