Allow public override methods.

nunit · Nov 28, 2023 · 1812172 · 1812172
1 parent a2b2f82
commit 1812172
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/...ers.tests/NonTestMethodAccessibilityLevel/NonTestMethodAccessibilityLevelAnalyzerTests.cs b/...ers.tests/NonTestMethodAccessibilityLevel/NonTestMethodAccessibilityLevelAnalyzerTests.cs
@@ -172,5 +172,21 @@ public override void Dispose() { }
 
             RoslynAssert.Valid(analyzer, testCode);
         }
+
+        [Test]
+        public void AnalyzeWhenMethodIsBaseClassOverride()
+        {
+            var testCode = TestUtility.WrapClassInNamespaceAndAddUsing(@"
+        public sealed class MyTestClass
+        {
+            [Test]
+            public void TestMethod() { }
+
+            public override string ToString() => ""My Test Class"";
+        }
+        ");
+
+            RoslynAssert.Valid(analyzer, testCode);
+        }
     }
 }
diff --git a/...unit.analyzers/NonTestMethodAccessibilityLevel/NonTestMethodAccessibilityLevelAnalyzer.cs b/...unit.analyzers/NonTestMethodAccessibilityLevel/NonTestMethodAccessibilityLevelAnalyzer.cs
@@ -45,7 +45,7 @@ private static void AnalyzeType(SymbolAnalysisContext context)
             {
                 if (method.IsTestRelatedMethod(context.Compilation))
                     hasTestMethods = true;
-                else if (IsPublicOrInternalMethod(method) && !IsDisposeMethod(method))
+                else if (IsPublicOrInternalMethod(method) && !IsOverride(method) && !IsDisposeMethod(method))
                     publicNonTestMethods.Add(method);
             }
 
@@ -74,13 +74,13 @@ private static bool IsPublicOrInternalMethod(IMethodSymbol method)
             }
         }
 
-        private static bool IsDisposeMethod(IMethodSymbol method)
+        private static bool IsOverride(IMethodSymbol method)
         {
-            if (method.OverriddenMethod is not null)
-            {
-                return IsDisposeMethod(method.OverriddenMethod);
-            }
+            return method.IsOverride;
+        }
 
+        private static bool IsDisposeMethod(IMethodSymbol method)
+        {
             return method.IsInterfaceImplementation("System.IDisposable");
         }
     }