From 0380380de48249e9c321b16be40a1d529440cb5a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 29 Nov 2019 18:48:22 +0300 Subject: [PATCH] More cleanups after tests execution --- .../idea/quickfix/AbstractQuickFixMultiFileTest.kt | 10 +++++++--- .../refactoring/introduce/AbstractExtractionTest.kt | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt index 7fb0ca6d416..84bb09bdfdf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt @@ -133,7 +133,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest } configureMultiFileTest(subFiles, beforeFile) - configureCompilerOptions(multiFileText, project, module) + val configured = configureCompilerOptions(multiFileText, project, module) CommandProcessor.getInstance().executeCommand(project, { try { @@ -179,6 +179,10 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest } catch (e: Throwable) { e.printStackTrace() TestCase.fail(getTestName(true)) + } finally { + if (configured) { + rollbackCompilerOptions(project, myFixture.module) + } } }, "", "") } @@ -186,8 +190,6 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest private fun doTest(beforeFileName: String) { val mainFile = File(beforeFileName) val originalFileText = FileUtil.loadFile(mainFile, true) - val configured = configureCompilerOptions(originalFileText, project, module) - val mainFileDir = mainFile.parentFile!! val mainFileName = mainFile.name @@ -203,6 +205,8 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest myFixture.configureByFiles(*testFiles.toTypedArray()) + val configured = configureCompilerOptions(originalFileText, project, module) + CommandProcessor.getInstance().executeCommand(project, { try { val psiFile = file 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 02a2f7f2a8c..94cd590c1e1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt @@ -351,6 +351,8 @@ abstract class AbstractExtractionTest : KotlinLightCodeInsightFixtureTestCase() checkExtract(ExtractTestFiles(path, fixture.configureByFile(mainFileName), extraFilesToPsi), checkAdditionalAfterdata, action) } finally { + ConfigLibraryUtil.unconfigureLibrariesByDirective(module, fileText) + if (addKotlinRuntime) { ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(module, PluginTestCaseBase.mockJdk()) }