From 96697b5a775dde4795f411e2a2f1f45453ca4638 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Wed, 28 Jun 2023 11:05:19 +0200 Subject: [PATCH] KTIJ-26024 [Analysis API] Rearrange testData for reference shortener Move testData for nested classes' scopes to a separate directory --- ...ModuleReferenceShortenerTestGenerated.java | 82 +++++++++++-------- ...ModuleReferenceShortenerTestGenerated.java | 82 +++++++++++-------- .../nestedClassFromSupertypes.kt | 0 .../nestedClassFromSupertypes.txt | 0 .../nestedClassFromSupertypes2.kt | 0 .../nestedClassFromSupertypes2.txt | 0 .../nestedClassFromSupertypes3.kt | 0 .../nestedClassFromSupertypes3.txt | 0 .../nestedClassFromSupertypes4.kt | 0 .../nestedClassFromSupertypes4.txt | 0 .../nestedClassFromSupertypes5.kt | 0 .../nestedClassFromSupertypes5.txt | 0 .../nestedClassFromSupertypes6.kt | 0 .../nestedClassFromSupertypes6.txt | 0 14 files changed, 92 insertions(+), 72 deletions(-) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes.kt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes.txt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes2.kt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes2.txt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes3.kt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes3.txt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes4.kt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes4.txt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes5.kt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes5.txt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes6.kt (100%) rename analysis/analysis-api/testData/components/referenceShortener/referenceShortener/{ => nestedClasses}/nestedClassFromSupertypes6.txt (100%) diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java index 2824db60d7c..56bb170ee0e 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java @@ -256,42 +256,6 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated ext runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClass3.kt"); } - @Test - @TestMetadata("nestedClassFromSupertypes.kt") - public void testNestedClassFromSupertypes() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes2.kt") - public void testNestedClassFromSupertypes2() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes3.kt") - public void testNestedClassFromSupertypes3() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes4.kt") - public void testNestedClassFromSupertypes4() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes5.kt") - public void testNestedClassFromSupertypes5() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes6.kt") - public void testNestedClassFromSupertypes6() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.kt"); - } - @Test @TestMetadata("parameterTypeTopLevelTypeLoses.kt") public void testParameterTypeTopLevelTypeLoses() throws Exception { @@ -441,4 +405,50 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated ext public void testVariable2() throws Exception { runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/variable2.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses") + @TestDataPath("$PROJECT_ROOT") + public class NestedClasses { + @Test + public void testAllFilesPresentInNestedClasses() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("nestedClassFromSupertypes.kt") + public void testNestedClassFromSupertypes() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes2.kt") + public void testNestedClassFromSupertypes2() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes3.kt") + public void testNestedClassFromSupertypes3() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes4.kt") + public void testNestedClassFromSupertypes4() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes5.kt") + public void testNestedClassFromSupertypes5() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes6.kt") + public void testNestedClassFromSupertypes6() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.kt"); + } + } } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java index e8568fae4d0..28af2064540 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java @@ -256,42 +256,6 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenera runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClass3.kt"); } - @Test - @TestMetadata("nestedClassFromSupertypes.kt") - public void testNestedClassFromSupertypes() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes2.kt") - public void testNestedClassFromSupertypes2() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes3.kt") - public void testNestedClassFromSupertypes3() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes4.kt") - public void testNestedClassFromSupertypes4() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes5.kt") - public void testNestedClassFromSupertypes5() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.kt"); - } - - @Test - @TestMetadata("nestedClassFromSupertypes6.kt") - public void testNestedClassFromSupertypes6() throws Exception { - runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.kt"); - } - @Test @TestMetadata("parameterTypeTopLevelTypeLoses.kt") public void testParameterTypeTopLevelTypeLoses() throws Exception { @@ -441,4 +405,50 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceShortenerTestGenera public void testVariable2() throws Exception { runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/variable2.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses") + @TestDataPath("$PROJECT_ROOT") + public class NestedClasses { + @Test + public void testAllFilesPresentInNestedClasses() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("nestedClassFromSupertypes.kt") + public void testNestedClassFromSupertypes() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes2.kt") + public void testNestedClassFromSupertypes2() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes3.kt") + public void testNestedClassFromSupertypes3() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes4.kt") + public void testNestedClassFromSupertypes4() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes5.kt") + public void testNestedClassFromSupertypes5() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.kt"); + } + + @Test + @TestMetadata("nestedClassFromSupertypes6.kt") + public void testNestedClassFromSupertypes6() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.kt"); + } + } } diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.kt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.kt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.kt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.txt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes.txt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes.txt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.kt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.kt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.kt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.txt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes2.txt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes2.txt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.kt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.kt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.kt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.txt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes3.txt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes3.txt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.kt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.kt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.kt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.txt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes4.txt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes4.txt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.kt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.kt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.kt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.txt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes5.txt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes5.txt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.kt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.kt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.kt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.kt diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.txt similarity index 100% rename from analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClassFromSupertypes6.txt rename to analysis/analysis-api/testData/components/referenceShortener/referenceShortener/nestedClasses/nestedClassFromSupertypes6.txt