From 79a8b6de1fece79e68a02eb3439733573596557b Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Tue, 9 Jan 2024 16:37:46 +0100 Subject: [PATCH] [Analysis API test] rename AbstractPsiDeclarationProviderSingleModuleTest to AbstractPsiDeclarationProviderSourceTest ^KT-64805 --- ...clarationProviderSourceTestGenerated.java} | 28 +++++++++---------- ...stractPsiDeclarationProviderSourceTest.kt} | 2 +- .../capitalize_default.kt | 0 .../capitalize_default.txt | 0 .../capitalize_locale.kt | 0 .../capitalize_locale.txt | 0 .../{singleModule => source}/listIterator.kt | 0 .../{singleModule => source}/listIterator.txt | 0 .../mapGetOrDefault.kt | 0 .../mapGetOrDefault.txt | 0 .../mapGetOrDefault_nullable.kt | 0 .../mapGetOrDefault_nullable.txt | 0 .../{singleModule => source}/multipleFiles.kt | 0 .../multipleFiles.txt | 0 .../setOf_last_vararg.kt | 0 .../setOf_last_vararg.txt | 0 .../{singleModule => source}/singleFile.kt | 0 .../{singleModule => source}/singleFile.txt | 0 .../{singleModule => source}/todo.kt | 0 .../{singleModule => source}/todo.txt | 0 .../tests/analysis/api/analysisApi.kt | 13 +++++---- 21 files changed, 22 insertions(+), 21 deletions(-) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/{FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSingleModuleTestGenerated.java => FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSourceTestGenerated.java} (74%) rename analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/{AbstractPsiDeclarationProviderSingleModuleTest.kt => AbstractPsiDeclarationProviderSourceTest.kt} (95%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/capitalize_default.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/capitalize_default.txt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/capitalize_locale.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/capitalize_locale.txt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/listIterator.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/listIterator.txt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/mapGetOrDefault.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/mapGetOrDefault.txt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/mapGetOrDefault_nullable.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/mapGetOrDefault_nullable.txt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/multipleFiles.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/multipleFiles.txt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/setOf_last_vararg.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/setOf_last_vararg.txt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/singleFile.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/singleFile.txt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/todo.kt (100%) rename analysis/analysis-api/testData/standalone/{singleModule => source}/todo.txt (100%) diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSingleModuleTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSourceTestGenerated.java similarity index 74% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSingleModuleTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSourceTestGenerated.java index e4e48154cb2..62450424613 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSingleModuleTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSourceTestGenerated.java @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.components.psiDeclarationProvider.AbstractPsiDeclarationProviderSingleModuleTest; +import org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.components.psiDeclarationProvider.AbstractPsiDeclarationProviderSourceTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,9 +25,9 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/standalone/singleModule") +@TestMetadata("analysis/analysis-api/testData/standalone/source") @TestDataPath("$PROJECT_ROOT") -public class FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSingleModuleTestGenerated extends AbstractPsiDeclarationProviderSingleModuleTest { +public class FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSourceTestGenerated extends AbstractPsiDeclarationProviderSourceTest { @NotNull @Override public AnalysisApiTestConfigurator getConfigurator() { @@ -42,61 +42,61 @@ public class FirStandaloneNormalAnalysisSourceModulePsiDeclarationProviderSingle } @Test - public void testAllFilesPresentInSingleModule() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/standalone/singleModule"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInSource() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/standalone/source"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("capitalize_default.kt") public void testCapitalize_default() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/capitalize_default.kt"); + runTest("analysis/analysis-api/testData/standalone/source/capitalize_default.kt"); } @Test @TestMetadata("capitalize_locale.kt") public void testCapitalize_locale() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/capitalize_locale.kt"); + runTest("analysis/analysis-api/testData/standalone/source/capitalize_locale.kt"); } @Test @TestMetadata("listIterator.kt") public void testListIterator() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/listIterator.kt"); + runTest("analysis/analysis-api/testData/standalone/source/listIterator.kt"); } @Test @TestMetadata("mapGetOrDefault.kt") public void testMapGetOrDefault() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault.kt"); + runTest("analysis/analysis-api/testData/standalone/source/mapGetOrDefault.kt"); } @Test @TestMetadata("mapGetOrDefault_nullable.kt") public void testMapGetOrDefault_nullable() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault_nullable.kt"); + runTest("analysis/analysis-api/testData/standalone/source/mapGetOrDefault_nullable.kt"); } @Test @TestMetadata("multipleFiles.kt") public void testMultipleFiles() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/multipleFiles.kt"); + runTest("analysis/analysis-api/testData/standalone/source/multipleFiles.kt"); } @Test @TestMetadata("setOf_last_vararg.kt") public void testSetOf_last_vararg() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/setOf_last_vararg.kt"); + runTest("analysis/analysis-api/testData/standalone/source/setOf_last_vararg.kt"); } @Test @TestMetadata("singleFile.kt") public void testSingleFile() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/singleFile.kt"); + runTest("analysis/analysis-api/testData/standalone/source/singleFile.kt"); } @Test @TestMetadata("todo.kt") public void testTodo() throws Exception { - runTest("analysis/analysis-api/testData/standalone/singleModule/todo.kt"); + runTest("analysis/analysis-api/testData/standalone/source/todo.kt"); } } diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderSingleModuleTest.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderSourceTest.kt similarity index 95% rename from analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderSingleModuleTest.kt rename to analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderSourceTest.kt index 281c44b5099..bb9a1e64772 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderSingleModuleTest.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderSourceTest.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractPsiDeclarationProviderSingleModuleTest : AbstractAnalysisApiBasedTest() { +abstract class AbstractPsiDeclarationProviderSourceTest : AbstractAnalysisApiBasedTest() { override fun doTestByMainFile(mainFile: KtFile, mainModule: TestModule, testServices: TestServices) { val caretPosition = testServices.expressionMarkerProvider.getCaretPosition(mainFile) val ktReferences = findReferencesAtCaret(mainFile, caretPosition) diff --git a/analysis/analysis-api/testData/standalone/singleModule/capitalize_default.kt b/analysis/analysis-api/testData/standalone/source/capitalize_default.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/capitalize_default.kt rename to analysis/analysis-api/testData/standalone/source/capitalize_default.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/capitalize_default.txt b/analysis/analysis-api/testData/standalone/source/capitalize_default.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/capitalize_default.txt rename to analysis/analysis-api/testData/standalone/source/capitalize_default.txt diff --git a/analysis/analysis-api/testData/standalone/singleModule/capitalize_locale.kt b/analysis/analysis-api/testData/standalone/source/capitalize_locale.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/capitalize_locale.kt rename to analysis/analysis-api/testData/standalone/source/capitalize_locale.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/capitalize_locale.txt b/analysis/analysis-api/testData/standalone/source/capitalize_locale.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/capitalize_locale.txt rename to analysis/analysis-api/testData/standalone/source/capitalize_locale.txt diff --git a/analysis/analysis-api/testData/standalone/singleModule/listIterator.kt b/analysis/analysis-api/testData/standalone/source/listIterator.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/listIterator.kt rename to analysis/analysis-api/testData/standalone/source/listIterator.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/listIterator.txt b/analysis/analysis-api/testData/standalone/source/listIterator.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/listIterator.txt rename to analysis/analysis-api/testData/standalone/source/listIterator.txt diff --git a/analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault.kt b/analysis/analysis-api/testData/standalone/source/mapGetOrDefault.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault.kt rename to analysis/analysis-api/testData/standalone/source/mapGetOrDefault.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault.txt b/analysis/analysis-api/testData/standalone/source/mapGetOrDefault.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault.txt rename to analysis/analysis-api/testData/standalone/source/mapGetOrDefault.txt diff --git a/analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault_nullable.kt b/analysis/analysis-api/testData/standalone/source/mapGetOrDefault_nullable.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault_nullable.kt rename to analysis/analysis-api/testData/standalone/source/mapGetOrDefault_nullable.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault_nullable.txt b/analysis/analysis-api/testData/standalone/source/mapGetOrDefault_nullable.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/mapGetOrDefault_nullable.txt rename to analysis/analysis-api/testData/standalone/source/mapGetOrDefault_nullable.txt diff --git a/analysis/analysis-api/testData/standalone/singleModule/multipleFiles.kt b/analysis/analysis-api/testData/standalone/source/multipleFiles.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/multipleFiles.kt rename to analysis/analysis-api/testData/standalone/source/multipleFiles.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/multipleFiles.txt b/analysis/analysis-api/testData/standalone/source/multipleFiles.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/multipleFiles.txt rename to analysis/analysis-api/testData/standalone/source/multipleFiles.txt diff --git a/analysis/analysis-api/testData/standalone/singleModule/setOf_last_vararg.kt b/analysis/analysis-api/testData/standalone/source/setOf_last_vararg.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/setOf_last_vararg.kt rename to analysis/analysis-api/testData/standalone/source/setOf_last_vararg.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/setOf_last_vararg.txt b/analysis/analysis-api/testData/standalone/source/setOf_last_vararg.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/setOf_last_vararg.txt rename to analysis/analysis-api/testData/standalone/source/setOf_last_vararg.txt diff --git a/analysis/analysis-api/testData/standalone/singleModule/singleFile.kt b/analysis/analysis-api/testData/standalone/source/singleFile.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/singleFile.kt rename to analysis/analysis-api/testData/standalone/source/singleFile.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/singleFile.txt b/analysis/analysis-api/testData/standalone/source/singleFile.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/singleFile.txt rename to analysis/analysis-api/testData/standalone/source/singleFile.txt diff --git a/analysis/analysis-api/testData/standalone/singleModule/todo.kt b/analysis/analysis-api/testData/standalone/source/todo.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/todo.kt rename to analysis/analysis-api/testData/standalone/source/todo.kt diff --git a/analysis/analysis-api/testData/standalone/singleModule/todo.txt b/analysis/analysis-api/testData/standalone/source/todo.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/singleModule/todo.txt rename to analysis/analysis-api/testData/standalone/source/todo.txt diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt index d971b06d0c4..345870e8fee 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -60,7 +60,7 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.types.AbstractAnal import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.types.AbstractBuiltInTypeTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.types.AbstractTypeByDeclarationReturnTypeTest import org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.components.psiDeclarationProvider.AbstractPsiDeclarationProviderMultiModuleBinaryTest -import org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.components.psiDeclarationProvider.AbstractPsiDeclarationProviderSingleModuleTest +import org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.components.psiDeclarationProvider.AbstractPsiDeclarationProviderSourceTest import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind @@ -223,7 +223,8 @@ private fun AnalysisApiTestGroup.generateAnalysisApiNonComponentsTests() { group("imports", filter = frontendIs(FrontendKind.Fir)) { test( AbstractReferenceImportAliasTest::class, - filter = analysisSessionModeIs(AnalysisSessionMode.Normal)) { + filter = analysisSessionModeIs(AnalysisSessionMode.Normal) + ) { model(it, "importAliases") } } @@ -238,10 +239,10 @@ private fun AnalysisApiTestGroup.generateAnalysisApiNonComponentsTests() { private fun AnalysisApiTestGroup.generateAnalysisApiStandaloneTests() { group("standalone") { test( - AbstractPsiDeclarationProviderSingleModuleTest::class, + AbstractPsiDeclarationProviderSourceTest::class, filter = testModuleKindIs(TestModuleKind.Source) ) { - model(it, "singleModule") + model(it, "source") } test( AbstractPsiDeclarationProviderMultiModuleBinaryTest::class, @@ -389,7 +390,7 @@ private fun AnalysisApiTestGroup.generateAnalysisApiComponentsTests() { model(it, "psiType/forExpression") } - test(AbstractAnalysisApiKtTypeByPsiTypeProviderTest::class, filter = frontendIs(FrontendKind.Fir)){ + test(AbstractAnalysisApiKtTypeByPsiTypeProviderTest::class, filter = frontendIs(FrontendKind.Fir)) { model(it, "psiType/asKtType") } }