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
+3
-1
@@ -2,8 +2,10 @@
|
||||
|
||||
package test
|
||||
|
||||
import java.io.Serializable
|
||||
|
||||
annotation class A
|
||||
|
||||
interface Foo<T : @A Number> : @A CharSequence {
|
||||
interface Foo<T : @A Number> : @A Serializable {
|
||||
fun <E, F : @A E> bar()
|
||||
}
|
||||
|
||||
+1
-5
@@ -4,10 +4,6 @@ public final annotation class A : kotlin.Annotation {
|
||||
/*primary*/ public constructor A()
|
||||
}
|
||||
|
||||
public interface Foo</*0*/ T : @test.A kotlin.Number> : @test.A kotlin.CharSequence {
|
||||
public abstract override /*1*/ /*fake_override*/ val length: kotlin.Int
|
||||
public abstract override /*1*/ /*fake_override*/ fun <get-length>(): kotlin.Int
|
||||
public interface Foo</*0*/ T : @test.A kotlin.Number> : @test.A java.io.Serializable {
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user