From 695a538529af10faa706be23cd357e982b21656e Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Wed, 28 Dec 2022 11:56:36 +0100 Subject: [PATCH] Move test about Enum.entries to a more specific folder --- ...CompilerTestFE10TestdataTestGenerated.java | 22 ++++++++++++++----- ...irOldFrontendDiagnosticsTestGenerated.java | 22 ++++++++++++++----- ...DiagnosticsWithLightTreeTestGenerated.java | 22 ++++++++++++++----- .../enumEntriesAmbiguity.fir.txt | 0 .../{ => entries}/enumEntriesAmbiguity.kt | 0 .../{ => entries}/enumEntriesAmbiguity.txt | 0 .../test/runners/DiagnosticTestGenerated.java | 22 ++++++++++++++----- 7 files changed, 64 insertions(+), 24 deletions(-) rename compiler/testData/diagnostics/tests/enum/{ => entries}/enumEntriesAmbiguity.fir.txt (100%) rename compiler/testData/diagnostics/tests/enum/{ => entries}/enumEntriesAmbiguity.kt (100%) rename compiler/testData/diagnostics/tests/enum/{ => entries}/enumEntriesAmbiguity.txt (100%) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java index 558e346b597..4fffd601226 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java @@ -10022,12 +10022,6 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag runTest("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt"); } - @Test - @TestMetadata("enumEntriesAmbiguity.kt") - public void testEnumEntriesAmbiguity() throws Exception { - runTest("compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.kt"); - } - @Test @TestMetadata("enumEntryCannotHaveClassObject.kt") public void testEnumEntryCannotHaveClassObject() throws Exception { @@ -10316,6 +10310,22 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag runTest("compiler/testData/diagnostics/tests/enum/wrongUnitializedEnumCompanion.kt"); } + @Nested + @TestMetadata("compiler/testData/diagnostics/tests/enum/entries") + @TestDataPath("$PROJECT_ROOT") + public class Entries { + @Test + public void testAllFilesPresentInEntries() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/enum/entries"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + } + + @Test + @TestMetadata("enumEntriesAmbiguity.kt") + public void testEnumEntriesAmbiguity() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/tests/enum/inner") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java index 3728a679527..c1fbb2d1fe1 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java @@ -10028,12 +10028,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti runTest("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt"); } - @Test - @TestMetadata("enumEntriesAmbiguity.kt") - public void testEnumEntriesAmbiguity() throws Exception { - runTest("compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.kt"); - } - @Test @TestMetadata("enumEntryCannotHaveClassObject.kt") public void testEnumEntryCannotHaveClassObject() throws Exception { @@ -10322,6 +10316,22 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti runTest("compiler/testData/diagnostics/tests/enum/wrongUnitializedEnumCompanion.kt"); } + @Nested + @TestMetadata("compiler/testData/diagnostics/tests/enum/entries") + @TestDataPath("$PROJECT_ROOT") + public class Entries { + @Test + public void testAllFilesPresentInEntries() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/enum/entries"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + } + + @Test + @TestMetadata("enumEntriesAmbiguity.kt") + public void testEnumEntriesAmbiguity() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/tests/enum/inner") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java index e701e5a1e6f..ed1b70c029e 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java @@ -10022,12 +10022,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac runTest("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt"); } - @Test - @TestMetadata("enumEntriesAmbiguity.kt") - public void testEnumEntriesAmbiguity() throws Exception { - runTest("compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.kt"); - } - @Test @TestMetadata("enumEntryCannotHaveClassObject.kt") public void testEnumEntryCannotHaveClassObject() throws Exception { @@ -10316,6 +10310,22 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac runTest("compiler/testData/diagnostics/tests/enum/wrongUnitializedEnumCompanion.kt"); } + @Nested + @TestMetadata("compiler/testData/diagnostics/tests/enum/entries") + @TestDataPath("$PROJECT_ROOT") + public class Entries { + @Test + public void testAllFilesPresentInEntries() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/enum/entries"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + } + + @Test + @TestMetadata("enumEntriesAmbiguity.kt") + public void testEnumEntriesAmbiguity() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/tests/enum/inner") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.fir.txt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.txt similarity index 100% rename from compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.fir.txt rename to compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.txt diff --git a/compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.kt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt similarity index 100% rename from compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.kt rename to compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt diff --git a/compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.txt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.txt similarity index 100% rename from compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.txt rename to compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.txt diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index e0602b98a34..7cbbd95238a 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -10028,12 +10028,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt"); } - @Test - @TestMetadata("enumEntriesAmbiguity.kt") - public void testEnumEntriesAmbiguity() throws Exception { - runTest("compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.kt"); - } - @Test @TestMetadata("enumEntryCannotHaveClassObject.kt") public void testEnumEntryCannotHaveClassObject() throws Exception { @@ -10322,6 +10316,22 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/enum/wrongUnitializedEnumCompanion.kt"); } + @Nested + @TestMetadata("compiler/testData/diagnostics/tests/enum/entries") + @TestDataPath("$PROJECT_ROOT") + public class Entries { + @Test + public void testAllFilesPresentInEntries() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/enum/entries"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + } + + @Test + @TestMetadata("enumEntriesAmbiguity.kt") + public void testEnumEntriesAmbiguity() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/tests/enum/inner") @TestDataPath("$PROJECT_ROOT")