overriddenDescriptors is empty for java static property and function declarations

Fake overrides are still created for java static with non-empty overriddenDescriptors

Add tests for inheriting visibility for java static members
Add test: check that java static declarations that shadow deprecated declarations should not be deprecated
Add test for corner case where "overriding" java static constant led to incorrect type in inheritor

Fix test data for existing tests
This commit is contained in:
Pavel V. Talanov
2016-02-08 19:04:18 +03:00
parent 7e78e8d8ab
commit 7d98103c0c
30 changed files with 249 additions and 39 deletions
@@ -23,8 +23,8 @@ public/*package*/ open class B : A {
// Static members
public final var a: kotlin.Int
public final override /*1*/ var b: kotlin.Int
public open override /*1*/ fun bar(): kotlin.Unit
public final var b: kotlin.Int
public open fun bar(): kotlin.Unit
public open fun bar(/*0*/ i: kotlin.Int): kotlin.Unit
public open fun foo(): kotlin.Unit
public open fun foo(/*0*/ i: kotlin.Int): kotlin.Unit
@@ -38,5 +38,5 @@ public open class O : A, B {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final override /*2*/ var field: kotlin.Double
public final var field: kotlin.Double
}
@@ -17,7 +17,7 @@ public interface B : A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ val field: kotlin.String
public const final val field: kotlin.String
}
public open class E : A, B {
@@ -38,5 +38,5 @@ public open class O : A, B {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final override /*2*/ var field: kotlin.Double
public final var field: kotlin.Double
}
@@ -67,7 +67,7 @@ public open class EO : E {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final override /*2*/ var field: kotlin.Double
public final var field: kotlin.Double
}
public open class O : C, D {
@@ -77,7 +77,7 @@ public open class O : C, D {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final override /*2*/ var field: kotlin.Double
public final var field: kotlin.Double
}
public open class OO : O {
@@ -35,7 +35,7 @@ public open class E : D, I {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public/*package*/ final override /*2*/ var a: kotlin.Int
public/*package*/ final var a: kotlin.Int
public/*package*/ final override /*1*/ /*fake_override*/ var b: kotlin.Int
public/*package*/ final override /*1*/ /*fake_override*/ var c: kotlin.Int
public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
@@ -18,8 +18,8 @@ public open class B : A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public/*package*/ open override /*1*/ fun bar(): kotlin.Long
public/*package*/ open override /*1*/ fun foo(): kotlin.Unit
public/*package*/ open fun bar(): kotlin.Long
public/*package*/ open fun foo(): kotlin.Unit
}
public final class E : B {
@@ -39,7 +39,7 @@ public open class X : B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public/*package*/ open override /*1*/ fun foo(): kotlin.Double
public/*package*/ open fun foo(): kotlin.Double
}
public final class Y : X {
@@ -19,7 +19,7 @@ public open class B : A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public open override /*1*/ fun foo(): kotlin.Int
public open fun foo(): kotlin.Int
}
public final class C : B {