azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Retain original file extension to test formatting in scripts

Browse Source
This commit is contained in:
Ilya Ryzhenkov
2014-03-19 09:14:19 +04:00
committed by Andrey Breslav
parent 9239fa2ece
commit 4ba423ee16
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java
+7 -6
View File
@@ -77,12 +77,12 @@ public abstract class AbstractJetFormatterTest extends LightIdeaTestCase {
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.HIGHEST); LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.HIGHEST);
} }
public void doTextTest(@NonNls String text, File fileAfter) throws IncorrectOperationException { public void doTextTest(@NonNls String text, File fileAfter, String extension) throws IncorrectOperationException {
doTextTest(Action.REFORMAT, text, fileAfter); doTextTest(Action.REFORMAT, text, fileAfter, extension);
} }
public void doTextTest(final Action action, final String text, File fileAfter) throws IncorrectOperationException { public void doTextTest(final Action action, final String text, File fileAfter, String extension) throws IncorrectOperationException {
final PsiFile file = createFile("A.kt", text); final PsiFile file = createFile("A" + extension, text);
if (myLineRange != null) { if (myLineRange != null) {
DocumentImpl document = new DocumentImpl(text); DocumentImpl document = new DocumentImpl(text);
@@ -136,7 +136,8 @@ public abstract class AbstractJetFormatterTest extends LightIdeaTestCase {
public void doTest(@NotNull String expectedFileNameWithExtension, boolean inverted) throws Exception { public void doTest(@NotNull String expectedFileNameWithExtension, boolean inverted) throws Exception {
String testFileName = expectedFileNameWithExtension.substring(0, expectedFileNameWithExtension.indexOf(".")); String testFileName = expectedFileNameWithExtension.substring(0, expectedFileNameWithExtension.indexOf("."));
String originalFileText = FileUtil.loadFile(new File(testFileName + ".kt"), true); String testFileExtension = expectedFileNameWithExtension.substring(expectedFileNameWithExtension.lastIndexOf("."));
String originalFileText = FileUtil.loadFile(new File(testFileName + testFileExtension), true);
SettingsConfigurator configurator = JetFormatSettingsUtil.createConfigurator(originalFileText, JetFormatSettingsUtil.getSettings()); SettingsConfigurator configurator = JetFormatSettingsUtil.createConfigurator(originalFileText, JetFormatSettingsUtil.getSettings());
if (!inverted) { if (!inverted) {
@@ -145,7 +146,7 @@ public abstract class AbstractJetFormatterTest extends LightIdeaTestCase {
else { else {
configurator.configureInvertedSettings(); configurator.configureInvertedSettings();
} }
doTextTest(originalFileText, new File(expectedFileNameWithExtension)); doTextTest(originalFileText, new File(expectedFileNameWithExtension), testFileExtension);
JetFormatSettingsUtil.getSettings().clearCodeStyleSettings(); JetFormatSettingsUtil.getSettings().clearCodeStyleSettings();
} }