diff --git a/java/java-tests/testData/inspection/deadCode/mockedField/expected.xml b/java/java-tests/testData/inspection/deadCode/mockedEasyMockField/expected.xml similarity index 100% rename from java/java-tests/testData/inspection/deadCode/mockedField/expected.xml rename to java/java-tests/testData/inspection/deadCode/mockedEasyMockField/expected.xml diff --git a/java/java-tests/testData/inspection/deadCode/mockedEasyMockField/src/Test.java b/java/java-tests/testData/inspection/deadCode/mockedEasyMockField/src/Test.java new file mode 100644 index 000000000000..5916525b6f1e --- /dev/null +++ b/java/java-tests/testData/inspection/deadCode/mockedEasyMockField/src/Test.java @@ -0,0 +1,11 @@ +public class MyEasyMockTest { + @org.easymock.Mock + private String myFoo; + + { + System.out.println(myFoo); + } + + @org.junit.Test + public void testName() throws Exception {} +} diff --git a/java/java-tests/testData/inspection/deadCode/mockedMockitoField/expected.xml b/java/java-tests/testData/inspection/deadCode/mockedMockitoField/expected.xml new file mode 100644 index 000000000000..4704d91e891d --- /dev/null +++ b/java/java-tests/testData/inspection/deadCode/mockedMockitoField/expected.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/java/java-tests/testData/inspection/deadCode/mockedField/src/Test.java b/java/java-tests/testData/inspection/deadCode/mockedMockitoField/src/Test.java similarity index 83% rename from java/java-tests/testData/inspection/deadCode/mockedField/src/Test.java rename to java/java-tests/testData/inspection/deadCode/mockedMockitoField/src/Test.java index ac7e1bbc3884..9b60a657bb72 100644 --- a/java/java-tests/testData/inspection/deadCode/mockedField/src/Test.java +++ b/java/java-tests/testData/inspection/deadCode/mockedMockitoField/src/Test.java @@ -1,4 +1,4 @@ -public class MyMTest { +public class MyMockitoTest { @org.mockito.Mock private String myFoo; diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/UnusedDeclarationInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/UnusedDeclarationInspectionTest.java index 629d1128d517..d9c8c8d9e996 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/UnusedDeclarationInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/UnusedDeclarationInspectionTest.java @@ -155,7 +155,11 @@ public class UnusedDeclarationInspectionTest extends AbstractUnusedDeclarationTe doTest(); } - public void testMockedField() { + public void testMockedMockitoField() { + doTest(); + } + + public void testMockedEasyMockField() { doTest(); } diff --git a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitImplicitUsageProvider.java b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitImplicitUsageProvider.java index 09ae604fcafc..26825616e5ce 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitImplicitUsageProvider.java +++ b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitImplicitUsageProvider.java @@ -28,14 +28,15 @@ import static com.siyeh.ig.junit.JUnitCommonClassNames.ORG_JUNIT_JUPITER_PARAMS_ import static com.siyeh.ig.junit.JUnitCommonClassNames.ORG_JUNIT_JUPITER_PARAMS_PROVIDER_METHOD_SOURCE; public class JUnitImplicitUsageProvider implements ImplicitUsageProvider { - private static final String MOCK = "org.mockito.Mock"; + private static final String MOCKITO_MOCK = "org.mockito.Mock"; private static final String KOTLIN_JVM_STATIC = "kotlin.jvm.JvmStatic"; private static final List INJECTED_FIELD_ANNOTATIONS = Arrays.asList( - MOCK, + MOCKITO_MOCK, "org.mockito.Spy", "org.mockito.Captor", "org.mockito.InjectMocks", + "org.easymock.Mock", "org.assertj.core.api.junit.jupiter.InjectSoftAssertions", "org.junit.jupiter.api.io.TempDir"); @@ -150,7 +151,7 @@ public class JUnitImplicitUsageProvider implements ImplicitUsageProvider { @Override public boolean isImplicitWrite(@NotNull PsiElement element) { - return element instanceof PsiParameter && AnnotationUtil.isAnnotated((PsiParameter)element, MOCK, 0) || + return element instanceof PsiParameter && AnnotationUtil.isAnnotated((PsiParameter)element, MOCKITO_MOCK, 0) || element instanceof PsiField && AnnotationUtil.isAnnotated((PsiField)element, INJECTED_FIELD_ANNOTATIONS, 0); }