From add6b9808222eb80ffb36f02c78f8e0597946bd1 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 20 Mar 2018 15:07:23 +0100 Subject: [PATCH] junit 5.1: don't suggest private for extension fields (IDEA-188590) --- .../src/com/siyeh/ig/junit/JUnitCommonClassNames.java | 1 + .../execution/junit2/inspection/JUnitEntryPoint.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java index e0247fb9841f..b350fe1ca5f5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java @@ -55,4 +55,5 @@ public class JUnitCommonClassNames { public static final String ORG_JUNIT_JUPITER_API_EXTENSION_EXTEND_WITH = "org.junit.jupiter.api.extension.ExtendWith"; public static final String ORG_JUNIT_JUPITER_API_TEST_INSTANCE = "org.junit.jupiter.api.TestInstance"; public static final String ORG_JUNIT_PLATFORM_ENGINE_TEST_ENGINE = "org.junit.platform.engine.TestEngine"; + public static final String ORG_JUNIT_JUPITER_API_EXTENSION_REGISTER_EXTENSION = "org.junit.jupiter.api.extension.RegisterExtension"; } diff --git a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java index 49fc8f3df405..8923cc623d09 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java +++ b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java @@ -15,6 +15,7 @@ import com.intellij.psi.util.PsiClassUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.util.CommonProcessors; +import com.siyeh.ig.junit.JUnitCommonClassNames; import org.jdom.Element; import org.jetbrains.annotations.NotNull; @@ -77,6 +78,11 @@ public class JUnitEntryPoint extends EntryPointWithVisibilityLevel { if (container != null && JUnitUtil.isJUnit5TestClass(container, false)) { return PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL; } + + if (member instanceof PsiField && + AnnotationUtil.isAnnotated(member, JUnitCommonClassNames.ORG_JUNIT_JUPITER_API_EXTENSION_REGISTER_EXTENSION, 0)) { + return PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL; + } return -1; }