From c9a2e10dd75373cafab10d052c89b736c773b57d Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Tue, 1 Nov 2022 11:35:29 -0700 Subject: [PATCH] AA: merge single/multi modules tests for PsiTypeProvider ...because single-module test is also multi-module test --- ...iTypeProviderMultiModuleTestGenerated.java | 60 ------------------- ...alysisApiPsiTypeProviderTestGenerated.java | 12 ++++ ...iTypeProviderMultiModuleTestGenerated.java | 60 ------------------- ...alysisApiPsiTypeProviderTestGenerated.java | 12 ++++ ...iTypeProviderMultiModuleTestGenerated.java | 60 ------------------- ...alysisApiPsiTypeProviderTestGenerated.java | 12 ++++ ...alysisApiPsiTypeProviderMultiModuleTest.kt | 40 ------------- .../AbstractAnalysisApiPsiTypeProviderTest.kt | 16 +++-- ...iTypeProviderMultiModuleTestGenerated.java | 60 ------------------- ...alysisApiPsiTypeProviderTestGenerated.java | 12 ++++ ...actual_jvmInline_typealias.descriptors.txt | 0 .../actual_jvmInline_typealias.kt | 0 .../actual_jvmInline_typealias.txt | 0 .../actual_typealias.kt | 0 .../actual_typealias.txt | 0 .../tests/analysis/api/analysisApi.kt | 5 -- 16 files changed, 58 insertions(+), 291 deletions(-) delete mode 100644 analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/psiTypeProvider/Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java delete mode 100644 analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java delete mode 100644 analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java delete mode 100644 analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderMultiModuleTest.kt delete mode 100644 analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiTypeProvider/FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java rename analysis/analysis-api/testData/components/psiTypeProvider/psiType/{multiModule => forDeclaration}/actual_jvmInline_typealias.descriptors.txt (100%) rename analysis/analysis-api/testData/components/psiTypeProvider/psiType/{multiModule => forDeclaration}/actual_jvmInline_typealias.kt (100%) rename analysis/analysis-api/testData/components/psiTypeProvider/psiType/{multiModule => forDeclaration}/actual_jvmInline_typealias.txt (100%) rename analysis/analysis-api/testData/components/psiTypeProvider/psiType/{multiModule => forDeclaration}/actual_typealias.kt (100%) rename analysis/analysis-api/testData/components/psiTypeProvider/psiType/{multiModule => forDeclaration}/actual_typealias.txt (100%) diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/psiTypeProvider/Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/psiTypeProvider/Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java deleted file mode 100644 index 9eefa6b3368..00000000000 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/psiTypeProvider/Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010-2022 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. - */ - -package org.jetbrains.kotlin.analysis.api.fe10.test.cases.generated.cases.components.psiTypeProvider; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.fe10.test.configurator.AnalysisApiFe10TestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -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.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiPsiTypeProviderMultiModuleTest; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -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/components/psiTypeProvider/psiType/multiModule") -@TestDataPath("$PROJECT_ROOT") -public class Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated extends AbstractAnalysisApiPsiTypeProviderMultiModuleTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFe10TestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fe10, - TestModuleKind.Source, - AnalysisSessionMode.Normal, - AnalysisApiMode.Ide - ) - ); - } - - @Test - @TestMetadata("actual_jvmInline_typealias.kt") - public void testActual_jvmInline_typealias() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.kt"); - } - - @Test - @TestMetadata("actual_typealias.kt") - public void testActual_typealias() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_typealias.kt"); - } - - @Test - public void testAllFilesPresentInMultiModule() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, true); - } -} diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/psiTypeProvider/Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/psiTypeProvider/Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java index bae33baa994..0087845c072 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/psiTypeProvider/Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/psiTypeProvider/Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java @@ -41,6 +41,18 @@ public class Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGene ); } + @Test + @TestMetadata("actual_jvmInline_typealias.kt") + public void testActual_jvmInline_typealias() throws Exception { + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.kt"); + } + + @Test + @TestMetadata("actual_typealias.kt") + public void testActual_typealias() throws Exception { + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.kt"); + } + @Test public void testAllFilesPresentInForDeclaration() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration"), Pattern.compile("^(.+)\\.kt$"), null, true); diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java deleted file mode 100644 index c80a0a32757..00000000000 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010-2022 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. - */ - -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.psiTypeProvider; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.fir.test.configurators.AnalysisApiFirTestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -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.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiPsiTypeProviderMultiModuleTest; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -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/components/psiTypeProvider/psiType/multiModule") -@TestDataPath("$PROJECT_ROOT") -public class FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated extends AbstractAnalysisApiPsiTypeProviderMultiModuleTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFirTestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fir, - TestModuleKind.Source, - AnalysisSessionMode.Dependent, - AnalysisApiMode.Ide - ) - ); - } - - @Test - @TestMetadata("actual_jvmInline_typealias.kt") - public void testActual_jvmInline_typealias() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.kt"); - } - - @Test - @TestMetadata("actual_typealias.kt") - public void testActual_typealias() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_typealias.kt"); - } - - @Test - public void testAllFilesPresentInMultiModule() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, true); - } -} diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java index 8e53290b2e2..dfff2871c67 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java @@ -41,6 +41,18 @@ public class FirIdeDependentAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGe ); } + @Test + @TestMetadata("actual_jvmInline_typealias.kt") + public void testActual_jvmInline_typealias() throws Exception { + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.kt"); + } + + @Test + @TestMetadata("actual_typealias.kt") + public void testActual_typealias() throws Exception { + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.kt"); + } + @Test public void testAllFilesPresentInForDeclaration() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration"), Pattern.compile("^(.+)\\.kt$"), null, true); diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java deleted file mode 100644 index c8ee16e3805..00000000000 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010-2022 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. - */ - -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.psiTypeProvider; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.fir.test.configurators.AnalysisApiFirTestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -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.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiPsiTypeProviderMultiModuleTest; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -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/components/psiTypeProvider/psiType/multiModule") -@TestDataPath("$PROJECT_ROOT") -public class FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated extends AbstractAnalysisApiPsiTypeProviderMultiModuleTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFirTestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fir, - TestModuleKind.Source, - AnalysisSessionMode.Normal, - AnalysisApiMode.Ide - ) - ); - } - - @Test - @TestMetadata("actual_jvmInline_typealias.kt") - public void testActual_jvmInline_typealias() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.kt"); - } - - @Test - @TestMetadata("actual_typealias.kt") - public void testActual_typealias() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_typealias.kt"); - } - - @Test - public void testAllFilesPresentInMultiModule() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, true); - } -} diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java index a1b482ae757..661a54dae80 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/psiTypeProvider/FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java @@ -41,6 +41,18 @@ public class FirIdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGener ); } + @Test + @TestMetadata("actual_jvmInline_typealias.kt") + public void testActual_jvmInline_typealias() throws Exception { + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.kt"); + } + + @Test + @TestMetadata("actual_typealias.kt") + public void testActual_typealias() throws Exception { + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.kt"); + } + @Test public void testAllFilesPresentInForDeclaration() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration"), Pattern.compile("^(.+)\\.kt$"), null, true); diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderMultiModuleTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderMultiModuleTest.kt deleted file mode 100644 index 694209e4628..00000000000 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderMultiModuleTest.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2010-2022 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. - */ - -package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider - -import org.jetbrains.kotlin.analysis.api.analyze -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AnalysisApiPsiTypeProviderTestUtils.findLightDeclarationContext -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest -import org.jetbrains.kotlin.analysis.test.framework.project.structure.ktModuleProvider -import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.utils.executeOnPooledThreadInReadAction -import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.services.TestModuleStructure -import org.jetbrains.kotlin.test.services.TestServices -import org.jetbrains.kotlin.test.services.assertions - -abstract class AbstractAnalysisApiPsiTypeProviderMultiModuleTest : AbstractAnalysisApiBasedTest() { - override fun doTestByModuleStructure(moduleStructure: TestModuleStructure, testServices: TestServices) { - val (declaration, ktFile) = moduleStructure.modules.flatMap { module -> - val ktFiles = testServices.ktModuleProvider.getModuleFiles(module).filterIsInstance() - testServices.expressionMarkerProvider.getElementsOfTypeAtCarets(ktFiles) - }.single() - val containingClass = AnalysisApiPsiTypeProviderTestUtils.getContainingKtLightClass(declaration, ktFile) - val psiContext = containingClass.findLightDeclarationContext(declaration) - ?: error("Can't find psi context for $declaration") - val actual = buildString { - executeOnPooledThreadInReadAction { - analyze(declaration) { - val ktType = declaration.getReturnKtType() - appendLine("KtType: ${ktType.render()}") - appendLine("PsiType: ${ktType.asPsiType(psiContext)}") - } - } - } - testServices.assertions.assertEqualsToTestDataFileSibling(actual) - } -} \ No newline at end of file diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt index f15f5d0f639..3cf3db32282 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt @@ -8,18 +8,22 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTyp import org.jetbrains.kotlin.analysis.api.analyze import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AnalysisApiPsiTypeProviderTestUtils.findLightDeclarationContext import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AnalysisApiPsiTypeProviderTestUtils.getContainingKtLightClass -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest +import org.jetbrains.kotlin.analysis.test.framework.project.structure.ktModuleProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.utils.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule +import org.jetbrains.kotlin.test.services.TestModuleStructure import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractAnalysisApiPsiTypeProviderTest : AbstractAnalysisApiSingleFileTest() { - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - val declaration = testServices.expressionMarkerProvider.getElementOfTypeAtCaret(ktFile) +abstract class AbstractAnalysisApiPsiTypeProviderTest : AbstractAnalysisApiBasedTest() { + override fun doTestByModuleStructure(moduleStructure: TestModuleStructure, testServices: TestServices) { + val (declaration, ktFile) = moduleStructure.modules.flatMap { module -> + val ktFiles = testServices.ktModuleProvider.getModuleFiles(module).filterIsInstance() + testServices.expressionMarkerProvider.getElementsOfTypeAtCarets(ktFiles) + }.single() val containingClass = getContainingKtLightClass(declaration, ktFile) val psiContext = containingClass.findLightDeclarationContext(declaration) ?: error("Can't find psi context for $declaration") @@ -34,4 +38,4 @@ abstract class AbstractAnalysisApiPsiTypeProviderTest : AbstractAnalysisApiSingl } testServices.assertions.assertEqualsToTestDataFileSibling(actual) } -} +} \ No newline at end of file diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiTypeProvider/FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiTypeProvider/FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java deleted file mode 100644 index 7b52e17ec1c..00000000000 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiTypeProvider/FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010-2022 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. - */ - -package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.psiTypeProvider; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.standalone.fir.test.AnalysisApiFirStandaloneModeTestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -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.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiPsiTypeProviderMultiModuleTest; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -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/components/psiTypeProvider/psiType/multiModule") -@TestDataPath("$PROJECT_ROOT") -public class FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderMultiModuleTestGenerated extends AbstractAnalysisApiPsiTypeProviderMultiModuleTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFirStandaloneModeTestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fir, - TestModuleKind.Source, - AnalysisSessionMode.Normal, - AnalysisApiMode.Standalone - ) - ); - } - - @Test - @TestMetadata("actual_jvmInline_typealias.kt") - public void testActual_jvmInline_typealias() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.kt"); - } - - @Test - @TestMetadata("actual_typealias.kt") - public void testActual_typealias() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_typealias.kt"); - } - - @Test - public void testAllFilesPresentInMultiModule() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, true); - } -} diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiTypeProvider/FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiTypeProvider/FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java index cf48da14acd..c365d46c900 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiTypeProvider/FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiTypeProvider/FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated.java @@ -41,6 +41,18 @@ public class FirStandaloneNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTe ); } + @Test + @TestMetadata("actual_jvmInline_typealias.kt") + public void testActual_jvmInline_typealias() throws Exception { + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.kt"); + } + + @Test + @TestMetadata("actual_typealias.kt") + public void testActual_typealias() throws Exception { + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.kt"); + } + @Test public void testAllFilesPresentInForDeclaration() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration"), Pattern.compile("^(.+)\\.kt$"), null, true); diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.descriptors.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.descriptors.txt rename to analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.descriptors.txt diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.kt similarity index 100% rename from analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.kt rename to analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.kt diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.txt similarity index 100% rename from analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_jvmInline_typealias.txt rename to analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.txt diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_typealias.kt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.kt similarity index 100% rename from analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_typealias.kt rename to analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.kt diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_typealias.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.txt similarity index 100% rename from analysis/analysis-api/testData/components/psiTypeProvider/psiType/multiModule/actual_typealias.txt rename to analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.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 9ddac40750d..e016682a39b 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 @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.express import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.expressionTypeProvider.AbstractHLExpressionTypeTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.importOptimizer.AbstractAnalysisApiImportOptimizerTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiExpressionPsiTypeProviderTest -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiPsiTypeProviderMultiModuleTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiPsiTypeProviderTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSignatureContractsTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSignatureSubstitutionTest @@ -263,10 +262,6 @@ private fun AnalysisApiTestGroup.generateAnalysisApiComponentsTests() { model("psiType/forDeclaration") } - test(AbstractAnalysisApiPsiTypeProviderMultiModuleTest::class) { - model("psiType/multiModule") - } - test(AbstractAnalysisApiExpressionPsiTypeProviderTest::class, filter = frontendIs(FrontendKind.Fir)) { model("psiType/forExpression") }