From 711e7ce8d7a31bcc6c2a37292871cdb27df02589 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Mon, 20 Nov 2023 12:08:42 +0100 Subject: [PATCH] [FIR] Add regression test for overriding Java with DNN without annotations #KT-58933 Related --- ...osticCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...iagnosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...ghtTreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../FirPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../tests/override/dnnOverridesFlexible.fir.kt | 14 ++++++++++++++ .../tests/override/dnnOverridesFlexible.kt | 14 ++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 7 files changed, 58 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.fir.kt create mode 100644 compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.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 c32de2f7ddf..3964c90a2e5 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 @@ -27260,6 +27260,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/override/diamondWithDiagonal.kt"); } + @Test + @TestMetadata("dnnOverridesFlexible.kt") + public void testDnnOverridesFlexible() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.kt"); + } + @Test @TestMetadata("DuplicateMethod.kt") public void testDuplicateMethod() 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 acfc5efe2a6..58c2d2c004f 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 @@ -27260,6 +27260,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/override/diamondWithDiagonal.kt"); } + @Test + @TestMetadata("dnnOverridesFlexible.kt") + public void testDnnOverridesFlexible() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.kt"); + } + @Test @TestMetadata("DuplicateMethod.kt") public void testDuplicateMethod() 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 c6841b7bcd8..66eeb0db4d5 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 @@ -25260,6 +25260,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/override/diamondWithDiagonal.kt"); } + @Test + @TestMetadata("dnnOverridesFlexible.kt") + public void testDnnOverridesFlexible() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.kt"); + } + @Test @TestMetadata("DuplicateMethod.kt") public void testDuplicateMethod() 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 ce549907dfc..8a38271c0f6 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 @@ -25266,6 +25266,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/override/diamondWithDiagonal.kt"); } + @Test + @TestMetadata("dnnOverridesFlexible.kt") + public void testDnnOverridesFlexible() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.kt"); + } + @Test @TestMetadata("DuplicateMethod.kt") public void testDuplicateMethod() throws Exception { diff --git a/compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.fir.kt b/compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.fir.kt new file mode 100644 index 00000000000..2140a9578e4 --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.fir.kt @@ -0,0 +1,14 @@ +// ISSUE: KT-58933 +// FILE: J.java +public interface J { + void simple(T t); + void box(Box box); +} + +// FILE: test.kt +class Box + +class K : J { + override fun simple(t: T & Any) {} + override fun box(box: Box) {} +} diff --git a/compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.kt b/compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.kt new file mode 100644 index 00000000000..0e980384e99 --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.kt @@ -0,0 +1,14 @@ +// ISSUE: KT-58933 +// FILE: J.java +public interface J { + void simple(T t); + void box(Box box); +} + +// FILE: test.kt +class Box + +class K : J { + override fun simple(t: T & Any) {} + override fun box(box: Box) {} +} 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 74754150b88..639d2cad13f 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 @@ -27260,6 +27260,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/override/diamondWithDiagonal.kt"); } + @Test + @TestMetadata("dnnOverridesFlexible.kt") + public void testDnnOverridesFlexible() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/dnnOverridesFlexible.kt"); + } + @Test @TestMetadata("DuplicateMethod.kt") public void testDuplicateMethod() throws Exception {