From 8fdf3635fdf67bdb4b371c9fd9bf2eb9116ae440 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Fri, 4 Dec 2020 18:56:01 +0100
Subject: [PATCH] Fix the build

---
 error-prone-contrib/pom.xml                                 | 5 +++++
 .../errorprone/bugpatterns/MockitoAnnotationCheck.java      | 5 ++++-
 .../errorprone/bugpatterns/MockitoAnnotationCheckTest.java  | 6 ++----
 pom.xml                                                     | 5 +++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/error-prone-contrib/pom.xml b/error-prone-contrib/pom.xml
index ec85ebfd..ec9643c9 100644
--- a/error-prone-contrib/pom.xml
+++ b/error-prone-contrib/pom.xml
@@ -147,6 +147,11 @@
             <artifactId>mockito-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MockitoAnnotationCheck.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MockitoAnnotationCheck.java
index 44e537ad..9f8bf88d 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MockitoAnnotationCheck.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MockitoAnnotationCheck.java
@@ -49,7 +49,10 @@ public final class MockitoAnnotationCheck extends BugChecker implements Compilat
     boolean importsMockito =
         compilationUnitTree.getImports().stream()
             .map(Object::toString)
-            .anyMatch(importLine -> importLine.startsWith("org.mockito"));
+            .anyMatch(
+                importLine ->
+                    importLine.startsWith("import org.mockito")
+                        || importLine.startsWith("import static org.mockito"));
     if (!importsMockito) {
       return NO_MATCH;
     }
diff --git a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/MockitoAnnotationCheckTest.java b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/MockitoAnnotationCheckTest.java
index 7e0f5996..38aea1a1 100644
--- a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/MockitoAnnotationCheckTest.java
+++ b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/MockitoAnnotationCheckTest.java
@@ -16,6 +16,7 @@ public final class MockitoAnnotationCheckTest {
     compilationTestHelper
         .addSourceLines(
             "A.java",
+            "// BUG: Diagnostic contains:",
             "import static org.mockito.Mockito.mock;",
             "",
             "import org.junit.jupiter.api.Tag;",
@@ -23,7 +24,6 @@ public final class MockitoAnnotationCheckTest {
             "",
             "@Tag(\"unit\")",
             "class MockitoTest {",
-            "",
             "    @Test",
             "    void mockitoTest() {",
             "        mock(String.class);",
@@ -44,7 +44,6 @@ public final class MockitoAnnotationCheckTest {
             "",
             "@Tag(\"unit\")",
             "class MockitoTest {",
-            "",
             "    @Test",
             "    void mockitoTest() {",
             "        mock(String.class);",
@@ -59,10 +58,9 @@ public final class MockitoAnnotationCheckTest {
             "import org.junit.jupiter.api.Test;",
             "import org.mockito.junit.jupiter.MockitoSettings;",
             "",
-            "@Tag(\"unit\")",
             "@MockitoSettings(strictness = STRICT_STUBS)",
+            "@Tag(\"unit\")",
             "class MockitoTest {",
-            "",
             "    @Test",
             "    void mockitoTest() {",
             "        mock(String.class);",
diff --git a/pom.xml b/pom.xml
index c3e3833d..8cc1c2f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,6 +296,11 @@
                 <artifactId>mockito-core</artifactId>
                 <version>${version.mockito}</version>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-junit-jupiter</artifactId>
+                <version>${version.mockito}</version>
+            </dependency>
             <dependency>
                 <groupId>org.reactivestreams</groupId>
                 <artifactId>reactive-streams</artifactId>