From 82b4375590ace5c92d0fa3721ffc1b5a3b138dfe Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Fri, 9 Mar 2018 11:00:16 +0100
Subject: [PATCH] junit: don't recognize tests in libraries

EA-117378 - assert: AbstractInClassConfigurationProducer.setupConfigurationFromContext
---
 .../impl/src/com/intellij/execution/junit/JUnitUtil.java      | 4 ++--
 .../testframework/AbstractInClassConfigurationProducer.java   | 2 +-
 2 files changed, 3 insertions(+), 3 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 75ca57557239..2ba8beb37ae4 100644
--- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
+++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
@@ -209,7 +209,7 @@ public class JUnitUtil {
 
   public static boolean isJUnit4TestClass(final PsiClass psiClass, boolean checkAbstract) {
     final PsiModifierList modifierList = psiClass.getModifierList();
-    if (modifierList == null) return false;
+    if (modifierList == null || JavaExecutionUtil.findModule(psiClass) == null) return false;
     final PsiClass topLevelClass = PsiTreeUtil.getTopmostParentOfType(modifierList, PsiClass.class);
     if (topLevelClass != null) {
       if (AnnotationUtil.isAnnotated(topLevelClass, RUN_WITH, CHECK_HIERARCHY)) {
@@ -237,7 +237,7 @@ public class JUnitUtil {
 
   public static boolean isJUnit5TestClass(@NotNull final PsiClass psiClass, boolean checkAbstract) {
     final PsiModifierList modifierList = psiClass.getModifierList();
-    if (modifierList == null) return false;
+    if (modifierList == null || JavaExecutionUtil.findModule(psiClass) == null) return false;
 
     if (psiClass.getContainingClass() != null && AnnotationUtil.isAnnotated(psiClass, JUNIT5_NESTED, 0)) {
       return true;
diff --git a/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java
index ff32ff81bd47..b55620fef43d 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java
@@ -153,7 +153,7 @@ public abstract class AbstractInClassConfigurationProducer<T extends JavaTestCon
       PsiFile containingFile = psiClass.getContainingFile();
       LOG.error("No module found", new Attachment("context.txt",
                                                   "generated name:" + configuration.getName() +
-                                                  "valid: " + psiClass.isValid() +
+                                                  "; valid: " + psiClass.isValid() +
                                                   "; physical: " + psiClass.isPhysical() +
                                                   "; className: " + psiClass.getQualifiedName() +
                                                   "; file: " + containingFile +