From f44d82ce6d6964dd7d1310b74a1933ebf903c9a2 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Thu, 23 Mar 2023 21:43:43 +0100 Subject: [PATCH] Add test to check that `name` field in Java enum is not constant --- ...sticCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...agnosticCompilerFE10TestDataTestGenerated.java | 12 ++++++++++++ ...htTreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ ...FirPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../tests/modifiers/const/enumJavaName_after.kt | 15 +++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 6 files changed, 51 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index a922f7b8cc4..ca286003a08 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -21163,6 +21163,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/modifiers/const/enumConstName_before.kt"); } + @Test + @TestMetadata("enumJavaName_after.kt") + public void testEnumJavaName_after() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt"); + } + @Test @TestMetadata("equals_after.kt") public void testEquals_after() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index 14c84f20a6c..015b95a1478 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -21163,6 +21163,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/modifiers/const/enumConstName_before.kt"); } + @Test + @TestMetadata("enumJavaName_after.kt") + public void testEnumJavaName_after() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt"); + } + @Test @TestMetadata("equals_after.kt") public void testEquals_after() throws Exception { @@ -21229,6 +21235,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/modifiers/const/stdlibConstFun.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt"); + } + @Test @TestMetadata("stringConcatenationWithObject.kt") public void testStringConcatenationWithObject() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 1c504b49399..8ae44122de0 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -21163,6 +21163,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/modifiers/const/enumConstName_before.kt"); } + @Test + @TestMetadata("enumJavaName_after.kt") + public void testEnumJavaName_after() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt"); + } + @Test @TestMetadata("equals_after.kt") public void testEquals_after() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index dd7ea73963c..4a3e3fe613a 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -21169,6 +21169,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/modifiers/const/enumConstName_before.kt"); } + @Test + @TestMetadata("enumJavaName_after.kt") + public void testEnumJavaName_after() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt"); + } + @Test @TestMetadata("equals_after.kt") public void testEquals_after() throws Exception { diff --git a/compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt b/compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt new file mode 100644 index 00000000000..17fc956bc88 --- /dev/null +++ b/compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt @@ -0,0 +1,15 @@ +// FIR_IDENTICAL +// !LANGUAGE: +IntrinsicConstEvaluation + +// FILE: CompressionType.java +public enum CompressionType { + OK("NOT OK"); + + public final String name; + CompressionType(String name) { + this.name = name; + } +} + +// FILE: main.kt +const val name = CompressionType.OK.name 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 dd836841b0e..646fe33592c 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 @@ -21169,6 +21169,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/modifiers/const/enumConstName_before.kt"); } + @Test + @TestMetadata("enumJavaName_after.kt") + public void testEnumJavaName_after() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/enumJavaName_after.kt"); + } + @Test @TestMetadata("equals_after.kt") public void testEquals_after() throws Exception {