MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

reject static methods as tests for standard annotations (IDEA-182687)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-12-22 19:23:54 +01:00
parent ab58831b44
commit 374042a969
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
+7 -2
View File
@@ -125,7 +125,8 @@ public class JUnitUtil {
final PsiMethod psiMethod = location.getPsiElement();
final PsiClass aClass = location instanceof MethodLocation ? ((MethodLocation)location).getContainingClass() : psiMethod.getContainingClass();
if (checkClass && (aClass == null || !isTestClass(aClass, checkAbstract, true))) return false;
if (isTestAnnotated(psiMethod)) return true;
if (isTestAnnotated(psiMethod, false)) return !psiMethod.hasModifierProperty(PsiModifier.STATIC);
if (MetaAnnotationUtil.isMetaAnnotated(psiMethod, Collections.singletonList(CUSTOM_TESTABLE_ANNOTATION))) return true;
if (psiMethod.isConstructor()) return false;
if (!psiMethod.hasModifierProperty(PsiModifier.PUBLIC)) return false;
if (psiMethod.hasModifierProperty(PsiModifier.ABSTRACT)) return false;
@@ -295,11 +296,15 @@ public class JUnitUtil {
}
public static boolean isTestAnnotated(final PsiMethod method) {
return isTestAnnotated(method, true);
}
public static boolean isTestAnnotated(final PsiMethod method, boolean includeCustom) {
if (AnnotationUtil.isAnnotated(method, TEST_ANNOTATION, 0) || JUnitRecognizer.willBeAnnotatedAfterCompilation(method)) {
return true;
}
return MetaAnnotationUtil.isMetaAnnotated(method, TEST5_ANNOTATIONS);
return MetaAnnotationUtil.isMetaAnnotated(method, includeCustom ? TEST5_ANNOTATIONS : TEST5_JUPITER_ANNOTATIONS);
}