diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java index 94e2b0e962d..cee735e96d6 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java @@ -206,7 +206,7 @@ public class AntTaskTest extends KotlinIntegrationTestBase { } private static void checkFilePrefixPostfix(@NotNull File file, @Nullable File prefix, @Nullable File postfix) throws IOException { - String fileContent = FileUtil.loadFile(file); + String fileContent = FileUtil.loadFile(file, true); String prefixContent = FileUtilsPackage.readTextOrEmpty(prefix); assertTrue(fileContent.startsWith(prefixContent)); diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 28fc7071f6a..3ed2519d239 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -513,7 +513,7 @@ public class JetTestUtils { String content; try { - content = StringUtil.convertLineSeparators(FileUtil.loadFile(new File(filePath))); + content = FileUtil.loadFile(new File(filePath), true); } catch (IOException e) { throw new RuntimeException(e); @@ -743,7 +743,7 @@ public class JetTestUtils { } public static JetFile loadJetFile(@NotNull Project project, @NotNull File ioFile) throws IOException { - String text = FileUtil.loadFile(ioFile); + String text = FileUtil.loadFile(ioFile, true); return JetPsiFactory.createPhysicalFile(project, ioFile.getName(), text); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java index 5402c5a8197..2df6fdb9104 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java @@ -65,7 +65,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT protected void doTest(@NotNull String ktFileName) throws Exception { ktFile = new File(ktFileName); - String text = FileUtil.loadFile(ktFile); + String text = FileUtil.loadFile(ktFile, true); JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject()); assert psiFile != null; diff --git a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java index 218fe46e491..62dbfd9bd7d 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java @@ -77,7 +77,7 @@ public class LineNumberTest extends TestCaseWithTmpdir { String text; try { - text = FileUtil.loadFile(file); + text = FileUtil.loadFile(file, true); } catch (IOException e) { throw UtilsPackage.rethrow(e); diff --git a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java b/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java index b507f340781..84beafda618 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java @@ -38,7 +38,7 @@ public abstract class AbstractDefaultArgumentsReflectionTest extends CodegenTest protected void doTest(String path) throws IOException { loadFileByFullPath(path); - String fileText = FileUtil.loadFile(new File(path)); + String fileText = FileUtil.loadFile(new File(path), true); String className = loadInstructionValue(fileText, "CLASS"); boolean hasDefaultConstructor = loadInstructionValue(fileText, "HAS_DEFAULT_CONSTRUCTOR").equals("true"); diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java index b9629bc333a..92899f16044 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java @@ -58,7 +58,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith protected void doTest(@NotNull String path) throws IOException { File ktFile = new File(path); ModuleDescriptor moduleDescriptor = LazyResolveTestUtil.resolveEagerly(Collections.singletonList( - JetTestUtils.createFile(ktFile.getName(), FileUtil.loadFile(ktFile), getProject()) + JetTestUtils.createFile(ktFile.getName(), FileUtil.loadFile(ktFile, true), getProject()) ), getEnvironment()); PackageViewDescriptor testPackage = moduleDescriptor.getPackage(FqName.topLevel(TEST_PACKAGE_NAME)); diff --git a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt index 0004d9f0a80..07e45327af7 100644 --- a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt @@ -61,7 +61,7 @@ abstract class AbstractEvaluateExpressionTest: AbstractAnnotationDescriptorResol private fun doTest(path: String, getValueToTest: (JetProperty, BindingContext) -> String) { val myFile = File(path) - val fileText = FileUtil.loadFile(myFile) + val fileText = FileUtil.loadFile(myFile, true) val packageView = getPackage(fileText) val propertiesForTest = getObjectsToTest(fileText) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index dbdf363467a..27204e77020 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -138,7 +138,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit @NotNull Disposable disposable ) throws IOException { - String text = FileUtil.loadFile(file); + String text = FileUtil.loadFile(file, true); JetFile psiFile = JetTestUtils.createFile(file.getName(), text, jetCoreEnvironment.getProject()); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 7ac7d8851f1..3312d882d9f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -186,7 +186,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { assertTrue(compiledDir.mkdir()); List srcFiles = JetTestUtils.createTestFiles( - new File(javaFileName).getName(), FileUtil.loadFile(new File(javaFileName)), + new File(javaFileName).getName(), FileUtil.loadFile(new File(javaFileName), true), new JetTestUtils.TestFileFactory() { @Override public File create(String fileName, String text, Map directives) { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java index d6c9e33f17b..521f9c1ba79 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java @@ -66,7 +66,7 @@ public abstract class AbstractWriteSignatureTest extends TestCaseWithTmpdir { protected void doTest(String ktFileName) throws Exception { File ktFile = new File(ktFileName); - String text = FileUtil.loadFile(ktFile); + String text = FileUtil.loadFile(ktFile, true); JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject()); diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java index 5723a8141ee..8f60b081c92 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java @@ -69,7 +69,7 @@ public class JetPsiUtilTest extends JetLiteFixture { } public void testIsLocalClass() throws IOException { - String text = FileUtil.loadFile(new File(getTestDataPath() + "/psiUtil/isLocalClass.kt")); + String text = FileUtil.loadFile(new File(getTestDataPath() + "/psiUtil/isLocalClass.kt"), true); JetClass aClass = JetPsiFactory.createClass(getProject(), text); @SuppressWarnings("unchecked") diff --git a/compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java b/compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java index 12566638750..a5ff3b1347a 100644 --- a/compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java +++ b/compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java @@ -49,7 +49,7 @@ public class JetCodeConformanceTest extends TestCase { public void testParserCode() throws Exception { for (File sourceFile : FileUtil.findFilesByMask(JAVA_FILE_PATTERN, new File("compiler/frontend/src/org/jetbrains/jet/lang/parsing"))) { - String source = FileUtil.loadFile(sourceFile); + String source = FileUtil.loadFile(sourceFile, true); Pattern atPattern = Pattern.compile("assert.*?[^_]at.*?$", Pattern.MULTILINE); Matcher matcher = atPattern.matcher(source); @@ -68,7 +68,7 @@ public class JetCodeConformanceTest extends TestCase { continue; } - String source = FileUtil.loadFile(sourceFile); + String source = FileUtil.loadFile(sourceFile, true); if (source.contains("@author") && JAVADOC_PATTERN.matcher(source).find()) { // .contains() is invoked for optimization filesWithAuthorJavadoc.add(sourceFile); diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt index f31d9027b62..bb7f269ecb5 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.JetTestUtils public abstract class AbstractAnnotationParameterTest : AbstractAnnotationDescriptorResolveTest() { fun doTest(path: String) { - val fileText = FileUtil.loadFile(File(path)) + val fileText = FileUtil.loadFile(File(path), true) val packageView = getPackage(fileText) val classDescriptor = AbstractAnnotationDescriptorResolveTest.getClassDescriptor(packageView, "MyClass") diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java index 15e72c3c27f..3c6c7cea64f 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java @@ -41,7 +41,7 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment public void testRecursive() throws Exception { File ktFile = new File("compiler/testData/recursiveProcessor/declarations.kt"); File txtFile = new File("compiler/testData/recursiveProcessor/declarations.txt"); - String text = FileUtil.loadFile(ktFile); + String text = FileUtil.loadFile(ktFile, true); JetFile jetFile = JetTestUtils.createFile("declarations.kt", text, getEnvironment().getProject()); AnalyzeExhaust exhaust = JetTestUtils.analyzeFile(jetFile); PackageViewDescriptor testPackage = exhaust.getModuleDescriptor().getPackage(FqName.topLevel(Name.identifier("test"))); diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index 5cac04c4498..e9e04dfba0e 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -80,7 +80,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { private JetScope getContextScope() throws IOException { // todo comments - String text = FileUtil.loadFile(new File("compiler/testData/type-substitutor.kt")); + String text = FileUtil.loadFile(new File("compiler/testData/type-substitutor.kt"), true); JetFile jetFile = JetPsiFactory.createFile(getProject(), text); ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(Collections.singletonList(jetFile), getEnvironment()); JetScope topLevelDeclarations = module.getPackage(FqName.ROOT).getMemberScope(); diff --git a/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java b/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java index 568bcc9c5a5..adae2ae4e21 100644 --- a/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java +++ b/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java @@ -52,7 +52,7 @@ public abstract class AbstractJetQuickDocProviderTest extends LightCodeInsightFi String info = CtrlMouseHandler.getInfo(targetElement, element); File testDataFile = new File(path); - String textData = FileUtil.loadFile(testDataFile); + String textData = FileUtil.loadFile(testDataFile, true); List directives = InTextDirectivesUtils.findLinesWithPrefixesRemoved(textData, "INFO:"); if (directives.isEmpty()) { diff --git a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java index 91d00ef20f2..35f40e5a504 100644 --- a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java @@ -265,7 +265,7 @@ public abstract class AbstractJetFindUsagesTest extends LightCodeInsightFixtureT protected void doTest(@NotNull String path) throws Exception { File mainFile = new File(path); final String mainFileName = mainFile.getName(); - String mainFileText = FileUtil.loadFile(mainFile); + String mainFileText = FileUtil.loadFile(mainFile, true); final String prefix = mainFileName.substring(0, mainFileName.indexOf('.') + 1); List caretElementClassNames = InTextDirectivesUtils.findLinesWithPrefixesRemoved(mainFileText, "// PSI_ELEMENT: "); diff --git a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java index 2fd22294084..35ad026342f 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java @@ -105,7 +105,7 @@ public class JetTypingIndentationTest extends LightCodeInsightTestCase { } public void doFileSettingNewLineTest() throws Exception { - String originalFileText = FileUtil.loadFile(new File(getTestDataPath(), getBeforeFileName())); + String originalFileText = FileUtil.loadFile(new File(getTestDataPath(), getBeforeFileName()), true); SettingsConfigurator configurator = JetFormatSettingsUtil.createConfigurator(originalFileText); diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java index b21ac2ed938..543a134ad36 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java @@ -48,7 +48,7 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh protected LightProjectDescriptor getProjectDescriptorFromFileDirective() { if (!isAllFilesPresentInTest()) { try { - String fileText = FileUtil.loadFile(new File(getTestDataPath(), fileName())); + String fileText = FileUtil.loadFile(new File(getTestDataPath(), fileName()), true); List withLibraryDirective = InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "WITH_LIBRARY:"); if (!withLibraryDirective.isEmpty()) { diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java index c4f8d6cc02b..75b0a4c6094 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java @@ -81,7 +81,7 @@ public abstract class AbstractInsertImportOnPasteTest extends JetLightCodeInsigh myFixture.checkResultByFile(testFileName.replace(".kt", ".expected.kt")); - if (!InTextDirectivesUtils.isDirectiveDefined(FileUtil.loadFile(testFile), ALLOW_UNRESOLVED_DIRECTIVE)) { + if (!InTextDirectivesUtils.isDirectiveDefined(FileUtil.loadFile(testFile, true), ALLOW_UNRESOLVED_DIRECTIVE)) { checkNoUnresolvedReferences(toFile); } } @@ -134,7 +134,7 @@ public abstract class AbstractInsertImportOnPasteTest extends JetLightCodeInsigh if (file.exists()) { if (dependencyFileName.endsWith(".java")) { //allow test framework to put it under right directory - myFixture.addClass(FileUtil.loadFile(file)); + myFixture.addClass(FileUtil.loadFile(file, true)); } else { myFixture.configureByFile(dependencyFileName); diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java index c4dd225c1cb..35fbca64e5f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java @@ -44,7 +44,7 @@ public abstract class AbstractCodeMoverTest extends LightCodeInsightTestCase { private void doTest(@NotNull String path, @NotNull Class defaultMoverClass) throws Exception { configureByFile(path); - String fileText = FileUtil.loadFile(new File(path)); + String fileText = FileUtil.loadFile(new File(path), true); String direction = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// MOVE: "); boolean down = true; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java index efbd8cf1cb5..15035044ed8 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java @@ -81,7 +81,7 @@ public abstract class AbstractSurroundWithTest extends LightCodeInsightTestCase private void doTest(String path, Surrounder surrounder) throws Exception { configureByFile(path); - String fileText = FileUtil.loadFile(new File(path)); + String fileText = FileUtil.loadFile(new File(path), true); String isApplicableString = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// IS_APPLICABLE: "); if (isApplicableString != null) { diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java index 7602d8f9c0a..1b04eea0cdd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java @@ -162,7 +162,7 @@ public abstract class AbstractCodeTransformationTest extends LightCodeInsightTes private void doTestIntention(@NotNull String path, @NotNull IntentionAction intentionAction) throws Exception { configureByFile(path); - String fileText = FileUtil.loadFile(new File(path)); + String fileText = FileUtil.loadFile(new File(path), true); String isApplicableString = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// IS_APPLICABLE: "); boolean isApplicableExpected = isApplicableString == null || isApplicableString.equals("true"); diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java index bf6ae3cc54c..ada56691f77 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java @@ -71,7 +71,7 @@ public abstract class AbstractQuickFixMultiFileTest extends DaemonAnalyzerTestCa public void run() { try { Pair pair = LightQuickFixTestCase.parseActionHint( - getFile(),FileUtil.loadFile(new File(getTestDataPath() + beforeFileName))); + getFile(),FileUtil.loadFile(new File(getTestDataPath() + beforeFileName), true)); String text = pair.getFirst(); boolean actionShouldBeAvailable = pair.getSecond(); diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt index 1868317d4a6..7ab70eb6290 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt @@ -70,7 +70,7 @@ public abstract class AbstractJetMoveTest : MultiFileTestCase() { )!! } - val config = JsonParser().parse(FileUtil.loadFile(File(path))) as JsonObject + val config = JsonParser().parse(FileUtil.loadFile(File(path), true)) as JsonObject val action = MoveAction.valueOf(config.getString("type")) diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt index e0eb6dfd7ad..de49a392ed7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt @@ -63,7 +63,7 @@ public abstract class AbstractRenameTest : MultiFileTestCase() { val module: Module = getModule()!!) public open fun doTest(path : String) { - val fileText = FileUtil.loadFile(File(path)) + val fileText = FileUtil.loadFile(File(path), true) val jsonParser = JsonParser() val renameObject = jsonParser.parse(fileText) as JsonObject diff --git a/idea/tests/org/jetbrains/jet/psi/AbstractJetPsiMatcherTest.java b/idea/tests/org/jetbrains/jet/psi/AbstractJetPsiMatcherTest.java index 26130cf09a8..ae0b9fa4645 100644 --- a/idea/tests/org/jetbrains/jet/psi/AbstractJetPsiMatcherTest.java +++ b/idea/tests/org/jetbrains/jet/psi/AbstractJetPsiMatcherTest.java @@ -31,8 +31,8 @@ import java.io.File; public abstract class AbstractJetPsiMatcherTest extends JetLiteFixture { public void doTestExpressions(@NotNull String path) throws Exception { - String fileText = FileUtil.loadFile(new File(path)); - String fileText2 = FileUtil.loadFile(new File(path + ".2")); + String fileText = FileUtil.loadFile(new File(path), true); + String fileText2 = FileUtil.loadFile(new File(path + ".2"), true); boolean equalityExpected = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// NOT_EQUAL") == null; @@ -46,8 +46,8 @@ public abstract class AbstractJetPsiMatcherTest extends JetLiteFixture { } public void doTestTypes(@NotNull String path) throws Exception { - String fileText = FileUtil.loadFile(new File(path)); - String fileText2 = FileUtil.loadFile(new File(path + ".2")); + String fileText = FileUtil.loadFile(new File(path), true); + String fileText2 = FileUtil.loadFile(new File(path + ".2"), true); boolean equalityExpected = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// NOT_EQUAL") == null; diff --git a/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java index 2550bc16e1d..c285ccc19c9 100644 --- a/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java +++ b/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java @@ -50,7 +50,7 @@ public abstract class AbstractSearcherTest extends LightCodeInsightFixtureTestCa } protected void checkResult(Query actual) throws IOException { - List expected = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile())), "// SEARCH: "); + List expected = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// SEARCH: "); List actualModified = new ArrayList(); for (Object member : actual) { actualModified.add(member.toString()); diff --git a/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java b/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java index 0d035002d92..503f3853027 100644 --- a/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java +++ b/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java @@ -42,7 +42,7 @@ public class AnnotatedMembersSearchTest extends AbstractSearcherTest { private void doTest() throws IOException { myFixture.configureByFile(getFileName()); - List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile())), + List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// ANNOTATION: "); assertFalse("Specify ANNOTATION directive in test file", directives.isEmpty()); String annotationClassName = directives.get(0); diff --git a/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java b/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java index ea73776df2b..9c7a892a1f6 100644 --- a/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java +++ b/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java @@ -38,7 +38,7 @@ public class ClassInheritorsSearchTest extends AbstractSearcherTest { private void doTest() throws IOException { myFixture.configureByFile(getFileName()); - List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile())), "// CLASS: "); + List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// CLASS: "); assertFalse("Specify CLASS directive in test file", directives.isEmpty()); String superClassName = directives.get(0); PsiClass psiClass = getPsiClass(superClassName); diff --git a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java index fdee11b66df..660e7e662ad 100644 --- a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java +++ b/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java @@ -49,7 +49,7 @@ public class JUnitMembersSearcherTest extends AbstractSearcherTest { private void doJUnit3test() throws IOException { myFixture.configureByFile(getFileName()); - List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile())), "// CLASS: "); + List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// CLASS: "); assertFalse("Specify CLASS directive in test file", directives.isEmpty()); String superClassName = directives.get(0); PsiClass psiClass = getPsiClass(superClassName); @@ -58,7 +58,7 @@ public class JUnitMembersSearcherTest extends AbstractSearcherTest { private void doJUnit4test() throws IOException { myFixture.configureByFile(getFileName()); - List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile())), + List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// ANNOTATION: "); assertFalse("Specify ANNOTATION directive in test file", directives.isEmpty()); String annotationClassName = directives.get(0); diff --git a/js/js.tests/test/org/jetbrains/k2js/test/OutputPrefixPostfixTest.java b/js/js.tests/test/org/jetbrains/k2js/test/OutputPrefixPostfixTest.java index ae80151e7f4..0aa3fa445fa 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/OutputPrefixPostfixTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/OutputPrefixPostfixTest.java @@ -84,12 +84,12 @@ public final class OutputPrefixPostfixTest extends SingleFileTranslationTest { super.runFunctionOutputTest(ecmaVersions, kotlinFilename, packageName, functionName, expectedResult); for (EcmaVersion ecmaVersion : ecmaVersions) { - String output = FileUtil.loadFile(new File(getOutputFilePath(filename, ecmaVersion))); + String output = FileUtil.loadFile(new File(getOutputFilePath(filename, ecmaVersion)), true); if (outputPrefixFile != null) { - assertTrue(output.startsWith(FileUtil.loadFile(outputPrefixFile))); + assertTrue(output.startsWith(FileUtil.loadFile(outputPrefixFile, true))); } if (outputPostfixFile != null) { - assertTrue(output.endsWith(FileUtil.loadFile(outputPostfixFile))); + assertTrue(output.endsWith(FileUtil.loadFile(outputPostfixFile, true))); } } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java index 51a993382b3..de4baf1cb59 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java @@ -96,7 +96,7 @@ public final class RhinoUtils { @NotNull Scriptable scope) throws Exception { String result; try { - result = FileUtil.loadFile(new File(inputFile)); + result = FileUtil.loadFile(new File(inputFile), true); } catch (IOException e) { throw new RuntimeException(e); @@ -224,7 +224,7 @@ public final class RhinoUtils { return null; } - Object[] args = {FileUtil.loadFile(new File(fileName)), JSHINT_OPTIONS}; + Object[] args = {FileUtil.loadFile(new File(fileName), true), JSHINT_OPTIONS}; Function function = (Function) ScriptableObject.getProperty(scope.getParentScope(), "JSHINT"); Object status = function.call(context, scope.getParentScope(), scope.getParentScope(), args); if (!(Boolean) Context.jsToJava(status, Boolean.class)) { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java index cf4d1b915e3..4142e1ac038 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java @@ -71,7 +71,7 @@ public abstract class InlineTest extends SingleFileTranslationTest { private void checkFooBoxIsTrueAndFunctionNameIsNotReferenced(@NotNull String filename, String funName) throws Exception { fooBoxTest(); String generatedJSFilePath = getOutputFilePath(filename, EcmaVersion.defaultVersion()); - String outputFileText = FileUtil.loadFile(new File(generatedJSFilePath)); + String outputFileText = FileUtil.loadFile(new File(generatedJSFilePath), true); assertTrue(countOccurrences(outputFileText, funName) == 1); } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java b/js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java index 7eff7f06651..3b80942274c 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java @@ -146,7 +146,7 @@ public final class TranslationUtils { for (String libFileName : list) { try { String path = root == null ? libFileName : (root + libFileName); - String text = FileUtil.loadFile(new File(path)); + String text = FileUtil.loadFile(new File(path), true); JetFile jetFile = JetFileUtils.createJetFile(path, text, project); libFiles.add(jetFile); }