Remove KotlinSignature from tests, spec, delete tests with errors
This commit is contained in:
Alexander Udalov
-6
@@ -1,22 +1,16 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.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);
|
||||
}
|
||||
}
|
||||
|
||||
-22
@@ -1,22 +0,0 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.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
@@ -1,14 +0,0 @@
|
||||
package test
|
||||
|
||||
public interface ChangeProjectionKind2 {
|
||||
|
||||
public interface Sub : test.ChangeProjectionKind2.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
|
||||
}
|
||||
|
||||
public interface Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
|
||||
}
|
||||
}
|
||||
-4
@@ -1,12 +1,8 @@
|
||||
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
|
||||
|
||||
-4
@@ -1,12 +1,8 @@
|
||||
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
|
||||
|
||||
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java
Vendored
-20
@@ -1,20 +0,0 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.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);
|
||||
}
|
||||
}
|
||||
Vendored
-14
@@ -1,14 +0,0 @@
|
||||
package test
|
||||
|
||||
public interface InheritMutability {
|
||||
|
||||
public interface Sub : test.InheritMutability.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
|
||||
}
|
||||
|
||||
public interface Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
|
||||
}
|
||||
}
|
||||
-3
@@ -1,11 +1,8 @@
|
||||
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
|
||||
|
||||
-21
@@ -1,21 +0,0 @@
|
||||
//ALLOW_AST_ACCESS
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.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
@@ -1,14 +0,0 @@
|
||||
package test
|
||||
|
||||
public interface InheritProjectionKind {
|
||||
|
||||
public interface Sub : test.InheritProjectionKind.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
|
||||
}
|
||||
|
||||
public interface Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
|
||||
}
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.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
@@ -1,14 +0,0 @@
|
||||
package test
|
||||
|
||||
public interface InheritReadOnliness {
|
||||
|
||||
public interface Sub : test.InheritReadOnliness.Super {
|
||||
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
|
||||
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
|
||||
}
|
||||
|
||||
public interface Super {
|
||||
public abstract fun dummy(): kotlin.Unit
|
||||
public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
|
||||
}
|
||||
}
|
||||
-3
@@ -1,11 +1,8 @@
|
||||
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
|
||||
|
||||
-2
@@ -1,7 +1,6 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
// See SubclassFromGenericAndNot, as well
|
||||
public interface Kt3302 {
|
||||
@@ -12,7 +11,6 @@ public interface Kt3302 {
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java
Vendored
-6
@@ -1,22 +1,16 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.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);
|
||||
}
|
||||
}
|
||||
|
||||
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java
Vendored
-4
@@ -1,8 +1,6 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
|
||||
|
||||
public interface NotNullToNullable {
|
||||
|
||||
@@ -13,8 +11,6 @@ public interface NotNullToNullable {
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java
Vendored
-3
@@ -1,8 +1,6 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
|
||||
|
||||
public interface NullableToNotNull {
|
||||
|
||||
@@ -13,7 +11,6 @@ public interface NullableToNotNull {
|
||||
}
|
||||
|
||||
public interface Sub extends Super {
|
||||
//@ExpectLoadError("In superclass type is nullable: [String?], in subclass it is not: String")
|
||||
void foo(@NotNull String p);
|
||||
}
|
||||
}
|
||||
|
||||
-5
@@ -1,21 +1,16 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.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);
|
||||
}
|
||||
}
|
||||
|
||||
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java
Vendored
-5
@@ -1,22 +1,17 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
import org.jetbrains.kotlin.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);
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -1,7 +1,6 @@
|
||||
package test;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import jet.runtime.typeinfo.KotlinSignature;
|
||||
|
||||
// Extracted from KT-3302, see Kt3302 test, as well
|
||||
public interface SubclassFromGenericAndNot {
|
||||
@@ -13,7 +12,6 @@ public interface SubclassFromGenericAndNot {
|
||||
}
|
||||
|
||||
public interface Generic<T> {
|
||||
@KotlinSignature("fun foo(key : T)")
|
||||
public void foo(T key);
|
||||
|
||||
void dummy(); // to avoid loading as SAM interface
|
||||
|
||||
-4
@@ -1,12 +1,8 @@
|
||||
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
|
||||
|
||||
-5
@@ -1,19 +1,14 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user