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

FIR IDE: Disable tests failing in depended mode

Browse Source
This commit is contained in:
Tianyu Geng
2021-10-05 10:09:36 -07:00
committed by Roman Golyshev
parent e6d9098bec
commit bbc93d597a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt
+2
View File
@@ -102,6 +102,8 @@ abstract class AbstractFirLazyDeclarationResolveTest : AbstractLowLevelApiSingle
testServices.assertions.assertEqualsToFile(testDataFileSibling(".txt"), resultBuilder.toString()) testServices.assertions.assertEqualsToFile(testDataFileSibling(".txt"), resultBuilder.toString())
} }
override val enableTestInDependedMode: Boolean = false
override fun configureTest(builder: TestConfigurationBuilder) { override fun configureTest(builder: TestConfigurationBuilder) {
super.configureTest(builder) super.configureTest(builder)
with(builder) { with(builder) {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt
+4 -2
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.analysis.low.level.api.fir 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.api.LowLevelFirApiFacadeForResolveOnAir
import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest 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.KtAnnotated
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -38,4 +38,6 @@ abstract class AbstractFirOnAirResolveTest : AbstractLowLevelApiSingleFileTest()
KotlinTestUtils.assertEqualsToFile(testDataFileSibling(".txt"), rendered) KotlinTestUtils.assertEqualsToFile(testDataFileSibling(".txt"), rendered)
} }
} }
override val enableTestInDependedMode: Boolean get() = false
} }
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt
+6 -1
View File
@@ -46,6 +46,7 @@ import kotlin.io.path.nameWithoutExtension
abstract class AbstractLowLevelApiTest : TestWithDisposable() { abstract class AbstractLowLevelApiTest : TestWithDisposable() {
private lateinit var testInfo: KotlinTestInfo private lateinit var testInfo: KotlinTestInfo
private var useDependedAnalysisSession: Boolean = false private var useDependedAnalysisSession: Boolean = false
open protected val enableTestInDependedMode: Boolean = true
@OptIn(TestInfrastructureInternals::class) @OptIn(TestInfrastructureInternals::class)
private val configure: TestConfigurationBuilder.() -> Unit = { private val configure: TestConfigurationBuilder.() -> Unit = {
@@ -114,7 +115,11 @@ abstract class AbstractLowLevelApiTest : TestWithDisposable() {
val ktFiles = moduleInfo.testFilesToKtFiles.filterKeys { testFile -> !testFile.isAdditional }.values.toList() val ktFiles = moduleInfo.testFilesToKtFiles.filterKeys { testFile -> !testFile.isAdditional }.values.toList()
doTestByFileStructure(ktFiles, moduleStructure, testServices) 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 { try {
useDependedAnalysisSession = true useDependedAnalysisSession = true
doTestByFileStructure(ktFiles.map { doTestByFileStructure(ktFiles.map {