From 0f3f0ff08088595c9ea637d3cf2a45c18d3b33be Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Tue, 9 Jan 2024 16:38:45 +0100 Subject: [PATCH] [Analysis API test] rename AbstractPsiDeclarationProviderMultiModuleBinaryTest to AbstractPsiDeclarationProviderBinaryTest ^KT-64805 --- ...clarationProviderBinaryTestGenerated.java} | 32 +++++++++---------- ...stractPsiDeclarationProviderBinaryTest.kt} | 2 +- .../multifileFacade.kt | 0 .../multifileFacade.txt | 0 .../propertiesInCompanionObject.kt | 0 .../propertiesInCompanionObject.txt | 0 .../propertiesInCompanionObject_JvmField.kt | 0 .../propertiesInCompanionObject_JvmField.txt | 0 .../propertiesInCompanionObject_JvmStatic.kt | 0 .../propertiesInCompanionObject_JvmStatic.txt | 0 .../propertiesInInnerClass.kt | 0 .../propertiesInInnerClass.txt | 0 .../propertiesInNamedCompanionObject.kt | 0 .../propertiesInNamedCompanionObject.txt | 0 ...opertiesInNamedCompanionObject_JvmField.kt | 0 ...pertiesInNamedCompanionObject_JvmField.txt | 0 ...pertiesInNamedCompanionObject_JvmStatic.kt | 0 ...ertiesInNamedCompanionObject_JvmStatic.txt | 0 .../propertiesInNestedObject.kt | 0 .../propertiesInNestedObject.txt | 0 .../propertiesInObject.kt | 0 .../propertiesInObject.txt | 0 .../propertiesInOuterClass.kt | 0 .../propertiesInOuterClass.txt | 0 .../tests/analysis/api/analysisApi.kt | 8 ++--- 25 files changed, 21 insertions(+), 21 deletions(-) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/{FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderMultiModuleBinaryTestGenerated.java => FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderBinaryTestGenerated.java} (70%) rename analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/{AbstractPsiDeclarationProviderMultiModuleBinaryTest.kt => AbstractPsiDeclarationProviderBinaryTest.kt} (94%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/multifileFacade.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/multifileFacade.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInCompanionObject.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInCompanionObject.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInCompanionObject_JvmField.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInCompanionObject_JvmField.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInCompanionObject_JvmStatic.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInCompanionObject_JvmStatic.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInInnerClass.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInInnerClass.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInNamedCompanionObject.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInNamedCompanionObject.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInNamedCompanionObject_JvmField.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInNamedCompanionObject_JvmField.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInNamedCompanionObject_JvmStatic.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInNamedCompanionObject_JvmStatic.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInNestedObject.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInNestedObject.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInObject.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInObject.txt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInOuterClass.kt (100%) rename analysis/analysis-api/testData/standalone/{multiModuleBinary => binary}/propertiesInOuterClass.txt (100%) diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderMultiModuleBinaryTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderBinaryTestGenerated.java similarity index 70% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderMultiModuleBinaryTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderBinaryTestGenerated.java index 61d1817d99e..ab9bb391530 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderMultiModuleBinaryTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/psiDeclarationProvider/FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderBinaryTestGenerated.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.AbstractPsiDeclarationProviderMultiModuleBinaryTest; +import org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.components.psiDeclarationProvider.AbstractPsiDeclarationProviderBinaryTest; 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/multiModuleBinary") +@TestMetadata("analysis/analysis-api/testData/standalone/binary") @TestDataPath("$PROJECT_ROOT") -public class FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderMultiModuleBinaryTestGenerated extends AbstractPsiDeclarationProviderMultiModuleBinaryTest { +public class FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProviderBinaryTestGenerated extends AbstractPsiDeclarationProviderBinaryTest { @NotNull @Override public AnalysisApiTestConfigurator getConfigurator() { @@ -42,73 +42,73 @@ public class FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProvide } @Test - public void testAllFilesPresentInMultiModuleBinary() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/standalone/multiModuleBinary"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInBinary() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/standalone/binary"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("multifileFacade.kt") public void testMultifileFacade() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/multifileFacade.kt"); } @Test @TestMetadata("propertiesInCompanionObject.kt") public void testPropertiesInCompanionObject() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject.kt"); } @Test @TestMetadata("propertiesInCompanionObject_JvmField.kt") public void testPropertiesInCompanionObject_JvmField() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmField.kt"); } @Test @TestMetadata("propertiesInCompanionObject_JvmStatic.kt") public void testPropertiesInCompanionObject_JvmStatic() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmStatic.kt"); } @Test @TestMetadata("propertiesInInnerClass.kt") public void testPropertiesInInnerClass() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInInnerClass.kt"); } @Test @TestMetadata("propertiesInNamedCompanionObject.kt") public void testPropertiesInNamedCompanionObject() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject.kt"); } @Test @TestMetadata("propertiesInNamedCompanionObject_JvmField.kt") public void testPropertiesInNamedCompanionObject_JvmField() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmField.kt"); } @Test @TestMetadata("propertiesInNamedCompanionObject_JvmStatic.kt") public void testPropertiesInNamedCompanionObject_JvmStatic() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmStatic.kt"); } @Test @TestMetadata("propertiesInNestedObject.kt") public void testPropertiesInNestedObject() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInNestedObject.kt"); } @Test @TestMetadata("propertiesInObject.kt") public void testPropertiesInObject() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInObject.kt"); } @Test @TestMetadata("propertiesInOuterClass.kt") public void testPropertiesInOuterClass() throws Exception { - runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.kt"); + runTest("analysis/analysis-api/testData/standalone/binary/propertiesInOuterClass.kt"); } } diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderMultiModuleBinaryTest.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderBinaryTest.kt similarity index 94% rename from analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderMultiModuleBinaryTest.kt rename to analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderBinaryTest.kt index 70d8686568a..3112b89f642 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderMultiModuleBinaryTest.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderBinaryTest.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractPsiDeclarationProviderMultiModuleBinaryTest : AbstractAnalysisApiBasedTest() { +abstract class AbstractPsiDeclarationProviderBinaryTest : 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/multiModuleBinary/multifileFacade.kt b/analysis/analysis-api/testData/standalone/binary/multifileFacade.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt rename to analysis/analysis-api/testData/standalone/binary/multifileFacade.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.txt b/analysis/analysis-api/testData/standalone/binary/multifileFacade.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.txt rename to analysis/analysis-api/testData/standalone/binary/multifileFacade.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmField.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmField.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmField.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmField.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmStatic.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmStatic.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmStatic.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInCompanionObject_JvmStatic.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInInnerClass.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInInnerClass.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInInnerClass.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInInnerClass.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmField.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmField.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmField.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmField.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmStatic.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmStatic.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmStatic.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInNamedCompanionObject_JvmStatic.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInNestedObject.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInNestedObject.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInNestedObject.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInNestedObject.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInObject.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInObject.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInObject.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInObject.txt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.kt b/analysis/analysis-api/testData/standalone/binary/propertiesInOuterClass.kt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.kt rename to analysis/analysis-api/testData/standalone/binary/propertiesInOuterClass.kt diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.txt b/analysis/analysis-api/testData/standalone/binary/propertiesInOuterClass.txt similarity index 100% rename from analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.txt rename to analysis/analysis-api/testData/standalone/binary/propertiesInOuterClass.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 345870e8fee..63d5af9d777 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 @@ -53,13 +53,13 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.typeInf import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.typeProvider.AbstractAnalysisApiGetSuperTypesTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.typeProvider.AbstractHasCommonSubtypeTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.typeProvider.AbstractTypeReferenceTest -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.references.AbstractReferenceImportAliasTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.references.* +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.references.AbstractReferenceImportAliasTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.* import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.types.AbstractAnalysisApiSubstitutorsTest 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.AbstractPsiDeclarationProviderBinaryTest 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 @@ -245,10 +245,10 @@ private fun AnalysisApiTestGroup.generateAnalysisApiStandaloneTests() { model(it, "source") } test( - AbstractPsiDeclarationProviderMultiModuleBinaryTest::class, + AbstractPsiDeclarationProviderBinaryTest::class, filter = testModuleKindIs(TestModuleKind.LibraryBinary) ) { - model(it, "multiModuleBinary") + model(it, "binary") } } }