diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt b/compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt new file mode 100644 index 00000000000..c211eccd7e0 --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt @@ -0,0 +1,3 @@ +package test + +internal class InternalClass diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalClass.txt b/compiler/testData/readKotlinBinaryClass/visibility/InternalClass.txt new file mode 100644 index 00000000000..9b0619b034d --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalClass.txt @@ -0,0 +1,5 @@ +namespace test + +internal final class test.InternalClass : jet.Any { + public final /*constructor*/ fun (): test.InternalClass +} diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.kt b/compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.kt new file mode 100644 index 00000000000..522101a8bca --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.kt @@ -0,0 +1,3 @@ +package test + +public class InternalConstructor internal() diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.txt b/compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.txt new file mode 100644 index 00000000000..e9823224891 --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.txt @@ -0,0 +1,5 @@ +namespace test + +public final class test.InternalConstructor : jet.Any { + internal final /*constructor*/ fun (): test.InternalConstructor +} diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.kt b/compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.kt new file mode 100644 index 00000000000..0889d58c549 --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.kt @@ -0,0 +1,4 @@ +package test + +internal val x = 0 +internal fun f() = 0 diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.txt b/compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.txt new file mode 100644 index 00000000000..6869bbf0629 --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.txt @@ -0,0 +1,4 @@ +namespace test + +internal final val x: jet.Int +internal final fun f(): jet.Int diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.kt b/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.kt new file mode 100644 index 00000000000..3b6baffd352 --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.kt @@ -0,0 +1,8 @@ +package test + +trait A { + internal fun f() : Int + internal val v : Int + public var p : Int + internal set +} diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.txt b/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.txt new file mode 100644 index 00000000000..c8f3e6fb080 --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.txt @@ -0,0 +1,7 @@ +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 set +} diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.kt b/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.kt new file mode 100644 index 00000000000..e5b18701b67 --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.kt @@ -0,0 +1,14 @@ +package test + +trait A { + internal open fun f() : Int = 0 + internal open val v : Int + get() = 0 + public var p : Int + get() = 5 + internal set(value) { + } +} + +class B : A { +} diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.txt b/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.txt new file mode 100644 index 00000000000..e31fe22cfa6 --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.txt @@ -0,0 +1,13 @@ +namespace test + +internal abstract trait test.A : jet.Any { + internal open fun f(): jet.Int + internal open val v: jet.Int + public open var p: jet.Int internal set +} +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 internal set +} 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 9943c8df2ed..2d3cf494a50 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -695,7 +695,32 @@ public class LazyResolveNamespaceComparingTestGenerated { public void testTuple0() throws Exception { doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Tuple0.kt"); } - + + @Test + public void testInternalClass() throws Exception { + doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt"); + } + + @Test + public void testInternalConstructor() throws Exception { + doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.kt"); + } + + @Test + public void testInternalTopLevelMembers() throws Exception { + doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.kt"); + } + + @Test + public void testInternalTraitMembers() throws Exception { + doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.kt"); + } + + @Test + public void testInternalTraitMembersInherited() throws Exception { + doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.kt"); + } + public static void allTestsPresent(Class clazz, File testDataDir, boolean recursive) { Set methodNames = new HashSet(); for (Method method : clazz.getDeclaredMethods()) {