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

FIR LC: use the data path from the test base

Browse Source
This commit is contained in:
Jinseong Jeon
2022-08-02 11:45:30 -07:00
committed by Ilya Kirillov
parent fc2f4d814e
commit 009182af63
2 changed files with 2 additions and 11 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/AbstractSymbolLightClassesAnnotationOwnerTest.kt
+1 -6
View File
@@ -10,7 +10,6 @@ import com.intellij.psi.*
import junit.framework.TestCase import junit.framework.TestCase
import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
import org.jetbrains.kotlin.asJava.LightClassTestCommon import org.jetbrains.kotlin.asJava.LightClassTestCommon
import org.jetbrains.kotlin.build.DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
import org.jetbrains.kotlin.light.classes.symbol.FirLightClassModifierList import org.jetbrains.kotlin.light.classes.symbol.FirLightClassModifierList
import org.jetbrains.kotlin.light.classes.symbol.FirLightMemberModifierList import org.jetbrains.kotlin.light.classes.symbol.FirLightMemberModifierList
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -24,11 +23,7 @@ abstract class AbstractSymbolLightClassesAnnotationOwnerTest(
override val stopIfCompilationErrorDirectivePresent: Boolean, override val stopIfCompilationErrorDirectivePresent: Boolean,
) : AbstractSymbolLightClassesTestBase(configurator) { ) : AbstractSymbolLightClassesTestBase(configurator) {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val testDataFile = module.files.first { val fqName = LightClassTestCommon.fqNameInTestDataFile(testDataPath.toFile())
it.originalFile.extension in DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
}.originalFile.toPath()
val fqName = LightClassTestCommon.fqNameInTestDataFile(testDataFile.toFile())
val ktFile = ktFiles.first() val ktFile = ktFiles.first()
val lightClass = findLightClass(fqName, ktFile.project) val lightClass = findLightClass(fqName, ktFile.project)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt
+1 -5
View File
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledL
import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompilerExecutor import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompilerExecutor
import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
import org.jetbrains.kotlin.build.DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
import org.jetbrains.kotlin.light.classes.symbol.base.service.NullabilityAnnotationSourceProvider import org.jetbrains.kotlin.light.classes.symbol.base.service.NullabilityAnnotationSourceProvider
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
@@ -55,15 +54,12 @@ abstract class AbstractSymbolLightClassesTestBase(
if (stopIfCompilationErrorDirectivePresent && CompilerExecutor.Directives.COMPILATION_ERRORS in module.directives) { if (stopIfCompilationErrorDirectivePresent && CompilerExecutor.Directives.COMPILATION_ERRORS in module.directives) {
return return
} }
val testDataFile = module.files.first {
it.originalFile.extension in DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
}.originalFile.toPath()
val ktFile = ktFiles.first() val ktFile = ktFiles.first()
val project = ktFile.project val project = ktFile.project
ignoreExceptionIfIgnoreFirPresent(module) { ignoreExceptionIfIgnoreFirPresent(module) {
val actual = getRenderResult(ktFile, testDataFile, module, project) val actual = getRenderResult(ktFile, testDataPath, module, project)
compareResults(testServices, actual) compareResults(testServices, actual)
removeIgnoreFir(module) removeIgnoreFir(module)
removeDuplicatedFirJava(testServices) removeDuplicatedFirJava(testServices)