AbstractInplaceIntroduceTest should be a little bit more abstract

This commit is contained in:
Dmitry Jemerov
2011-09-05 20:41:11 +02:00
parent 22b304a65b
commit 0d5211ba43
2 changed files with 10 additions and 4 deletions
@@ -57,4 +57,8 @@ public abstract class AbstractJavaInplaceIntroduceTest extends AbstractInplaceIn
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk17();
}
protected String getExtension() {
return ".java";
}
}
@@ -42,7 +42,7 @@ public abstract class AbstractInplaceIntroduceTest<E extends PsiElement, V exten
protected void doTestEscape() throws Exception {
String name = getTestName(true);
configureByFile(getBasePath() + name + ".java");
configureByFile(getBasePath() + name + getExtension());
final boolean enabled = getEditor().getSettings().isVariableInplaceRenameEnabled();
TemplateManagerImpl templateManager = (TemplateManagerImpl)TemplateManager.getInstance(LightPlatformTestCase.getProject());
try {
@@ -60,7 +60,7 @@ public abstract class AbstractInplaceIntroduceTest<E extends PsiElement, V exten
TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
assert state != null;
state.gotoEnd(true);
checkResultByFile(getBasePath() + name + "_after.java");
checkResultByFile(getBasePath() + name + "_after" + getExtension());
}
finally {
getEditor().getSettings().setVariableInplaceRenameEnabled(enabled);
@@ -68,9 +68,11 @@ public abstract class AbstractInplaceIntroduceTest<E extends PsiElement, V exten
}
}
protected abstract String getExtension();
protected void doTest(final Pass<AbstractInplaceIntroducer> pass) throws Exception {
String name = getTestName(true);
configureByFile(getBasePath() + name + ".java");
configureByFile(getBasePath() + name + getExtension());
final boolean enabled = getEditor().getSettings().isVariableInplaceRenameEnabled();
TemplateManagerImpl templateManager = (TemplateManagerImpl)TemplateManager.getInstance(LightPlatformTestCase.getProject());
try {
@@ -89,7 +91,7 @@ public abstract class AbstractInplaceIntroduceTest<E extends PsiElement, V exten
TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
assert state != null;
state.gotoEnd(false);
checkResultByFile(getBasePath() + name + "_after.java");
checkResultByFile(getBasePath() + name + "_after" + getExtension());
}
finally {
getEditor().getSettings().setVariableInplaceRenameEnabled(enabled);