From c0b333dfc1067b2538ca0360f711e654afb68a6d Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 21 Dec 2023 17:16:31 +0100 Subject: [PATCH] [Analysis API] AbstractAnalysisApiBasedTest: exit from ignored tests before any analysis It is possible that `prepareToTheAnalysis` will throw an exception for ignored test ^KT-64468 --- .../framework/base/AbstractAnalysisApiBasedTest.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt index 617566856fe..25a4d6b6787 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt @@ -137,12 +137,6 @@ abstract class AbstractAnalysisApiBasedTest : TestWithDisposable() { testServices = testConfiguration.testServices val moduleStructure = createModuleStructure(testConfiguration) - try { - prepareToTheAnalysis(testConfiguration) - } catch (ignored: SkipTestException) { - return - } - if (configurator.analyseInDependentSession && isDependentModeDisabledForTheTest()) { return } @@ -153,6 +147,13 @@ abstract class AbstractAnalysisApiBasedTest : TestWithDisposable() { return } + try { + prepareToTheAnalysis(testConfiguration) + } catch (ignored: SkipTestException) { + return + } + + doTestByModuleStructure(moduleStructure, testServices) }