From 778faf960b1213449556bca08feb5bac42f5e6ec Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 6 May 2015 20:42:07 +0200
Subject: [PATCH] don't check scope for class/method configurations as it is
 invisible in settings

---
 .../ui/properties/JUnitConsoleProperties.java      | 14 ++++++++++++--
 .../testng/model/TestNGConsoleProperties.java      |  9 ++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java b/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java
index c202fd0787b2..3f4531947b8c 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java
@@ -40,8 +40,18 @@ public class JUnitConsoleProperties extends JavaAwareTestConsoleProperties<JUnit
   @NotNull
   @Override
   protected GlobalSearchScope initScope() {
-    final SourceScope sourceScope = myConfiguration.getPersistentData().getScope().getSourceScope(myConfiguration);
-    return sourceScope != null ? sourceScope.getGlobalSearchScope() : GlobalSearchScope.allScope(getProject());
+    final JUnitConfiguration.Data persistentData = myConfiguration.getPersistentData();
+    final String testObject = persistentData.TEST_OBJECT;
+    //ignore invisible setting
+    if (JUnitConfiguration.TEST_CATEGORY.equals(testObject) ||
+        JUnitConfiguration.TEST_PATTERN.equals(testObject) ||
+        JUnitConfiguration.TEST_PACKAGE.equals(testObject)) {
+      final SourceScope sourceScope = persistentData.getScope().getSourceScope(myConfiguration);
+      return sourceScope != null ? sourceScope.getGlobalSearchScope() : GlobalSearchScope.allScope(getProject());
+    }
+    else {
+      return super.initScope();
+    }
   }
 
   @Override
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
index 0dbc3942ee26..9bf17fa55363 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
@@ -39,7 +39,14 @@ public class TestNGConsoleProperties extends JavaAwareTestConsoleProperties<Test
   @NotNull
   @Override
   protected GlobalSearchScope initScope() {
-    return myConfiguration.getPersistantData().getScope().getSourceScope(myConfiguration).getGlobalSearchScope();
+    final String testObject = myConfiguration.getPersistantData().TEST_OBJECT;
+    if (TestType.CLASS.getType().equals(testObject) ||
+        TestType.METHOD.getType().equals(testObject)) {
+      return super.initScope();
+    }
+    else {
+      return myConfiguration.getPersistantData().getScope().getSourceScope(myConfiguration).getGlobalSearchScope();
+    }
   }
 
   @Override