From c7bc2331e0b085ebf29c853a67335e64babae3b9 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 11 Mar 2016 13:11:32 +0100 Subject: [PATCH] junit: don't collect abstract classes to run in package --- .../impl/src/com/intellij/execution/junit/JUnitUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java index db073a2738d5..d1e29e03714d 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java +++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java @@ -146,10 +146,11 @@ public class JUnitUtil { } final PsiModifierList modifierList = psiClass.getModifierList(); if (modifierList == null) return false; - if (AnnotationUtil.isAnnotated(psiClass, RUN_WITH, true)) return true; - final boolean hasJUnit5 = isJUnit5(modifierList); if (!PsiClassUtil.isRunnableClass(psiClass, !hasJUnit5, checkAbstract)) return false; + + if (AnnotationUtil.isAnnotated(psiClass, RUN_WITH, true)) return true; + if (checkForTestCaseInheritance && (!hasJUnit5 || psiClass.hasModifierProperty(PsiModifier.PUBLIC)) && isTestCaseInheritor(psiClass)) return true; for (final PsiMethod method : psiClass.getAllMethods()) {