From 365973f03a0550072bc92c27e139eb5fb3f0d2a2 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Thu, 15 Feb 2024 13:42:17 +0100 Subject: [PATCH] [Tests] Convert diagnostics test for #KT-65555 to box test --- ...ticCompilerTestFE10TestdataTestGenerated.java | 6 ------ .../LLFirBlackBoxCodegenBasedTestGenerated.java | 6 ++++++ ...gnosticCompilerFE10TestDataTestGenerated.java | 6 ------ ...eversedBlackBoxCodegenBasedTestGenerated.java | 6 ++++++ ...tTreeOldFrontendDiagnosticsTestGenerated.java | 6 ------ ...irPsiOldFrontendDiagnosticsTestGenerated.java | 6 ------ ...FirLightTreeBlackBoxCodegenTestGenerated.java | 6 ++++++ ...WithIrFakeOverrideGeneratorTestGenerated.java | 6 ++++++ .../FirPsiBlackBoxCodegenTestGenerated.java | 6 ++++++ .../codegen/box/collections/kt65555.jvm_abi.txt | 11 +++++++++++ .../testData/codegen/box/collections/kt65555.kt | 16 ++++++++++++++++ .../override/clashesOnInheritance/kt65555.kt | 8 -------- .../test/runners/DiagnosticTestGenerated.java | 6 ------ .../JvmAbiConsistencyTestBoxGenerated.java | 6 ++++++ .../codegen/BlackBoxCodegenTestGenerated.java | 6 ++++++ .../codegen/IrBlackBoxCodegenTestGenerated.java | 6 ++++++ ...lackBoxCodegenWithIrInlinerTestGenerated.java | 6 ++++++ .../codegen/LightAnalysisModeTestGenerated.java | 5 +++++ 18 files changed, 86 insertions(+), 38 deletions(-) create mode 100644 compiler/testData/codegen/box/collections/kt65555.jvm_abi.txt create mode 100644 compiler/testData/codegen/box/collections/kt65555.kt delete mode 100644 compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.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 1896140588f..66ff23aeba4 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 @@ -29209,12 +29209,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt"); } - @Test - @TestMetadata("kt65555.kt") - public void testKt65555() { - runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt"); - } - @Test @TestMetadata("kt9550.kt") public void testKt9550() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java index a587e8d7485..e05f12801e1 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java @@ -8206,6 +8206,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { 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 2cc278c438c..c665057ada3 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 @@ -29209,12 +29209,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt"); } - @Test - @TestMetadata("kt65555.kt") - public void testKt65555() { - runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt"); - } - @Test @TestMetadata("kt9550.kt") public void testKt9550() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java index 6542a0f80f8..fac3e33e9ef 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java @@ -8206,6 +8206,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { 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 2d558a113f3..29c685a4cc2 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 @@ -26955,12 +26955,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt"); } - @Test - @TestMetadata("kt65555.kt") - public void testKt65555() { - runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt"); - } - @Test @TestMetadata("kt9550.kt") public void testKt9550() { 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 0d228af53e1..3148c024509 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 @@ -26961,12 +26961,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt"); } - @Test - @TestMetadata("kt65555.kt") - public void testKt65555() { - runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt"); - } - @Test @TestMetadata("kt9550.kt") public void testKt9550() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index d7e07359ced..80a0a6b7597 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -8147,6 +8147,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java index a79bfdad544..960701b879f 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java @@ -8147,6 +8147,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index f7f5e931dae..5f1df4734a4 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -8147,6 +8147,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/testData/codegen/box/collections/kt65555.jvm_abi.txt b/compiler/testData/codegen/box/collections/kt65555.jvm_abi.txt new file mode 100644 index 00000000000..2208d717679 --- /dev/null +++ b/compiler/testData/codegen/box/collections/kt65555.jvm_abi.txt @@ -0,0 +1,11 @@ +MODULE main + CLASS A.class + CLASS METADATA + K1 + getSize()I + K2 + --- + K1 + --- + K2 + size diff --git a/compiler/testData/codegen/box/collections/kt65555.kt b/compiler/testData/codegen/box/collections/kt65555.kt new file mode 100644 index 00000000000..17c6e4640a0 --- /dev/null +++ b/compiler/testData/codegen/box/collections/kt65555.kt @@ -0,0 +1,16 @@ +// TARGET_BACKEND: JVM +// FULL_JDK +// ISSUE: KT-65555 +// JVM_ABI_K1_K2_DIFF: KT-63828 + +interface MyCollection : Collection +interface MyList : MyCollection, List +interface MyMutableList : MyList, MutableList + +class A(val delegate: ArrayList) : MyMutableList, MutableList by delegate + +fun box(): String { + val delegate = ArrayList() + delegate.add("OK") + return A(delegate).get(0) +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt b/compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt deleted file mode 100644 index 67d2705c79f..00000000000 --- a/compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt +++ /dev/null @@ -1,8 +0,0 @@ -// FIR_IDENTICAL -// FULL_JDK -// WITH_STDLIB -// ISSUE: KT-65555 - -interface MyCollection : Collection -interface MyList : MyCollection, List -interface MyMutableList : MyList, MutableList \ No newline at end of file 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 063f832dd7c..38c77876851 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 @@ -29209,12 +29209,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt"); } - @Test - @TestMetadata("kt65555.kt") - public void testKt65555() { - runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt"); - } - @Test @TestMetadata("kt9550.kt") public void testKt9550() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java index d8f4bbb913c..10743f08bfb 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java @@ -8147,6 +8147,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index 08086ef6a9b..d81d289241f 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -7901,6 +7901,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 34813fa35b0..74e6c5a56f5 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -8147,6 +8147,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index 77874297918..2e4a7aab6d2 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -8147,6 +8147,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @Test + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 328437598bf..323f1690e46 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -7097,6 +7097,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/collections/kt48945c.kt"); } + @TestMetadata("kt65555.kt") + public void testKt65555() { + runTest("compiler/testData/codegen/box/collections/kt65555.kt"); + } + @TestMetadata("mutableList.kt") public void testMutableList() { runTest("compiler/testData/codegen/box/collections/mutableList.kt");