From 5187694b2216186f59e3b8a1901d1acb0cf84809 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 1 Dec 2014 16:04:23 +0300 Subject: [PATCH] Test for overriding with a native function --- .../testsWithStdLib/native/override.kt | 9 +++++++++ .../testsWithStdLib/native/override.txt | 16 ++++++++++++++++ .../JetDiagnosticsTestWithStdLibGenerated.java | 6 ++++++ 3 files changed, 31 insertions(+) create mode 100644 compiler/testData/diagnostics/testsWithStdLib/native/override.kt create mode 100644 compiler/testData/diagnostics/testsWithStdLib/native/override.txt diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/override.kt b/compiler/testData/diagnostics/testsWithStdLib/native/override.kt new file mode 100644 index 00000000000..262ed68555a --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/native/override.kt @@ -0,0 +1,9 @@ +import kotlin.jvm.* + +trait Base { + fun foo() +} + +class Derived : Base { + override native fun foo() +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/override.txt b/compiler/testData/diagnostics/testsWithStdLib/native/override.txt new file mode 100644 index 00000000000..a37eed75a13 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/native/override.txt @@ -0,0 +1,16 @@ +package + +internal trait Base { + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + internal abstract fun foo(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +internal final class Derived : Base { + public constructor Derived() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + kotlin.jvm.native() internal open override /*1*/ fun foo(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java index 314bd1b9bf1..541ce38cdba 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java @@ -674,6 +674,12 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic doTest(fileName); } + @TestMetadata("override.kt") + public void testOverride() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/override.kt"); + doTest(fileName); + } + @TestMetadata("trait.kt") public void testTrait() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/trait.kt");