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: run test method of an abstract class in inheritors (IDEA-53111)

Browse Source
This commit is contained in:
anna
2012-01-17 16:41:51 +01:00
parent dc7370da1e
commit 95b746bd04
9 changed files with 165 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
+4
View File
@@ -128,6 +128,10 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea
public ConfigurationType getConfigurationType() {
return myConfigurationFactory.getType();
}
public void perform(ConfigurationContext context, Runnable performRunnable){
performRunnable.run();
}
public static <T extends RuntimeConfigurationProducer> T getInstance(final Class<T> aClass) {
final RuntimeConfigurationProducer[] configurationProducers = Extensions.getExtensions(RUNTIME_CONFIGURATION_PRODUCER);
platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java
+6 -1
View File
@@ -168,7 +168,12 @@ public abstract class BaseRunConfigurationAction extends ActionGroup {
private void perform(final RuntimeConfigurationProducer producer, final ConfigurationContext context) {
final RunnerAndConfigurationSettings configuration = context.updateConfiguration(producer);
if (configuration != null) {
perform(context);
producer.perform(context, new Runnable() {
@Override
public void run() {
perform(context);
}
});
}
}
plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+10
View File
@@ -362,6 +362,16 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
return false;
}
public void bePatternConfiguration(List<PsiClass> classes, PsiMethod method) {
Set<String> patterns = new HashSet<String>();
for (PsiClass pattern : classes) {
patterns.add(pattern.getQualifiedName());
}
myData.setPatterns(patterns);
myData.METHOD_NAME = method.getName();
myData.TEST_OBJECT = TEST_PATTERN;
}
public static class Data implements Cloneable {
public String PACKAGE_NAME;
private String DIR_NAME;
plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java
+1 -1
View File
@@ -59,7 +59,7 @@ public abstract class JUnitConfigurationProducer extends JavaRuntimeConfiguratio
location = JavaExecutionUtil.stepIntoSingleClass(location);
final PsiElement element = location.getPsiElement();
final PsiClass testClass = JUnitUtil.getTestClass(element);
final PsiMethod testMethod = JUnitUtil.getTestMethod(element);
final PsiMethod testMethod = JUnitUtil.getTestMethod(element, false);
final PsiPackage testPackage;
if (element instanceof PsiPackage) {
testPackage = (PsiPackage)element;
plugins/junit/src/com/intellij/execution/junit/TestMethod.java
+6 -5
View File
@@ -21,10 +21,7 @@ import com.intellij.execution.*;
import com.intellij.execution.configurations.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiPackage;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.listeners.RefactoringElementAdapter;
import com.intellij.refactoring.listeners.RefactoringElementListener;
@@ -108,9 +105,13 @@ class TestMethod extends TestObject {
PsiClass testClass,
PsiMethod testMethod,
PsiPackage testPackage) {
if (testClass == null) return false;
if (testMethod == null) return false;
final PsiClass containingClass = testMethod.getContainingClass();
if (testClass == null && (containingClass == null || !containingClass.hasModifierProperty(PsiModifier.ABSTRACT))) return false;
final JUnitConfiguration.Data data = configuration.getPersistentData();
if (containingClass != null && containingClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
return Comparing.equal(testMethod.getName(), data.getMethodName());
}
return
Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(testClass), data.getMainClassName()) &&
Comparing.equal(testMethod.getName(), data.getMethodName());
plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java
+124 -1
View File
@@ -18,14 +18,29 @@ package com.intellij.execution.junit;
import com.intellij.execution.JavaRunConfigurationExtensionManager;
import com.intellij.execution.Location;
import com.intellij.execution.PsiLocation;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.junit2.info.MethodLocation;
import com.intellij.ide.util.PsiClassListCellRenderer;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.ui.ColoredListCellRenderer;
import com.intellij.ui.components.JBList;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Processor;
import javax.swing.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
public class TestMethodConfigurationProducer extends JUnitConfigurationProducer {
private Location<PsiMethod> myMethodLocation;
@@ -52,9 +67,117 @@ public class TestMethodConfigurationProducer extends JUnitConfigurationProducer
private static Location<PsiMethod> getTestMethod(final Location<?> location) {
for (Iterator<Location<PsiMethod>> iterator = location.getAncestors(PsiMethod.class, false); iterator.hasNext();) {
final Location<PsiMethod> methodLocation = iterator.next();
if (JUnitUtil.isTestMethod(methodLocation)) return methodLocation;
if (JUnitUtil.isTestMethod(methodLocation, false)) return methodLocation;
}
return null;
}
@Override
public void perform(final ConfigurationContext context, final Runnable performRunnable) {
final PsiMethod psiMethod = myMethodLocation.getPsiElement();
final PsiClass containingClass = psiMethod.getContainingClass();
if (containingClass != null && containingClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
final List<PsiClass> classes = new ArrayList<PsiClass>();
if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
@Override
public void run() {
ClassInheritorsSearch.search(containingClass).forEach(new Processor<PsiClass>() {
@Override
public boolean process(PsiClass aClass) {
if (!aClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
classes.add(aClass);
}
return true;
}
});
}
}, "Search for " + containingClass.getQualifiedName() + " inheritors", true, containingClass.getProject())) {
return;
}
if (classes.size() == 1) {
runForClass(classes.get(0), psiMethod, context, performRunnable);
return;
}
//suggest to run all inherited tests
classes.add(0, null);
final JBList list = new JBList(classes);
list.setCellRenderer(new PsiClassListCellRenderer() {
@Override
protected boolean customizeNonPsiElementLeftRenderer(ColoredListCellRenderer renderer,
JList list,
Object value,
int index,
boolean selected,
boolean hasFocus) {
if (value == null) {
renderer.append("All");
return true;
}
return super.customizeNonPsiElementLeftRenderer(renderer, list, value, index, selected, hasFocus);
}
});
JBPopupFactory.getInstance().createListPopupBuilder(list)
.setTitle("Choose executable classes to run " + psiMethod.getName())
.setMovable(false)
.setResizable(false)
.setRequestFocus(true)
.setItemChoosenCallback(new Runnable() {
public void run() {
final Object[] values = list.getSelectedValues();
if (values == null) return;
runMethod(values, psiMethod, context, performRunnable, classes);
}
}).createPopup().showInBestPositionFor(context.getDataContext());
return;
}
super.perform(context, performRunnable);
}
private static void runMethod(Object[] values,
PsiMethod psiMethod,
ConfigurationContext context,
Runnable performRunnable,
List<PsiClass> classes) {
if (values.length == 1) {
final Object value = values[0];
if (value instanceof PsiClass) {
runForClass((PsiClass)value, psiMethod, context, performRunnable);
}
else {
runForClasses(classes, psiMethod, context, performRunnable);
}
return;
}
if (ArrayUtil.contains(null, values)) {
runForClasses(classes, psiMethod, context, performRunnable);
}
else {
final List<PsiClass> selectedClasses = new ArrayList<PsiClass>();
for (Object value : values) {
if (value instanceof PsiClass) {
selectedClasses.add((PsiClass)value);
}
}
runForClasses(selectedClasses, psiMethod, context, performRunnable);
}
}
private static void runForClasses(List<PsiClass> classes, PsiMethod method, ConfigurationContext context, Runnable performRunnable) {
classes.remove(null);
((JUnitConfiguration)context.getConfiguration().getConfiguration()).bePatternConfiguration(classes, method);
performRunnable.run();
}
private static void runForClass(final PsiClass aClass,
final PsiMethod psiMethod,
final ConfigurationContext context,
final Runnable performRunnable) {
final Project project = psiMethod.getProject();
((JUnitConfiguration)context.getConfiguration().getConfiguration()).beMethodConfiguration(
new MethodLocation(project, psiMethod,
new PsiLocation<PsiClass>(project, aClass)));
performRunnable.run();
}
}
plugins/junit/src/com/intellij/execution/junit/TestsPattern.java
+12 -1
View File
@@ -27,12 +27,15 @@ import com.intellij.execution.util.JavaParametersUtil;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiPackage;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.listeners.RefactoringElementListener;
import com.intellij.util.Function;
import com.intellij.util.FunctionUtil;
import org.jetbrains.annotations.Nullable;
@@ -78,7 +81,12 @@ public class TestsPattern extends TestObject {
} else {
JavaParametersUtil.configureProject(project, myJavaParameters, JavaParameters.JDK_AND_CLASSES_AND_TESTS, jreHome);
}
addClassesListToJavaParameters(classNames, FunctionUtil.<String>id(), "", true, isJUnit4);
addClassesListToJavaParameters(classNames, StringUtil.isEmpty(data.METHOD_NAME) ? FunctionUtil.<String>id() : new Function<String, String>() {
@Override
public String fun(String className) {
return className + "," + data.METHOD_NAME;
}
}, "", true, isJUnit4);
}
@Override
@@ -100,6 +108,9 @@ public class TestsPattern extends TestObject {
PsiClass testClass,
PsiMethod testMethod,
PsiPackage testPackage) {
if (testMethod != null && Comparing.strEqual(testMethod.getName(), configuration.getPersistentData().METHOD_NAME)) {
return true;
}
return false;
}
plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
+1 -1
View File
@@ -307,7 +307,7 @@ public class JUnitConfigurable extends SettingsEditor<JUnitConfiguration> implem
myPattern.setVisible(true);
myDir.setVisible(false);
myClass.setVisible(false);
myMethod.setVisible(false);
myMethod.setVisible(true);
myForkCb.setEnabled(true);
myForkCb.setModel(new DefaultComboBoxModel(FORK_MODE_ALL));
myForkCb.setSelectedItem(selectedItem);
plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class JUnit4TestRunnerUtil {
}
public String describe() {
return "Failed tests";
return "Tests";
}
});
}