azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SLC][tests] rename stopIfCompilationErrorDirectivePresent to isTestAgainstCompiledCode for clarity

Browse Source
This commit is contained in:
Dmitrii Gridin
2023-03-14 19:40:28 +01:00
committed by Space Team
parent 71299f1d13
commit 4dbc6654b0
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationEqualityTest.kt
+1 -1
View File
@@ -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<KtFile>, module: TestModule, testServices: TestServices) {
val directives = module.directives
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt
+2 -2
View File
@@ -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<KtFile>, 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,
)
}
}
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt
+1 -1
View File
@@ -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<KtFile>, testDataFile: Path, module: TestModule, project: Project): String {
val lightClasses = ktFiles.flatMap { getLightClassesFromFile(it) }
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesEqualityTestBase.kt
+2 -2
View File
@@ -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<KtFile>, 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()
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt
+2 -2
View File
@@ -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<PsiElement>()
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesStructureTestBase.kt
+1 -1
View File
@@ -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<KtFile>, testServices: TestServices) {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt
+4 -4
View File
@@ -59,7 +59,7 @@ abstract class AbstractSymbolLightClassesTestBase(
}
override fun doTestByFileStructure(ktFiles: List<KtFile>, 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"
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt
+1 -1
View File
@@ -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,
)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt
+1 -1
View File
@@ -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,
)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesAnnotationEqualityForSourceTest.kt
+1 -1
View File
@@ -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,
)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt
+1 -1
View File
@@ -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,
)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt
+1 -1
View File
@@ -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,
)