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

test discovery: choose one of the initial modules when applicable

Browse Source
This commit is contained in:
Anna Kozlova
2016-06-20 10:29:14 +03:00
parent a664f8b8d6
commit d2417e5ac0
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryConfigurationProducer.java
+10 -3
View File
@@ -35,12 +35,10 @@ import com.intellij.psi.PsiMethod;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testIntegration.TestFramework;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.ContainerUtilRt;
import com.intellij.util.containers.HashSet;
import java.io.IOException;
import java.util.*;
import java.util.stream.Stream;
public abstract class TestDiscoveryConfigurationProducer extends JavaRunConfigurationProducerBase<JavaTestConfigurationBase> {
protected TestDiscoveryConfigurationProducer(ConfigurationType type) {
@@ -107,7 +105,13 @@ public abstract class TestDiscoveryConfigurationProducer extends JavaRunConfigur
allModules.retainAll(dependentModules);
});
if (!allModules.isEmpty()) {
configuration.setModule(allModules.iterator().next());
Module aModule = allModules.iterator().next();
for (Module module : survivedModules) {
if (allModules.contains(module)) {
aModule = module;
}
}
configuration.setModule(aModule);
}
return true;
@@ -145,6 +149,9 @@ public abstract class TestDiscoveryConfigurationProducer extends JavaRunConfigur
return null;
}
final PsiClass containingClass = method.getContainingClass();
if (containingClass == null) {
return null;
}
final String qualifiedName = containingClass.getQualifiedName();
if (qualifiedName != null) {
return Pair.create(qualifiedName, method.getName());