diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt similarity index 95% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt index 09e9a1b92ee..bda07fee582 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import java.nio.file.Path -abstract class AbstractSymbolLightClassesTest( +abstract class AbstractSymbolLightClassesByFqNameTest( configurator: AnalysisApiTestConfigurator, override val currentExtension: String, override val stopIfCompilationErrorDirectivePresent: Boolean, diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt similarity index 89% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt index 2c28343d7f6..a777bf1e37e 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt @@ -9,19 +9,20 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiClass import com.intellij.psi.SyntaxTraverser import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator -import org.jetbrains.kotlin.asJava.* +import org.jetbrains.kotlin.asJava.LightClassTestCommon +import org.jetbrains.kotlin.asJava.renderClass +import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.light.classes.symbol.base.service.withExtendedTypeRenderer import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import java.nio.file.Path -abstract class AbstractSymbolLightClassesLoadingTest( +abstract class AbstractSymbolLightClassesByPsiTest( configurator: AnalysisApiTestConfigurator, override val currentExtension: String, override val stopIfCompilationErrorDirectivePresent: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { - override fun getRenderResult(ktFile: KtFile, ktFiles: List, testDataFile: Path, module: TestModule, project: Project): String { val lightClasses = ktFiles.flatMap { getLightClassesFromFile(it) } if (lightClasses.isEmpty()) return LightClassTestCommon.NOT_GENERATED_DIRECTIVE diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesLoadingForLibraryTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt similarity index 61% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesLoadingForLibraryTest.kt rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt index 72909f890a2..9c07fbb5373 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesLoadingForLibraryTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt @@ -5,12 +5,11 @@ package org.jetbrains.kotlin.light.classes.symbol.decompiled -import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesLoadingTest +import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesByFqNameTest import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.AnalysisApiSymbolLightClassesDecompiledTestConfigurator -abstract class AbstractSymbolLightClassesLoadingForLibraryTest : - AbstractSymbolLightClassesLoadingTest( - AnalysisApiSymbolLightClassesDecompiledTestConfigurator, - EXTENSIONS.LIB_JAVA, - stopIfCompilationErrorDirectivePresent = true - ) +abstract class AbstractSymbolLightClassesByFqNameForLibraryTest : AbstractSymbolLightClassesByFqNameTest( + AnalysisApiSymbolLightClassesDecompiledTestConfigurator, + EXTENSIONS.LIB_JAVA, + stopIfCompilationErrorDirectivePresent = true, +) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesForLibraryTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt similarity index 63% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesForLibraryTest.kt rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt index 2aa4bab9c70..f5ad8de6e06 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesForLibraryTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt @@ -5,12 +5,11 @@ package org.jetbrains.kotlin.light.classes.symbol.decompiled -import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesTest +import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesByPsiTest import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.AnalysisApiSymbolLightClassesDecompiledTestConfigurator -abstract class AbstractSymbolLightClassesForLibraryTest : - AbstractSymbolLightClassesTest( - AnalysisApiSymbolLightClassesDecompiledTestConfigurator, - EXTENSIONS.LIB_JAVA, - stopIfCompilationErrorDirectivePresent = true - ) \ No newline at end of file +abstract class AbstractSymbolLightClassesByPsiForLibraryTest : AbstractSymbolLightClassesByPsiTest( + AnalysisApiSymbolLightClassesDecompiledTestConfigurator, + EXTENSIONS.LIB_JAVA, + stopIfCompilationErrorDirectivePresent = true, +) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java similarity index 99% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java index 8b50171f049..f0a79af3798 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName") @TestDataPath("$PROJECT_ROOT") -public class SymbolLightClassesForLibraryTestGenerated extends AbstractSymbolLightClassesForLibraryTest { +public class SymbolLightClassesByFqNameForLibraryTestGenerated extends AbstractSymbolLightClassesByFqNameForLibraryTest { @Test public void testAllFilesPresentInLightClassByFqName() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "compilationErrors"); diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java similarity index 99% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java index a032735f1c6..c61e50c3f7c 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi") @TestDataPath("$PROJECT_ROOT") -public class SymbolLightClassesLoadingForLibraryTestGenerated extends AbstractSymbolLightClassesLoadingForLibraryTest { +public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymbolLightClassesByPsiForLibraryTest { @Test public void testAllFilesPresentInLightClassByPsi() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true); diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesLoadingForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt similarity index 59% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesLoadingForSourceTest.kt rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt index 3873bee0a9e..a1235624e7e 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesLoadingForSourceTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt @@ -6,11 +6,10 @@ package org.jetbrains.kotlin.light.classes.symbol.source import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator -import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesLoadingTest +import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesByFqNameTest -abstract class AbstractSymbolLightClassesLoadingForSourceTest : - AbstractSymbolLightClassesLoadingTest( - AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), - EXTENSIONS.FIR_JAVA, - stopIfCompilationErrorDirectivePresent = false - ) \ No newline at end of file +abstract class AbstractSymbolLightClassesByFqNameForSourceTest : AbstractSymbolLightClassesByFqNameTest( + AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), + EXTENSIONS.FIR_JAVA, + stopIfCompilationErrorDirectivePresent = false, +) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt similarity index 60% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesForSourceTest.kt rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt index 14da1ed9642..81fd6273fbe 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesForSourceTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt @@ -6,11 +6,10 @@ package org.jetbrains.kotlin.light.classes.symbol.source import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator -import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesTest +import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesByPsiTest -abstract class AbstractSymbolLightClassesForSourceTest : - AbstractSymbolLightClassesTest( - AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), - EXTENSIONS.FIR_JAVA, - stopIfCompilationErrorDirectivePresent = false - ) \ No newline at end of file +abstract class AbstractSymbolLightClassesByPsiForSourceTest : AbstractSymbolLightClassesByPsiTest( + AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), + EXTENSIONS.FIR_JAVA, + stopIfCompilationErrorDirectivePresent = false, +) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java similarity index 99% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java index 4bd395f7683..938c97b04ed 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName") @TestDataPath("$PROJECT_ROOT") -public class SymbolLightClassesForSourceTestGenerated extends AbstractSymbolLightClassesForSourceTest { +public class SymbolLightClassesByFqNameForSourceTestGenerated extends AbstractSymbolLightClassesByFqNameForSourceTest { @Test public void testAllFilesPresentInLightClassByFqName() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName"), Pattern.compile("^([^.]+)\\.kt$"), null, true); diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java similarity index 99% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java index 91ab4f01054..e7299f108ad 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi") @TestDataPath("$PROJECT_ROOT") -public class SymbolLightClassesLoadingForSourceTestGenerated extends AbstractSymbolLightClassesLoadingForSourceTest { +public class SymbolLightClassesByPsiForSourceTestGenerated extends AbstractSymbolLightClassesByPsiForSourceTest { @Test public void testAllFilesPresentInLightClassByPsi() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true); diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt index ec7bf1c3c3c..411b9ec1441 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt @@ -16,14 +16,14 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() { "compiler/testData", ) { run { - testClass { + testClass { model( "asJava/lightClasses/lightClassByFqName", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME ) } - testClass { + testClass { model( "asJava/lightClasses/lightClassByFqName", excludeDirs = listOf("compilationErrors"), @@ -48,11 +48,11 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() { } run { - testClass { + testClass { model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS) } - testClass { + testClass { model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS) } }