From ef27a59a57e5d11ef9b43dffdf65c2d0259135f2 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 20 May 2015 16:51:10 +0200
Subject: [PATCH] NPE (IDEA-140526)

---
 .../testng/model/TestNGConsoleProperties.java            | 4 +++-
 .../theoryinpractice/testng/model/TestNGTestGroup.java   | 6 +++++-
 .../theoryinpractice/testng/model/TestNGTestPattern.java | 9 +++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
index 35aae2d20cc4..0dcb581b96c5 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
@@ -19,6 +19,7 @@ import com.intellij.execution.Executor;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.JavaAwareTestConsoleProperties;
 import com.intellij.execution.testframework.JavaTestLocator;
+import com.intellij.execution.testframework.SourceScope;
 import com.intellij.execution.testframework.sm.runner.SMTestLocator;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -45,7 +46,8 @@ public class TestNGConsoleProperties extends JavaAwareTestConsoleProperties<Test
       return super.initScope();
     }
     else {
-      return myConfiguration.getPersistantData().getScope().getSourceScope(myConfiguration).getGlobalSearchScope();
+      final SourceScope sourceScope = myConfiguration.getPersistantData().getScope().getSourceScope(myConfiguration);
+      return sourceScope != null ? sourceScope.getGlobalSearchScope() : GlobalSearchScope.allScope(getProject());
     }
   }
 
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestGroup.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestGroup.java
index ef24a830ec65..31cbaae50a2c 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestGroup.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestGroup.java
@@ -17,8 +17,10 @@ package com.theoryinpractice.testng.model;
 
 import com.intellij.execution.CantRunException;
 import com.intellij.execution.configurations.RuntimeConfigurationException;
+import com.intellij.execution.testframework.SourceScope;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
+import com.intellij.psi.search.GlobalSearchScope;
 import com.theoryinpractice.testng.configuration.TestNGConfiguration;
 import com.theoryinpractice.testng.util.TestNGUtil;
 
@@ -36,8 +38,10 @@ public class TestNGTestGroup extends TestNGTestObject {
     throws CantRunException {
     final TestData data = myConfig.getPersistantData();
     //for a group, we include all classes
+    final SourceScope sourceScope = data.getScope().getSourceScope(myConfig);
     final TestClassFilter classFilter =
-      new TestClassFilter(data.getScope().getSourceScope(myConfig).getGlobalSearchScope(), myConfig.getProject(), true, true);
+      new TestClassFilter(sourceScope != null ? sourceScope.getGlobalSearchScope() : GlobalSearchScope.allScope(myConfig.getProject()),
+                          myConfig.getProject(), true, true);
     PsiClass[] testClasses = TestNGUtil.getAllTestClasses(classFilter, false);
     if (testClasses != null) {
       for (PsiClass c : testClasses) {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestPattern.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestPattern.java
index 78e56e27de73..70f7d4cc7ada 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestPattern.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestPattern.java
@@ -18,6 +18,7 @@ package com.theoryinpractice.testng.model;
 import com.intellij.execution.CantRunException;
 import com.intellij.execution.configurations.RuntimeConfigurationException;
 import com.intellij.execution.configurations.RuntimeConfigurationWarning;
+import com.intellij.execution.testframework.SourceScope;
 import com.intellij.execution.testframework.TestSearchScope;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -26,6 +27,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiMethod;
+import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.ClassUtil;
 import com.theoryinpractice.testng.configuration.TestNGConfiguration;
 import com.theoryinpractice.testng.util.TestNGUtil;
@@ -97,12 +99,11 @@ public class TestNGTestPattern extends TestNGTestObject {
         catch (PatternSyntaxException e) {
           continue;
         }
-        if (compilePattern != null) {
-          compilePatterns.add(compilePattern);
-        }
+        compilePatterns.add(compilePattern);
       }
+      final SourceScope sourceScope = scope.getSourceScope(myConfig);
       TestClassFilter projectFilter =
-        new TestClassFilter(scope.getSourceScope(myConfig).getGlobalSearchScope(), myConfig.getProject(), true, true){
+        new TestClassFilter(sourceScope != null ? sourceScope.getGlobalSearchScope() : GlobalSearchScope.allScope(myConfig.getProject()), myConfig.getProject(), true, true){
           @Override
           public boolean isAccepted(PsiClass psiClass) {
             if (super.isAccepted(psiClass)) {