junit: do not suggest to choose what to run when parametrization was selected

This commit is contained in:
Anna Kozlova
2014-01-07 20:00:44 +01:00
parent b6e117b60d
commit 2a4598d42b
2 changed files with 15 additions and 1 deletions
@@ -17,6 +17,7 @@ package com.intellij.execution.junit;
import com.intellij.execution.Location;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.junit2.PsiMemberParameterizedLocation;
import com.intellij.execution.junit2.info.MethodLocation;
import com.intellij.ide.util.PsiClassListCellRenderer;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
@@ -63,7 +64,10 @@ public class InheritorChooser {
if (aClass != null && !aClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
return false;
}
} else if (location instanceof PsiMemberParameterizedLocation) {
return false;
}
final List<PsiClass> classes = new ArrayList<PsiClass>();
if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
@Override
@@ -21,16 +21,26 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMember;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class PsiMemberParameterizedLocation extends PsiLocation<PsiElement> {
private final PsiClass myContainingClass;
private final String myParamSetName;
public PsiMemberParameterizedLocation(@NotNull Project project, @NotNull PsiElement psiElement, String paramSetName) {
public PsiMemberParameterizedLocation(@NotNull Project project,
@NotNull PsiElement psiElement,
@Nullable PsiClass containingClass,
String paramSetName) {
super(project, psiElement);
myContainingClass = containingClass;
myParamSetName = paramSetName;
}
public String getParamSetName() {
return myParamSetName;
}
public PsiClass getContainingClass() {
return myContainingClass;
}
}