Merge rc/1.18 into next.

2025-12-16 16:53:25 +01:00 · 2018-09-12 14:59:54 +01:00
parent 953537e856 cc6edd4e23
commit 767045b55d
120 changed files with 4726 additions and 3692 deletions
--- a/java/ql/src/semmle/code/java/frameworks/Mockito.qll
+++ b/java/ql/src/semmle/code/java/frameworks/Mockito.qll
@@ -397,7 +397,7 @@ class MockitoSettableField extends Field {
 class MockitoMockMethod extends Method {
  MockitoMockMethod() {
    this.getDeclaringType().hasQualifiedName("org.mockito", "Mockito") and
-    this.hasName("mock")
+    (this.hasName("mock") or this.hasName("verify"))
  }
 }