From 009182af636599621d5bf9896e0b4a20327c8dae Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Tue, 2 Aug 2022 11:45:30 -0700 Subject: [PATCH] FIR LC: use the data path from the test base --- .../base/AbstractSymbolLightClassesAnnotationOwnerTest.kt | 7 +------ .../symbol/base/AbstractSymbolLightClassesTestBase.kt | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationOwnerTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationOwnerTest.kt index b9703f26e15..f8c2492bd9a 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationOwnerTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesAnnotationOwnerTest.kt @@ -10,7 +10,6 @@ import com.intellij.psi.* import junit.framework.TestCase import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator 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.FirLightMemberModifierList import org.jetbrains.kotlin.psi.KtFile @@ -24,11 +23,7 @@ abstract class AbstractSymbolLightClassesAnnotationOwnerTest( override val stopIfCompilationErrorDirectivePresent: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { - val testDataFile = module.files.first { - it.originalFile.extension in DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS - }.originalFile.toPath() - - val fqName = LightClassTestCommon.fqNameInTestDataFile(testDataFile.toFile()) + val fqName = LightClassTestCommon.fqNameInTestDataFile(testDataPath.toFile()) val ktFile = ktFiles.first() val lightClass = findLightClass(fqName, ktFile.project) 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 306cb49374f..2694c06d58b 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 @@ -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.test.configurators.AnalysisApiTestConfigurator 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.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder @@ -55,15 +54,12 @@ abstract class AbstractSymbolLightClassesTestBase( if (stopIfCompilationErrorDirectivePresent && CompilerExecutor.Directives.COMPILATION_ERRORS in module.directives) { return } - val testDataFile = module.files.first { - it.originalFile.extension in DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS - }.originalFile.toPath() val ktFile = ktFiles.first() val project = ktFile.project ignoreExceptionIfIgnoreFirPresent(module) { - val actual = getRenderResult(ktFile, testDataFile, module, project) + val actual = getRenderResult(ktFile, testDataPath, module, project) compareResults(testServices, actual) removeIgnoreFir(module) removeDuplicatedFirJava(testServices)