MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-17 07:20:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Introduce variable tests fixed for multi-catch type

Browse Source
This commit is contained in:
Roman Shevchenko
2011-03-22 19:32:43 +01:00
parent 2270811fba
commit 00292e4696
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceVariableHandler.java
View File

@@ -21,19 +21,27 @@ class MockIntroduceVariableHandler extends IntroduceVariableBase {
private final boolean myDeclareFinal;
private final boolean myReplaceLValues;
private final String myExpectedTypeCanonicalName;
private final boolean myLookForType;
public MockIntroduceVariableHandler(@NonNls final String name, final boolean replaceAll,
final boolean declareFinal, final boolean replaceLValues,
@NonNls final String expectedTypeCanonicalName) {
final boolean declareFinal, final boolean replaceLValues,
@NonNls final String expectedTypeCanonicalName) {
this(name, replaceAll, declareFinal, replaceLValues, expectedTypeCanonicalName, false);
}
public MockIntroduceVariableHandler(@NonNls final String name, final boolean replaceAll,
final boolean declareFinal, final boolean replaceLValues,
@NonNls final String expectedTypeCanonicalName, boolean lookForType) {
myName = name;
myReplaceAll = replaceAll;
myDeclareFinal = declareFinal;
myReplaceLValues = replaceLValues;
myExpectedTypeCanonicalName = expectedTypeCanonicalName;
myLookForType = lookForType;
}
@Override
public IntroduceVariableSettings getSettings(Project project, Editor editor,
PsiExpression expr, final PsiExpression[] occurrences,
@@ -42,7 +50,8 @@ class MockIntroduceVariableHandler extends IntroduceVariableBase {
boolean anyAssignmentLHS,
InputValidator validator,
final OccurrencesChooser.ReplaceChoice replaceChoice) {
final PsiType type = typeSelectorManager.getDefaultType();
final PsiType type = myLookForType ? findType(typeSelectorManager.getTypesForAll(), typeSelectorManager.getDefaultType())
: typeSelectorManager.getDefaultType();
Assert.assertTrue(type.getCanonicalText(), type.equalsToText(myExpectedTypeCanonicalName));
IntroduceVariableSettings introduceVariableSettings = new IntroduceVariableSettings() {
@Override
@@ -93,4 +102,11 @@ class MockIntroduceVariableHandler extends IntroduceVariableBase {
protected boolean reportConflicts(final MultiMap<PsiElement,String> conflicts, final Project project, IntroduceVariableSettings dialog) {
return false;
}
private PsiType findType(final PsiType[] candidates, PsiType defaultType) {
for (PsiType candidate : candidates) {
if (candidate.equalsToText(myExpectedTypeCanonicalName)) return candidate;
}
return defaultType;
}
}