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 patterns: enable run multiple tests from one groovy file ( IDEA-24592 )

Browse Source
This commit is contained in:
anna
2010-06-17 18:38:01 +04:00
parent 90a0f19d34
commit 8e3757caaf
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java
+1 -1
View File
@@ -48,7 +48,7 @@ public abstract class JUnitConfigurationProducer extends JavaRuntimeConfiguratio
@NotNull RunnerAndConfigurationSettings[] existingConfigurations,
ConfigurationContext context) {
final PsiElement[] elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(context.getDataContext());
if (elements != null && elements.length > 1) {
if (elements != null && PatternConfigurationProducer.collectTestClasses(elements).size() > 1) {
return null;
}
final Module predefinedModule =
plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java
+14 -6
View File
@@ -20,12 +20,11 @@ import com.intellij.execution.Location;
import com.intellij.execution.RunConfigurationExtension;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiClassOwner;
import com.intellij.psi.PsiElement;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import java.util.LinkedHashSet;
@@ -40,7 +39,7 @@ public class PatternConfigurationProducer extends JUnitConfigurationProducer {
final Project project = location.getProject();
final LinkedHashSet<String> classes = new LinkedHashSet<String>();
myElements = collectPatternElements(context, classes);
if (classes.isEmpty()) return null;
if (classes.size() <= 1) return null;
RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context);
final JUnitConfiguration configuration = (JUnitConfiguration)settings.getConfiguration();
final JUnitConfiguration.Data data = configuration.getPersistentData();
@@ -72,12 +71,21 @@ public class PatternConfigurationProducer extends JUnitConfigurationProducer {
}
private static PsiElement[] collectPatternElements(ConfigurationContext context, LinkedHashSet<String> classes) {
PsiElement[] elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(context.getDataContext());
if (elements != null && elements.length > 1) {
final DataContext dataContext = context.getDataContext();
PsiElement[] elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(dataContext);
if (elements != null) {
for (PsiClass psiClass : collectTestClasses(elements)) {
classes.add(psiClass.getQualifiedName());
}
return elements;
} else {
final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext);
if (file instanceof PsiClassOwner) {
for (PsiClass psiClass : collectTestClasses(((PsiClassOwner)file).getClasses())) {
classes.add(psiClass.getQualifiedName());
}
return new PsiElement[]{file};
}
}
return null;
}
plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class TestClassConfigurationProducer extends JUnitConfigurationProducer {
final Project project = location.getProject();
final PsiElement[] elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(context.getDataContext());
if (elements != null && elements.length > 1) {
if (elements != null && PatternConfigurationProducer.collectTestClasses(elements).size() > 1) {
return null;
}
myTestClass = JUnitUtil.getTestClass(location);