diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationEqualityTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationEqualityTest.kt index 5c07dfbb0e5..ee1b012e035 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationEqualityTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationEqualityTest.kt @@ -27,7 +27,7 @@ import java.nio.file.Path abstract class AbstractSymbolLightClassesAnnotationEqualityTest( configurator: AnalysisApiTestConfigurator, override val currentExtension: String, - override val stopIfCompilationErrorDirectivePresent: Boolean, + override val isTestAgainstCompiledCode: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val directives = module.directives diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt index 53927afcc79..285181597e8 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt @@ -18,14 +18,14 @@ import java.nio.file.Path abstract class AbstractSymbolLightClassesByFqNameTest( configurator: AnalysisApiTestConfigurator, override val currentExtension: String, - override val stopIfCompilationErrorDirectivePresent: Boolean, + override val isTestAgainstCompiledCode: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { override fun getRenderResult(ktFile: KtFile, ktFiles: List, testDataFile: Path, module: TestModule, project: Project): String { return LightClassTestCommon.getActualLightClassText( testDataFile.toFile(), { fqName -> findLightClass(fqName, project) }, LightClassTestCommon::removeEmptyDefaultImpls, - if (stopIfCompilationErrorDirectivePresent) MembersFilterForCompiledClasses else PsiClassRenderer.MembersFilter.DEFAULT, + if (isTestAgainstCompiledCode) MembersFilterForCompiledClasses else PsiClassRenderer.MembersFilter.DEFAULT, ) } } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt index 3c593830651..9bb13274af8 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt @@ -18,7 +18,7 @@ import java.nio.file.Path abstract class AbstractSymbolLightClassesByPsiTest( configurator: AnalysisApiTestConfigurator, override val currentExtension: String, - override val stopIfCompilationErrorDirectivePresent: Boolean, + override val isTestAgainstCompiledCode: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { override fun getRenderResult(ktFile: KtFile, ktFiles: List, testDataFile: Path, module: TestModule, project: Project): String { val lightClasses = ktFiles.flatMap { getLightClassesFromFile(it) } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesEqualityTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesEqualityTestBase.kt index e6502886c5a..9d367c90c04 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesEqualityTestBase.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesEqualityTestBase.kt @@ -24,7 +24,7 @@ import java.nio.file.Path abstract class AbstractSymbolLightClassesEqualityTestBase( configurator: AnalysisApiTestConfigurator, override val currentExtension: String, - override val stopIfCompilationErrorDirectivePresent: Boolean + override val isTestAgainstCompiledCode: Boolean ) : AbstractSymbolLightClassesTestBase(configurator) { override fun getRenderResult(ktFile: KtFile, ktFiles: List, testDataFile: Path, module: TestModule, project: Project): String { throw IllegalStateException("This test is not rendering light elements") @@ -34,7 +34,7 @@ abstract class AbstractSymbolLightClassesEqualityTestBase( val lightClasses = lightClassesToCheck(ktFiles, module, testServices) if (lightClasses.isEmpty()) return val project = lightClasses.first().project - val modificationTracker = if (stopIfCompilationErrorDirectivePresent) { + val modificationTracker = if (isTestAgainstCompiledCode) { project.createAllLibrariesModificationTracker() } else { project.createProjectWideOutOfBlockModificationTracker() diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt index e7580877958..d38d2291c55 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt @@ -22,7 +22,7 @@ import java.nio.file.Path open class AbstractSymbolLightClassesParentingTestBase( configurator: AnalysisApiTestConfigurator, override val currentExtension: String, - override val stopIfCompilationErrorDirectivePresent: Boolean + override val isTestAgainstCompiledCode: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { override fun configureTest(builder: TestConfigurationBuilder) { super.configureTest(builder) @@ -41,7 +41,7 @@ open class AbstractSymbolLightClassesParentingTestBase( Assume.assumeFalse("The test is not supported", Directives.IGNORE_PARENTING_CHECK in directives) // drop after KT-56882 - val ignoreDecompiledClasses = stopIfCompilationErrorDirectivePresent + val ignoreDecompiledClasses = isTestAgainstCompiledCode return object : JavaElementVisitor() { private val declarationStack = ArrayDeque() diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesStructureTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesStructureTestBase.kt index 98d4baf86fd..de90d0f8d55 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesStructureTestBase.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesStructureTestBase.kt @@ -30,7 +30,7 @@ private const val VALUE_DELIMITER = ": " open class AbstractSymbolLightClassesStructureTestBase( configurator: AnalysisApiTestConfigurator, protected val testPrefix: String, - override val stopIfCompilationErrorDirectivePresent: Boolean + override val isTestAgainstCompiledCode: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { override val currentExtension: String get() = throw UnsupportedOperationException() protected fun doTestInheritors(ktFiles: List, testServices: TestServices) { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt index 00a9f0f5a95..f50ba59077f 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt @@ -59,7 +59,7 @@ abstract class AbstractSymbolLightClassesTestBase( } override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { - if (stopIfCompilationErrorDirectivePresent && CompilerExecutor.Directives.COMPILATION_ERRORS in module.directives) { + if (isTestAgainstCompiledCode && CompilerExecutor.Directives.COMPILATION_ERRORS in module.directives) { return } @@ -101,7 +101,7 @@ abstract class AbstractSymbolLightClassesTestBase( action() } catch (e: Throwable) { val directives = module.directives - if (Directives.IGNORE_FIR in directives || stopIfCompilationErrorDirectivePresent && Directives.IGNORE_LIBRARY_EXCEPTIONS in directives) { + if (Directives.IGNORE_FIR in directives || isTestAgainstCompiledCode && Directives.IGNORE_LIBRARY_EXCEPTIONS in directives) { return } @@ -123,7 +123,7 @@ abstract class AbstractSymbolLightClassesTestBase( throwTestIsPassingException(Directives.IGNORE_FIR) } - if (stopIfCompilationErrorDirectivePresent && Directives.IGNORE_LIBRARY_EXCEPTIONS in directives) { + if (isTestAgainstCompiledCode && Directives.IGNORE_LIBRARY_EXCEPTIONS in directives) { throwTestIsPassingException(Directives.IGNORE_LIBRARY_EXCEPTIONS) } } @@ -182,7 +182,7 @@ abstract class AbstractSymbolLightClassesTestBase( private fun currentResultPath() = testDataPath.resolveSibling(testDataPath.nameWithoutExtension + currentExtension) protected abstract val currentExtension: String - protected abstract val stopIfCompilationErrorDirectivePresent: Boolean + protected abstract val isTestAgainstCompiledCode: Boolean object EXTENSIONS { const val JAVA = ".java" diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt index 0f7a686c4f8..a5fac81fe0c 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt @@ -11,5 +11,5 @@ import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.A abstract class AbstractSymbolLightClassesByFqNameForLibraryTest : AbstractSymbolLightClassesByFqNameTest( AnalysisApiSymbolLightClassesDecompiledTestConfigurator, EXTENSIONS.LIB_JAVA, - stopIfCompilationErrorDirectivePresent = true, + isTestAgainstCompiledCode = true, ) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt index 0fd0a3c55f1..b179a684b5e 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt @@ -11,5 +11,5 @@ import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.A abstract class AbstractSymbolLightClassesByPsiForLibraryTest : AbstractSymbolLightClassesByPsiTest( AnalysisApiSymbolLightClassesDecompiledTestConfigurator, EXTENSIONS.LIB_JAVA, - stopIfCompilationErrorDirectivePresent = true, + isTestAgainstCompiledCode = true, ) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesAnnotationEqualityForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesAnnotationEqualityForSourceTest.kt index 1dd4fd94c75..1fc56a0e581 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesAnnotationEqualityForSourceTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesAnnotationEqualityForSourceTest.kt @@ -11,5 +11,5 @@ import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClasses abstract class AbstractSymbolLightClassesAnnotationEqualityForSourceTest : AbstractSymbolLightClassesAnnotationEqualityTest( AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), EXTENSIONS.FIR_JAVA, - stopIfCompilationErrorDirectivePresent = false + isTestAgainstCompiledCode = false, ) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt index ccf4af61821..a9031697840 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt @@ -11,5 +11,5 @@ import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClasses abstract class AbstractSymbolLightClassesByFqNameForSourceTest : AbstractSymbolLightClassesByFqNameTest( AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), EXTENSIONS.FIR_JAVA, - stopIfCompilationErrorDirectivePresent = false, + isTestAgainstCompiledCode = false, ) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt index 28c9ed8ddb0..7321f7abb63 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt @@ -11,5 +11,5 @@ import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClasses abstract class AbstractSymbolLightClassesByPsiForSourceTest : AbstractSymbolLightClassesByPsiTest( AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), EXTENSIONS.FIR_JAVA, - stopIfCompilationErrorDirectivePresent = false, + isTestAgainstCompiledCode = false, ) \ No newline at end of file