More cleanups after tests execution

This commit is contained in:
Nikolay Krasko
2019-11-29 18:48:22 +03:00
parent 0cbb3a3956
commit 0380380de4
2 changed files with 9 additions and 3 deletions
@@ -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
@@ -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())
}