IDEA-CR-62986 Junit5 class is testable in case it has testable methods

GitOrigin-RevId: 9c8cd5f782ad263676fd3994586fe68ae48fda6a
This commit is contained in:
Olga.Klisho
2020-05-30 02:08:38 +03:00
committed by intellij-monorepo-bot
parent 32638112de
commit 20c3fad45f
@@ -289,12 +289,6 @@ public class JUnitUtil {
if (psiClass.isAnnotationType()) return false;
if (JavaPsiFacade.getInstance(psiClass.getProject())
.findClass(CUSTOM_TESTABLE_ANNOTATION, psiClass.getResolveScope()) == null
&& !MetaAnnotationUtil.hasMetaAnnotatedMethods(psiClass,Collections.singleton(CUSTOM_TESTABLE_ANNOTATION))) {
return false;
}
if (psiClass.getContainingClass() != null && MetaAnnotationUtil.isMetaAnnotated(psiClass, Collections.singleton(JUNIT5_NESTED))) {
return true;
}
@@ -303,6 +297,10 @@ public class JUnitUtil {
return true;
}
if (MetaAnnotationUtil.isMetaAnnotated(psiClass, TEST5_ANNOTATIONS)) {
return true;
}
if (!PsiClassUtil.isRunnableClass(psiClass, false, checkAbstract)) return false;
return CachedValuesManager.getCachedValue(psiClass, () -> {