azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove KotlinSignature from tests, spec, delete tests with errors

Browse Source
This commit is contained in:
Alexander Udalov
2015-11-13 18:36:48 +03:00
parent 9cdeac7839
commit d472154ea7
153 changed files with 30 additions and 1876 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java
Vendored
-1
View File
@@ -1,7 +1,6 @@
package test;
import java.util.List;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface ArraysInSubtypes {
interface Super {
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java
Vendored
-6
View File
@@ -3,24 +3,18 @@ package test;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface TwoSuperclassesInconsistentGenericTypes {
@KotlinSignature("fun foo(): MutableList<String?>")
List<String> foo();
void dummy(); // To make it not SAM
public interface Other {
@KotlinSignature("fun foo(): MutableList<String>?")
List<String> foo();
void dummy(); // To make it not SAM
}
public class Sub implements TwoSuperclassesInconsistentGenericTypes, Other {
//@ExpectLoadError("Incompatible types in superclasses: [String?, String]")
public List<String> foo() {
throw new UnsupportedOperationException();
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java
Vendored
-31
View File
@@ -1,31 +0,0 @@
package test;
import org.jetbrains.annotations.NotNull;
import java.lang.String;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface TwoSuperclassesVarargAndNot {
public interface Super1 {
void foo(String... s);
void dummy(); // To make it not SAM
}
public interface Super2 {
@KotlinSignature("fun foo(s : Array<out String?>?)")
void foo(String[] s);
void dummy(); // To make it not SAM
}
public interface Sub extends Super1, Super2 {
@ExpectLoadError(//"Incompatible projection kinds in type arguments of super methods' return types: [String?, out String?]|" +
//"Incompatible types in superclasses: [Array<String?>, Array<out String?>?]|" +
"Incompatible super methods: some have vararg parameter, some have not|")
void foo(String[] s);
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
Vendored
-19
View File
@@ -1,19 +0,0 @@
package test
public interface TwoSuperclassesVarargAndNot {
public interface Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
}
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
}
}