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: test detection optimization

Browse Source 
IDEA-CR-41022
This commit is contained in:
Anna.Kozlova
2018-12-07 19:51:13 +01:00
parent 12bef395b6
commit 9eee56e6b1
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
+9 -7
View File
@@ -110,13 +110,15 @@ class TestDirectory extends TestPackage {
@Override
protected void searchTests5(Module module, TestClassFilter classFilter, Set<PsiClass> classes) throws CantRunException {
PsiDirectory directory = getDirectory(getConfiguration().getPersistentData());
PsiPackage aPackage = JavaRuntimeConfigurationProducerBase.checkPackage(directory);
if (aPackage != null && module != null) {
PsiDirectory[] directories =
aPackage.getDirectories(module.getModuleScope(true).intersectWith(GlobalSearchScopesCore.projectTestScope(getConfiguration().getProject())));
if (directories.length > 1) {//need to enumerate classes in one of multiple test source roots
collectClassesRecursively(directory, Condition.TRUE, classes);
if (module != null) {
PsiDirectory directory = getDirectory(getConfiguration().getPersistentData());
PsiPackage aPackage = JavaRuntimeConfigurationProducerBase.checkPackage(directory);
if (aPackage != null) {
PsiDirectory[] directories =
aPackage.getDirectories(module.getModuleScope(true).intersectWith(GlobalSearchScopesCore.projectTestScope(getConfiguration().getProject())));
if (directories.length > 1) {//need to enumerate classes in one of multiple test source roots
collectClassesRecursively(directory, Condition.TRUE, classes);
}
}
}
}
plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class TestPackage extends TestObject {
try {
String packageName = getPackageName(data);
String filters = getFilters(myClasses, packageName);
if (JUnitStarter.JUNIT5_PARAMETER.equals(getRunner()) && filterOutputByDirectoryForJunit5(myClasses) && module != null) {
if (JUnitStarter.JUNIT5_PARAMETER.equals(getRunner()) && module != null && filterOutputByDirectoryForJunit5(myClasses)) {
JUnitStarter.printClassesList(composeDirectoryFilter(module), packageName, "", filters, myTempFile);
}
else {