From e45833b213f8d646e8722bd7b1cc1ea3e00485eb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Sat, 16 Jun 2012 19:09:51 +0400 Subject: [PATCH] Test for KT-2197 Reference to function is generated with private getter method #KT-2197 fixed --- .../InternalAbstractTraitMembersOverridden.kt | 13 +++++++++++++ .../InternalAbstractTraitMembersOverridden.txt | 13 +++++++++++++ .../LazyResolveNamespaceComparingTestGenerated.java | 6 ++++++ 3 files changed, 32 insertions(+) create mode 100644 compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt create mode 100644 compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.txt diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt b/compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt new file mode 100644 index 00000000000..b74c483053a --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt @@ -0,0 +1,13 @@ +package test + +trait A { + internal fun f() : Int + internal val v : Int + public var p : Int +} + +class B : A { + override fun f(): Int = throw UnsupportedOperationException() + public override var p: Int = 0 + override val v: Int = 0 +} diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.txt b/compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.txt new file mode 100644 index 00000000000..c263e4a9c7e --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.txt @@ -0,0 +1,13 @@ +namespace test + +internal abstract trait test.A : jet.Any { + internal abstract fun f(): jet.Int + internal abstract val v: jet.Int + public abstract var p: jet.Int +} +internal final class test.B : test.A { + internal open override /*1*/ fun f(): jet.Int + internal open override /*1*/ val v: jet.Int + public final /*constructor*/ fun (): test.B + public open override /*1*/ var p: jet.Int +} diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index 2d3cf494a50..0f8962155dd 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -696,6 +696,12 @@ public class LazyResolveNamespaceComparingTestGenerated { doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Tuple0.kt"); } + @Test + public void testInternalAbstractTraitMembersOverridden() throws Exception { + //TODO Disabled until lazy resolve supports inherited visibility (KT-2285) + //doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt"); + } + @Test public void testInternalClass() throws Exception { doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt");