Fix the check of the non-static Verify() method.

PosInformatique · Jun 24, 2024 · 2ea368f · 2ea368f
1 parent 675c8fe
commit 2ea368f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Moq.Analyzers/MoqSymbols.cs b/src/Moq.Analyzers/MoqSymbols.cs
@@ -43,7 +43,7 @@ private MoqSymbols(INamedTypeSymbol mockGenericClass, Compilation compilation)
             this.mockBehaviorStrictField = new Lazy<ISymbol>(() => this.mockBehaviorEnum.Value.GetMembers("Strict").First());
             this.setupProtectedMethods = new Lazy<IReadOnlyList<IMethodSymbol>>(() => compilation.GetTypeByMetadataName("Moq.Protected.IProtectedMock`1")!.GetMembers("Setup").OfType<IMethodSymbol>().ToArray());
             this.asMethod = new Lazy<ISymbol>(() => mockGenericClass.GetMembers("As").Single());
-            this.verifyMethods = new Lazy<IReadOnlyList<IMethodSymbol>>(() => mockGenericClass.GetMembers("Verify").OfType<IMethodSymbol>().ToArray());
+            this.verifyMethods = new Lazy<IReadOnlyList<IMethodSymbol>>(() => mockGenericClass.GetMembers("Verify").Concat(mockGenericClass.BaseType!.GetMembers("Verify")).Where(m => !m.IsStatic).OfType<IMethodSymbol>().ToArray());
 
             this.staticVerifyMethod = new Lazy<IMethodSymbol>(() => mockGenericClass.BaseType!.GetMembers("Verify").Where(m => m.IsStatic).OfType<IMethodSymbol>().Single());
             this.staticVerifyAllMethod = new Lazy<IMethodSymbol>(() => mockGenericClass.BaseType!.GetMembers("VerifyAll").Where(m => m.IsStatic).OfType<IMethodSymbol>().Single());

diff --git a/tests/Moq.Analyzers.Tests/MoqLibrary.cs b/tests/Moq.Analyzers.Tests/MoqLibrary.cs
@@ -26,8 +26,6 @@ public Mock(params object[] args) { }
 
                     public ISetup<TResult> Setup<TResult>(Func<T, TResult> func) { return default; }
 
-                    public void Verify() { }
-
                     public void Verify(Expression<Action<T>> _) { }
 
                     public void Verify<TResult>(Expression<Func<T, TResult>> _) { }
@@ -43,6 +41,8 @@ public class Mock
                 {
                     public static void Verify(params Mock[] mocks) { }
 
+                    public void Verify() { }
+
                     public void VerifyAll() { }
 
                     public static void VerifyAll(params Mock[] mocks) { }