MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE (IDEA-140526)

Browse Source
This commit is contained in:
Anna Kozlova
2015-05-20 17:18:26 +02:00
parent d98a4c282a
commit ef27a59a57
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
+3 -1
View File
@@ -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());
}
}
plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestGroup.java
+5 -1
View File
@@ -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) {
plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestPattern.java
+5 -4
View File
@@ -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)) {