From 6f548f2a25564b6b64c43c52060cd3378acff2af Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 6 May 2014 15:20:09 +0400 Subject: [PATCH] skip tests under resources roots --- .../src/com/intellij/execution/junit/TestClassFilter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java b/plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java index d8f78b4d6b6b..2631df75d0ac 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java @@ -23,6 +23,7 @@ import com.intellij.ide.util.ClassFilter; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.Computable; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiClass; @@ -30,6 +31,7 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes; import java.util.ArrayList; import java.util.List; @@ -59,8 +61,9 @@ public class TestClassFilter implements ClassFilter.ClassFilterWithScope { (aClass.isInheritor(myBase, true) || JUnitUtil.isTestClass(aClass))) { final CompilerConfiguration compilerConfiguration = CompilerConfiguration.getInstance(getProject()); final VirtualFile virtualFile = PsiUtilCore.getVirtualFile(aClass); - return !compilerConfiguration.isExcludedFromCompilation(virtualFile) && - (!compilerConfiguration.isResourceFile(virtualFile) || compilerConfiguration.isCompilableResourceFile(myProject, virtualFile)); + if (virtualFile == null) return false; + return !compilerConfiguration.isExcludedFromCompilation(virtualFile) && + !ProjectRootManager.getInstance(myProject).getFileIndex().isUnderSourceRootOfType(virtualFile, JavaModuleSourceRootTypes.RESOURCES); } return false; }