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

junit: allow absence of TestCase in junit 5 library

Browse Source
This commit is contained in:
Anna Kozlova
2016-09-19 11:17:00 +03:00
parent 4e4aabdb8c
commit ec11e56564
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java
+11 -4
View File
@@ -31,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.annotations.Nullable;
import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes;
import java.util.ArrayList;
@@ -39,13 +40,13 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
public class TestClassFilter implements ClassFilter.ClassFilterWithScope {
private final PsiClass myBase;
private final @Nullable PsiClass myBase;
private final Project myProject;
private final GlobalSearchScope myScope;
private TestClassFilter(@NotNull PsiClass base, final GlobalSearchScope scope) {
private TestClassFilter(@Nullable PsiClass base, final GlobalSearchScope scope) {
myBase = base;
myProject = base.getProject();
myProject = scope.getProject();
myScope = scope;
}
@@ -58,7 +59,7 @@ public class TestClassFilter implements ClassFilter.ClassFilterWithScope {
@Override
public Boolean compute() {
if (aClass.getQualifiedName() != null &&
(aClass.isInheritor(myBase, true) && ConfigurationUtil.PUBLIC_INSTANTIATABLE_CLASS.value(aClass) || JUnitUtil.isTestClass(aClass))) {
(myBase != null && aClass.isInheritor(myBase, true) && ConfigurationUtil.PUBLIC_INSTANTIATABLE_CLASS.value(aClass) || JUnitUtil.isTestClass(aClass))) {
final CompilerConfiguration compilerConfiguration = CompilerConfiguration.getInstance(getProject());
final VirtualFile virtualFile = PsiUtilCore.getVirtualFile(aClass);
if (virtualFile == null) return false;
@@ -85,6 +86,11 @@ public class TestClassFilter implements ClassFilter.ClassFilterWithScope {
final PsiClass testCase = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass>() {
@Override
public PsiClass compute() {
if (JUnitUtil.isJUnit5(module != null ? GlobalSearchScope.moduleRuntimeScope(module, true)
: sourceScope.getGlobalSearchScope(),
sourceScope.getProject())) {
return null;
}
try {
return module == null ? JUnitUtil.getTestCaseClass(sourceScope) : JUnitUtil.getTestCaseClass(module);
}
@@ -141,5 +147,6 @@ public class TestClassFilter implements ClassFilter.ClassFilterWithScope {
}
public GlobalSearchScope getScope() { return myScope; }
@Nullable
public PsiClass getBase() { return myBase; }
}