Fix the build

This commit is contained in:
Stephan Schroevers
2020-12-04 18:56:01 +01:00
parent 54f93ffa8c
commit 8fdf3635fd
4 changed files with 16 additions and 5 deletions

View File

@@ -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>

View File

@@ -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;
}

View File

@@ -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);",

View File

@@ -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>