diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt index 71a82992a93..506f16189b8 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt @@ -102,6 +102,8 @@ abstract class AbstractFirLazyDeclarationResolveTest : AbstractLowLevelApiSingle testServices.assertions.assertEqualsToFile(testDataFileSibling(".txt"), resultBuilder.toString()) } + override val enableTestInDependedMode: Boolean = false + override fun configureTest(builder: TestConfigurationBuilder) { super.configureTest(builder) with(builder) { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt index ace451223fc..b4cf7596a9e 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir -import org.jetbrains.kotlin.fir.FirRenderer -import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LowLevelFirApiFacadeForResolveOnAir import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest +import org.jetbrains.kotlin.fir.FirRenderer +import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.psi.KtAnnotated import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile @@ -38,4 +38,6 @@ abstract class AbstractFirOnAirResolveTest : AbstractLowLevelApiSingleFileTest() KotlinTestUtils.assertEqualsToFile(testDataFileSibling(".txt"), rendered) } } + + override val enableTestInDependedMode: Boolean get() = false } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt index a2d4e48e12f..22d71407706 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt @@ -46,6 +46,7 @@ import kotlin.io.path.nameWithoutExtension abstract class AbstractLowLevelApiTest : TestWithDisposable() { private lateinit var testInfo: KotlinTestInfo private var useDependedAnalysisSession: Boolean = false + open protected val enableTestInDependedMode: Boolean = true @OptIn(TestInfrastructureInternals::class) private val configure: TestConfigurationBuilder.() -> Unit = { @@ -114,7 +115,11 @@ abstract class AbstractLowLevelApiTest : TestWithDisposable() { val ktFiles = moduleInfo.testFilesToKtFiles.filterKeys { testFile -> !testFile.isAdditional }.values.toList() doTestByFileStructure(ktFiles, moduleStructure, testServices) - if (ktFiles.any { InTextDirectivesUtils.isDirectiveDefined(it.text, DISABLE_DEPENDED_MODE_DIRECTIVE) }) return + if (!enableTestInDependedMode || ktFiles.any { + InTextDirectivesUtils.isDirectiveDefined(it.text, DISABLE_DEPENDED_MODE_DIRECTIVE) + }) { + return + } try { useDependedAnalysisSession = true doTestByFileStructure(ktFiles.map {