Test data split between compiledJava tests and compiledKotlin tests
Basically, this commit splits test data from the from java-txt-kt to two pairs java-txt and kt-txt. This commit leads to some duplication in test data. This is temporary: in the platform types branch the test data for LoadJava tests will be changed dramatically, so duplication will go away
This commit is contained in:
+22
@@ -0,0 +1,22 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
import java.util.*;
|
||||
|
||||
public interface ChangeProjectionKind1 {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: MutableList<in String>)")
|
||||
void foo(List<String> p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
@ExpectLoadError("Projection kind mismatch, actual: in, in alternative signature: ")
|
||||
@KotlinSignature("fun foo(p: MutableList<String>)")
|
||||
void foo(List<String> p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait ChangeProjectionKind1 {
|
||||
|
||||
public trait Sub : test.ChangeProjectionKind1.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
import java.util.*;
|
||||
|
||||
public interface ChangeProjectionKind2 {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: MutableList<String>)")
|
||||
void foo(List<String> p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
@ExpectLoadError("Parameter type changed for method which overrides another: MutableList<in String>, was: MutableList<String>")
|
||||
@KotlinSignature("fun foo(p: MutableList<in String>)")
|
||||
void foo(List<String> p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait ChangeProjectionKind2 {
|
||||
|
||||
public trait Sub : test.ChangeProjectionKind2.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
public interface DeeplySubstitutedClassParameter {
|
||||
|
||||
public interface Super<T> {
|
||||
@KotlinSignature("fun foo(t: T)")
|
||||
void foo(T p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Middle<E> extends Super<E> {
|
||||
void foo(E p);
|
||||
}
|
||||
|
||||
public interface Sub extends Middle<String> {
|
||||
void foo(String p);
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package test
|
||||
|
||||
public trait DeeplySubstitutedClassParameter {
|
||||
|
||||
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ t: E): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super</*0*/ T> {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ t: T): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
public interface DeeplySubstitutedClassParameter2 {
|
||||
|
||||
public interface Super<T> {
|
||||
@KotlinSignature("fun foo(t: T)")
|
||||
void foo(T p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Middle<E> extends Super<E> {
|
||||
}
|
||||
|
||||
public interface Sub extends Middle<String> {
|
||||
void foo(String p);
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package test
|
||||
|
||||
public trait DeeplySubstitutedClassParameter2 {
|
||||
|
||||
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super</*0*/ T> {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ t: T): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
import java.util.*;
|
||||
|
||||
public interface InheritMutability {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: MutableList<String>)")
|
||||
void foo(List<String> p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(List<String> p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritMutability {
|
||||
|
||||
public trait Sub : test.InheritMutability.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test;
|
||||
|
||||
public interface InheritNotVararg {
|
||||
|
||||
public interface Super {
|
||||
void foo(String[] p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(String... p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritNotVararg {
|
||||
|
||||
public trait Sub : test.InheritNotVararg.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test;
|
||||
|
||||
public interface InheritNotVarargInteger {
|
||||
|
||||
public interface Super {
|
||||
void foo(Integer[] p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(Integer... p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritNotVarargInteger {
|
||||
|
||||
public trait Sub : test.InheritNotVarargInteger.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package test;
|
||||
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
public interface InheritNotVarargNotNull {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: Array<out String>)")
|
||||
void foo(String[] p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(String... p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritNotVarargNotNull {
|
||||
|
||||
public trait Sub : test.InheritNotVarargNotNull.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test;
|
||||
|
||||
public interface InheritNotVarargPrimitive {
|
||||
|
||||
public interface Super {
|
||||
void foo(int[] p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(int... p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritNotVarargPrimitive {
|
||||
|
||||
public trait Sub : test.InheritNotVarargPrimitive.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public interface InheritNullability {
|
||||
|
||||
public interface Super {
|
||||
void foo(@NotNull String p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(String p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritNullability {
|
||||
|
||||
public trait Sub : test.InheritNullability.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
import java.util.*;
|
||||
|
||||
public interface InheritProjectionKind {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: MutableList<in String>)")
|
||||
void foo(List<String> p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(List<String> p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritProjectionKind {
|
||||
|
||||
public trait Sub : test.InheritProjectionKind.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
import java.util.*;
|
||||
|
||||
public interface InheritReadOnliness {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: List<String>)")
|
||||
void foo(List<String> p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(List<String> p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritReadOnliness {
|
||||
|
||||
public trait Sub : test.InheritReadOnliness.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test;
|
||||
|
||||
public interface InheritVararg {
|
||||
|
||||
public interface Super {
|
||||
void foo(String... p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(String[] p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritVararg {
|
||||
|
||||
public trait Sub : test.InheritVararg.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test;
|
||||
|
||||
public interface InheritVarargInteger {
|
||||
|
||||
public interface Super {
|
||||
void foo(Integer... p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(Integer[] p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritVarargInteger {
|
||||
|
||||
public trait Sub : test.InheritVarargInteger.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<kotlin.Int?>*/): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<kotlin.Int?>*/): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package test;
|
||||
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
public interface InheritVarargNotNull {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(vararg p: String)")
|
||||
void foo(String... p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(String[] p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritVarargNotNull {
|
||||
|
||||
public trait Sub : test.InheritVarargNotNull.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test;
|
||||
|
||||
public interface InheritVarargPrimitive {
|
||||
|
||||
public interface Super {
|
||||
void foo(int... p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
void foo(int[] p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait InheritVarargPrimitive {
|
||||
|
||||
public trait Sub : test.InheritVarargPrimitive.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
// See SubclassFromGenericAndNot, as well
|
||||
public interface Kt3302 {
|
||||
public interface BSONObject {
|
||||
Object put(@NotNull String s, @NotNull Object o);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface LinkedHashMap<K, V> {
|
||||
@KotlinSignature("fun put(key : K, value : V) : V?")
|
||||
public V put(K key, V value);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface BasicBSONObject extends LinkedHashMap<String, Object>, BSONObject {
|
||||
@Override
|
||||
public Object put(String key, Object value);
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package test
|
||||
|
||||
public trait Kt3302 {
|
||||
|
||||
public trait BSONObject {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any?
|
||||
}
|
||||
|
||||
public trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String, kotlin.Any>, test.Kt3302.BSONObject {
|
||||
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*2*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.Any): kotlin.Any?
|
||||
}
|
||||
|
||||
public trait LinkedHashMap</*0*/ K, /*1*/ V> {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
import java.util.*;
|
||||
|
||||
public interface MutableToReadOnly {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: MutableList<String>)")
|
||||
void foo(List<String> p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
@ExpectLoadError("Parameter type changed for method which overrides another: List<String>, was: MutableList<String>")
|
||||
@KotlinSignature("fun foo(p: List<String>)")
|
||||
void foo(List<String> p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait MutableToReadOnly {
|
||||
|
||||
public trait Sub : test.MutableToReadOnly.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
|
||||
public interface NotNullToNullable {
|
||||
|
||||
public interface Super {
|
||||
void foo(@NotNull String p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
@ExpectLoadError("Auto type 'kotlin.String' is not-null, while type in alternative signature is nullable: 'String?'")
|
||||
@KotlinSignature("fun foo(p: String?)")
|
||||
void foo(String p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait NotNullToNullable {
|
||||
|
||||
public trait Sub : test.NotNullToNullable.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
|
||||
public interface NullableToNotNull {
|
||||
|
||||
public interface Super {
|
||||
void foo(String p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
@ExpectLoadError("In superclass type is nullable: [String?], in subclass it is not: String")
|
||||
void foo(@NotNull String p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait NullableToNotNull {
|
||||
|
||||
public trait Sub : test.NullableToNotNull.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
|
||||
public interface NullableToNotNullKotlinSignature {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: String?)")
|
||||
void foo(String p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
@ExpectLoadError("Parameter type changed for method which overrides another: String, was: String?")
|
||||
@KotlinSignature("fun foo(p: String)")
|
||||
void foo(String p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait NullableToNotNullKotlinSignature {
|
||||
|
||||
public trait Sub : test.NullableToNotNullKotlinSignature.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test;
|
||||
|
||||
public interface OverrideWithErasedParameter {
|
||||
|
||||
public interface Super<T> {
|
||||
void foo(T t);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub<T> extends Super<T> {
|
||||
void foo(Object o);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait OverrideWithErasedParameter {
|
||||
|
||||
public trait Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T> {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: T?): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super</*0*/ T> {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
|
||||
import java.util.*;
|
||||
|
||||
public interface ReadOnlyToMutable {
|
||||
|
||||
public interface Super {
|
||||
@KotlinSignature("fun foo(p: List<String>)")
|
||||
void foo(List<String> p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
@ExpectLoadError("Parameter type changed for method which overrides another: MutableList<String>, was: List<String>")
|
||||
@KotlinSignature("fun foo(p: MutableList<String>)")
|
||||
void foo(List<String> p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait ReadOnlyToMutable {
|
||||
|
||||
public trait Sub : test.ReadOnlyToMutable.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
// Extracted from KT-3302, see Kt3302 test, as well
|
||||
public interface SubclassFromGenericAndNot {
|
||||
|
||||
public interface NonGeneric {
|
||||
void foo(@NotNull String s);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Generic<T> {
|
||||
@KotlinSignature("fun foo(key : T)")
|
||||
public void foo(T key);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends NonGeneric, Generic<String> {
|
||||
@Override
|
||||
public void foo(String key);
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package test
|
||||
|
||||
public trait SubclassFromGenericAndNot {
|
||||
|
||||
public trait Generic</*0*/ T> {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ key: T): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait NonGeneric {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
|
||||
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
public interface SubstitutedClassParameter {
|
||||
|
||||
public interface Super<T> {
|
||||
@KotlinSignature("fun foo(t: T)")
|
||||
void foo(T p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super<String> {
|
||||
void foo(String p);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
public trait SubstitutedClassParameter {
|
||||
|
||||
public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super</*0*/ T> {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ t: T): kotlin.Unit
|
||||
}
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
public interface SubstitutedClassParameters {
|
||||
|
||||
public interface Super1<T> {
|
||||
@KotlinSignature("fun foo(t: T)")
|
||||
void foo(T p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Super2<E> {
|
||||
@KotlinSignature("fun foo(t: E)")
|
||||
void foo(E p);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
}
|
||||
|
||||
public interface Sub extends Super1<String>, Super2<String> {
|
||||
void foo(String p);
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package test
|
||||
|
||||
public trait SubstitutedClassParameters {
|
||||
|
||||
public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
|
||||
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super1</*0*/ T> {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ t: T): kotlin.Unit
|
||||
}
|
||||
|
||||
public trait Super2</*0*/ E> {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ t: E): kotlin.Unit
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user