From ab0c08189724f7de89782f1175f22b287a7b6696 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Thu, 26 Oct 2017 12:48:10 +0300 Subject: [PATCH] AbstractExtractionTest: fix for invalid files `configureByFile` should be run after other configurations (like `configureKotlinRuntimeAndSdk`) because they could make configured file invalid --- .../idea/refactoring/introduce/AbstractExtractionTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt index 25281f4f302..3c031bf76a3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt @@ -339,15 +339,15 @@ abstract class AbstractExtractionTest : KotlinLightCodeInsightFixtureTestCase() name != mainFileName && name.startsWith("$mainFileBaseName.") && (name.endsWith(".kt") || name.endsWith(".java")) } val extraFilesToPsi = extraFiles.associateBy { fixture.configureByFile(it.name) } - val file = fixture.configureByFile(mainFileName) + val fileText = FileUtil.loadFile(File(path), true) - val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(file.text, "// WITH_RUNTIME") != null + val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// WITH_RUNTIME") != null if (addKotlinRuntime) { ConfigLibraryUtil.configureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) } try { - checkExtract(ExtractTestFiles(path, file, extraFilesToPsi), checkAdditionalAfterdata, action) + checkExtract(ExtractTestFiles(path, fixture.configureByFile(mainFileName), extraFilesToPsi), checkAdditionalAfterdata, action) } finally { if (addKotlinRuntime) {