From 7d6cd8d126f13806b97c2b09228a5c8766594ed1 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 12 Mar 2024 14:32:34 +0100 Subject: [PATCH] Tests: remove diagnostic test with incorrect compiler behavior In fact the latest compiler (neither K1 nor K2) does NOT report an error here, see KT-66522. The error was there in the diagnostic test because the test used custom code which invoked parts of the old JVM backend to report signature clash errors. The issue is rather minor and is present since 1.5, so to reduce confusion, the test is deleted. #KT-66522 --- ...agnosticCompilerTestFE10TestdataTestGenerated.java | 6 ------ ...edDiagnosticCompilerFE10TestDataTestGenerated.java | 6 ------ ...rLightTreeOldFrontendDiagnosticsTestGenerated.java | 6 ------ .../FirPsiOldFrontendDiagnosticsTestGenerated.java | 6 ------ .../RedeclarationMainInMultiFileClass.fir.kt | 11 ----------- .../RedeclarationMainInMultiFileClass.kt | 11 ----------- .../RedeclarationMainInMultiFileClass.txt | 4 ---- .../kotlin/test/runners/DiagnosticTestGenerated.java | 6 ------ 8 files changed, 56 deletions(-) delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.txt 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 f8cd4e9d7fa..a3b8df9bee0 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 @@ -41933,12 +41933,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/testsWithStdLib/pureReifiableArrayOperations.kt"); } - @Test - @TestMetadata("RedeclarationMainInMultiFileClass.kt") - public void testRedeclarationMainInMultiFileClass() { - runTest("compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt"); - } - @Test @TestMetadata("RenameOnImportHidesDefaultImport.kt") public void testRenameOnImportHidesDefaultImport() { 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 4d0e91520b4..e8afba3848b 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 @@ -41933,12 +41933,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/testsWithStdLib/pureReifiableArrayOperations.kt"); } - @Test - @TestMetadata("RedeclarationMainInMultiFileClass.kt") - public void testRedeclarationMainInMultiFileClass() { - runTest("compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt"); - } - @Test @TestMetadata("RenameOnImportHidesDefaultImport.kt") public void testRenameOnImportHidesDefaultImport() { 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 2f0a35b7033..1f0c194bba4 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 @@ -39499,12 +39499,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/testsWithStdLib/pureReifiableArrayOperations.kt"); } - @Test - @TestMetadata("RedeclarationMainInMultiFileClass.kt") - public void testRedeclarationMainInMultiFileClass() { - runTest("compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt"); - } - @Test @TestMetadata("RenameOnImportHidesDefaultImport.kt") public void testRenameOnImportHidesDefaultImport() { 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 ac61f077b7d..7f5588c8cab 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 @@ -39637,12 +39637,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/testsWithStdLib/pureReifiableArrayOperations.kt"); } - @Test - @TestMetadata("RedeclarationMainInMultiFileClass.kt") - public void testRedeclarationMainInMultiFileClass() { - runTest("compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt"); - } - @Test @TestMetadata("RenameOnImportHidesDefaultImport.kt") public void testRenameOnImportHidesDefaultImport() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.fir.kt deleted file mode 100644 index d05cddfe00b..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.fir.kt +++ /dev/null @@ -1,11 +0,0 @@ -// FILE: a.kt -@file:JvmName("Util") -@file:JvmMultifileClass - -fun main() {} - -// FILE: b.kt -@file:JvmName("Util") -@file:JvmMultifileClass - -fun main() {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt b/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt deleted file mode 100644 index 2c0f46d5d33..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt +++ /dev/null @@ -1,11 +0,0 @@ -// FILE: a.kt -@file:JvmName("Util") -@file:JvmMultifileClass - -fun main() {} - -// FILE: b.kt -@file:JvmName("Util") -@file:JvmMultifileClass - -fun main() {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.txt b/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.txt deleted file mode 100644 index 0bff3544466..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public fun main(): kotlin.Unit -public fun main(): kotlin.Unit 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 78265916962..360998de346 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 @@ -41933,12 +41933,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/testsWithStdLib/pureReifiableArrayOperations.kt"); } - @Test - @TestMetadata("RedeclarationMainInMultiFileClass.kt") - public void testRedeclarationMainInMultiFileClass() { - runTest("compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt"); - } - @Test @TestMetadata("RenameOnImportHidesDefaultImport.kt") public void testRenameOnImportHidesDefaultImport() {