From 20c3fad45f2dd5440392d11d49b2498aa8548bf5 Mon Sep 17 00:00:00 2001
From: "Olga.Klisho" <Olga.Klisho@jetbrains.com>
Date: Fri, 29 May 2020 21:26:03 +0300
Subject: [PATCH] IDEA-CR-62986 Junit5 class is testable in case it has
 testable methods

GitOrigin-RevId: 9c8cd5f782ad263676fd3994586fe68ae48fda6a
---
 .../src/com/intellij/execution/junit/JUnitUtil.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 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 fd52a319c012..ef3003fc02f0 100644
--- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
+++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
@@ -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, () -> {