From 167c247456d63d846504099586ab3a2b3b28ae14 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 26 Jul 2023 21:33:41 +0200 Subject: [PATCH] [LL FIR] rename AbstractInnerDeclarationsResolvePhaseTest to AbstractWholeFileResolvePhaseTest ^KT-60728 --- ...ePhaseTest.kt => AbstractWholeFileResolvePhaseTest.kt} | 6 +++--- ...tOfContentRootWholeFileResolvePhaseTestGenerated.java} | 4 ++-- ...java => SourceWholeFileResolvePhaseTestGenerated.java} | 4 ++-- .../kotlin/generators/tests/analysis/api/firLowLevel.kt | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) rename analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/{AbstractInnerDeclarationsResolvePhaseTest.kt => AbstractWholeFileResolvePhaseTest.kt} (83%) rename analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/{OutOfContentRootInnerDeclarationsResolvePhaseTestGenerated.java => OutOfContentRootWholeFileResolvePhaseTestGenerated.java} (98%) rename analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/{SourceInnerDeclarationsResolvePhaseTestGenerated.java => SourceWholeFileResolvePhaseTestGenerated.java} (98%) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractInnerDeclarationsResolvePhaseTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractWholeFileResolvePhaseTest.kt similarity index 83% rename from analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractInnerDeclarationsResolvePhaseTest.kt rename to analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractWholeFileResolvePhaseTest.kt index c57353f7101..4b8bb91eed7 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractInnerDeclarationsResolvePhaseTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractWholeFileResolvePhaseTest.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.test.services.TestModuleStructure import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractInnerDeclarationsResolvePhaseTest : AbstractLowLevelApiSingleFileTest() { +abstract class AbstractWholeFileResolvePhaseTest : AbstractLowLevelApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, moduleStructure: TestModuleStructure, testServices: TestServices) { resolveWithClearCaches(ktFile) { firResolveSession -> val firFile = ktFile.getOrBuildFirOfType(firResolveSession) @@ -27,10 +27,10 @@ abstract class AbstractInnerDeclarationsResolvePhaseTest : AbstractLowLevelApiSi } } -abstract class AbstractSourceInnerDeclarationsResolvePhaseTest : AbstractInnerDeclarationsResolvePhaseTest() { +abstract class AbstractSourceWholeFileResolvePhaseTest : AbstractWholeFileResolvePhaseTest() { override val configurator = AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false) } -abstract class AbstractOutOfContentRootInnerDeclarationsResolvePhaseTest : AbstractInnerDeclarationsResolvePhaseTest() { +abstract class AbstractOutOfContentRootWholeFileResolvePhaseTest : AbstractWholeFileResolvePhaseTest() { override val configurator get() = AnalysisApiFirOutOfContentRootTestConfigurator } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/OutOfContentRootInnerDeclarationsResolvePhaseTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/OutOfContentRootWholeFileResolvePhaseTestGenerated.java similarity index 98% rename from analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/OutOfContentRootInnerDeclarationsResolvePhaseTestGenerated.java rename to analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/OutOfContentRootWholeFileResolvePhaseTestGenerated.java index 8b9eae50073..be8708bf657 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/OutOfContentRootInnerDeclarationsResolvePhaseTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/OutOfContentRootWholeFileResolvePhaseTestGenerated.java @@ -18,10 +18,10 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("analysis/low-level-api-fir/testdata/fileStructure") @TestDataPath("$PROJECT_ROOT") -public class OutOfContentRootInnerDeclarationsResolvePhaseTestGenerated extends AbstractOutOfContentRootInnerDeclarationsResolvePhaseTest { +public class OutOfContentRootWholeFileResolvePhaseTestGenerated extends AbstractOutOfContentRootWholeFileResolvePhaseTest { @Test public void testAllFilesPresentInFileStructure() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testdata/fileStructure"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testdata/fileStructure"), Pattern.compile("^(.+)\\.(kt)$"), null, true); } @Test diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceInnerDeclarationsResolvePhaseTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceWholeFileResolvePhaseTestGenerated.java similarity index 98% rename from analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceInnerDeclarationsResolvePhaseTestGenerated.java rename to analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceWholeFileResolvePhaseTestGenerated.java index 648eb5765ac..45c83eb8b4b 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceInnerDeclarationsResolvePhaseTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceWholeFileResolvePhaseTestGenerated.java @@ -18,10 +18,10 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("analysis/low-level-api-fir/testdata/fileStructure") @TestDataPath("$PROJECT_ROOT") -public class SourceInnerDeclarationsResolvePhaseTestGenerated extends AbstractSourceInnerDeclarationsResolvePhaseTest { +public class SourceWholeFileResolvePhaseTestGenerated extends AbstractSourceWholeFileResolvePhaseTest { @Test public void testAllFilesPresentInFileStructure() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testdata/fileStructure"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testdata/fileStructure"), Pattern.compile("^(.+)\\.(kt)$"), null, true); } @Test diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt index 95687cd4b89..26be5d9ba37 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.AbstractSc import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.AbstractSourceFileStructureTest import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.AbstractSourceInBlockModificationTest import org.jetbrains.kotlin.analysis.low.level.api.fir.resolve.AbstractErrorResistanceTest -import org.jetbrains.kotlin.analysis.low.level.api.fir.resolve.AbstractOutOfContentRootInnerDeclarationsResolvePhaseTest -import org.jetbrains.kotlin.analysis.low.level.api.fir.resolve.AbstractSourceInnerDeclarationsResolvePhaseTest +import org.jetbrains.kotlin.analysis.low.level.api.fir.resolve.AbstractOutOfContentRootWholeFileResolvePhaseTest +import org.jetbrains.kotlin.analysis.low.level.api.fir.resolve.AbstractSourceWholeFileResolvePhaseTest import org.jetbrains.kotlin.generators.TestGroup import org.jetbrains.kotlin.generators.TestGroupSuite import org.jetbrains.kotlin.generators.util.TestGeneratorUtil @@ -102,11 +102,11 @@ internal fun TestGroupSuite.generateFirLowLevelApiTests() { model("fileStructure", pattern = TestGeneratorUtil.KTS) } - testClass { + testClass { model("fileStructure", pattern = TestGeneratorUtil.KT) } - testClass { + testClass { model("fileStructure", pattern = TestGeneratorUtil.KT) }