Fix JvmRuntimeDescriptorLoaderTestGenerated
- Use FULL_JDK instead of mock JDK in some tests because mock JDK is created from JDK 6 and full JDK is now JDK 8, so there are differences in the behavior in the compiler and at runtime - Remove some '*.runtime.txt' files which were workarounds to JDK 6 reflection issues regarding generic inner classes; code in these tests is now loaded exactly the same in the compiler and at runtime - Change supertype in SupertypesAndBounds.kt: the class in the supertype is not relevant to that test, it checks that annotations can be loaded on types
This commit is contained in:
committed by
Dmitry Jemerov
parent
3c96099f7c
commit
33e9e660c4
@@ -1,3 +1,5 @@
|
|||||||
|
// FULL_JDK
|
||||||
|
|
||||||
package test;
|
package test;
|
||||||
|
|
||||||
public abstract class ClassDoesNotOverrideMethod extends java.util.Date {
|
public abstract class ClassDoesNotOverrideMethod extends java.util.Date {
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// FULL_JDK
|
||||||
|
|
||||||
package test;
|
package test;
|
||||||
|
|
||||||
public abstract class ClassWithTypePExtendsIterableP<P> implements java.lang.Iterable<P> {
|
public abstract class ClassWithTypePExtendsIterableP<P> implements java.lang.Iterable<P> {
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
package test
|
|
||||||
|
|
||||||
public open class InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!> {
|
|
||||||
public constructor InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!>()
|
|
||||||
|
|
||||||
public open inner class Inner /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ {
|
|
||||||
public constructor Inner()
|
|
||||||
}
|
|
||||||
|
|
||||||
public open inner class Inner2 /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ : test.InnerClassesInGeneric<kotlin.Any!, kotlin.Any!>.Inner {
|
|
||||||
public constructor Inner2()
|
|
||||||
public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<P!>!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package test
|
|
||||||
|
|
||||||
public open class InnerOfGeneric {
|
|
||||||
public constructor InnerOfGeneric()
|
|
||||||
|
|
||||||
public abstract inner class A</*0*/ K : kotlin.Any!> {
|
|
||||||
public constructor A</*0*/ K : kotlin.Any!>()
|
|
||||||
|
|
||||||
public abstract inner class Inner /*captured type parameters: /*0*/ K : kotlin.Any!*/ : test.InnerOfGeneric.S<K!> {
|
|
||||||
public constructor Inner()
|
|
||||||
public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.(Mutable)Iterator<K!>!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public open inner class B</*0*/ L : kotlin.Any!> : test.InnerOfGeneric.A<L!> {
|
|
||||||
public constructor B</*0*/ L : kotlin.Any!>()
|
|
||||||
|
|
||||||
public open inner class SubInner /*captured type parameters: /*0*/ L : kotlin.Any!*/ : test.InnerOfGeneric.A<kotlin.Any!>.Inner {
|
|
||||||
public constructor SubInner()
|
|
||||||
public open override /*1*/ fun iterator(): kotlin.collections.(Mutable)Iterator<L!>!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public open inner class S</*0*/ E : kotlin.Any!> {
|
|
||||||
public constructor S</*0*/ E : kotlin.Any!>()
|
|
||||||
public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<E!>!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-22
@@ -1,22 +0,0 @@
|
|||||||
package test
|
|
||||||
|
|
||||||
public interface ReturnInnerSubclassOfSupersInner {
|
|
||||||
|
|
||||||
public open class Sub</*0*/ B : kotlin.Any!> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
|
|
||||||
public constructor Sub</*0*/ B : kotlin.Any!>()
|
|
||||||
|
|
||||||
public/*package*/ open inner class Inner /*captured type parameters: /*0*/ B : kotlin.Any!*/ : test.ReturnInnerSubclassOfSupersInner.Super<kotlin.Any!>.Inner {
|
|
||||||
public/*package*/ constructor Inner()
|
|
||||||
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B!>!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public open class Super</*0*/ A : kotlin.Any!> {
|
|
||||||
public constructor Super</*0*/ A : kotlin.Any!>()
|
|
||||||
|
|
||||||
public/*package*/ open inner class Inner /*captured type parameters: /*0*/ A : kotlin.Any!*/ {
|
|
||||||
public/*package*/ constructor Inner()
|
|
||||||
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+3
-1
@@ -2,8 +2,10 @@
|
|||||||
|
|
||||||
package test
|
package test
|
||||||
|
|
||||||
|
import java.io.Serializable
|
||||||
|
|
||||||
annotation class A
|
annotation class A
|
||||||
|
|
||||||
interface Foo<T : @A Number> : @A CharSequence {
|
interface Foo<T : @A Number> : @A Serializable {
|
||||||
fun <E, F : @A E> bar()
|
fun <E, F : @A E> bar()
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-5
@@ -4,10 +4,6 @@ public final annotation class A : kotlin.Annotation {
|
|||||||
/*primary*/ public constructor A()
|
/*primary*/ public constructor A()
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface Foo</*0*/ T : @test.A kotlin.Number> : @test.A kotlin.CharSequence {
|
public interface Foo</*0*/ T : @test.A kotlin.Number> : @test.A java.io.Serializable {
|
||||||
public abstract override /*1*/ /*fake_override*/ val length: kotlin.Int
|
|
||||||
public abstract override /*1*/ /*fake_override*/ fun <get-length>(): kotlin.Int
|
|
||||||
public abstract fun </*0*/ E, /*1*/ F : @test.A E> bar(): kotlin.Unit
|
public abstract fun </*0*/ E, /*1*/ F : @test.A E> bar(): kotlin.Unit
|
||||||
public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
|
|
||||||
public abstract override /*1*/ /*fake_override*/ fun subSequence(/*0*/ startIndex: kotlin.Int, /*1*/ endIndex: kotlin.Int): kotlin.CharSequence
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -1,3 +1,5 @@
|
|||||||
|
// FULL_JDK
|
||||||
|
|
||||||
package test
|
package test
|
||||||
|
|
||||||
public abstract class ClassDoesNotOverrideMethod() : java.util.Date() {
|
public abstract class ClassDoesNotOverrideMethod() : java.util.Date() {
|
||||||
|
|||||||
+2
@@ -1,3 +1,5 @@
|
|||||||
|
// FULL_JDK
|
||||||
|
|
||||||
package test
|
package test
|
||||||
|
|
||||||
public abstract class ClassWithTypePExtendsIterableP<P>() : kotlin.collections.MutableIterable<P> {
|
public abstract class ClassWithTypePExtendsIterableP<P>() : kotlin.collections.MutableIterable<P> {
|
||||||
|
|||||||
+2
@@ -1,3 +1,5 @@
|
|||||||
|
// FULL_JDK
|
||||||
|
|
||||||
package test
|
package test
|
||||||
|
|
||||||
public interface HalfSubstitutedTypeParameters {
|
public interface HalfSubstitutedTypeParameters {
|
||||||
|
|||||||
+2
@@ -1,3 +1,5 @@
|
|||||||
|
// FULL_JDK
|
||||||
|
|
||||||
package test
|
package test
|
||||||
|
|
||||||
public interface SubclassOfCollection<E>: MutableCollection<E> {
|
public interface SubclassOfCollection<E>: MutableCollection<E> {
|
||||||
|
|||||||
Reference in New Issue
Block a user