From 909f22d402052f48fb9f278c5379df7ff9d5becf Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 12 Apr 2011 15:05:34 +0200 Subject: [PATCH] NPE --- .../junit2/ui/properties/JUnitConsoleProperties.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5698ddcf7aea..afcf772f2b6c 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 @@ -19,6 +19,7 @@ package com.intellij.execution.junit2.ui.properties; import com.intellij.execution.Executor; import com.intellij.execution.junit.JUnitConfiguration; import com.intellij.execution.testframework.JavaAwareTestConsoleProperties; +import com.intellij.execution.testframework.SourceScope; import com.intellij.ide.util.PropertiesComponent; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.config.Storage; @@ -43,6 +44,7 @@ public class JUnitConsoleProperties extends JavaAwareTestConsoleProperties { @Override public GlobalSearchScope getScope() { - return myConfiguration.getPersistentData().getScope().getSourceScope(myConfiguration).getLibrariesScope(); + final SourceScope sourceScope = myConfiguration.getPersistentData().getScope().getSourceScope(myConfiguration); + return sourceScope != null ? sourceScope.getLibrariesScope() : GlobalSearchScope.allScope(getProject()); } }