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

Rename jet -> kotlin in compiler-tests (except resolve)

Browse Source 
Move test-related code to org.jetbrains.kotlin.test, also move some tests to
packages with better names
This commit is contained in:
Alexander Udalov
2015-01-12 00:24:12 +03:00
parent 663d31709b
commit 3b81d63334
373 changed files with 1174 additions and 1303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class AddingNullability {
@ExpectLoadError("Auto type 'kotlin.Int' is not-null, while type in alternative signature is nullable: 'Int?'")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.lang.Number;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class ConflictingProjectionKind {
@ExpectLoadError("Projection kind 'in' is conflicting with variance of kotlin.List")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class ExplicitFieldGettersAndSetters {
@ExpectLoadError("Field annotation for shouldn't have getters and setters")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class ExtraUpperBound {
@ExpectLoadError("Upper bound number mismatch for A. Expected 1, but found 2")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class MissingUpperBound {
@ExpectLoadError("Upper bound number mismatch for A. Expected 2, but found 1")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class NoFieldTypeRef {
@ExpectLoadError("Field annotation for shouldn't have type reference")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class NotVarargReplacedWithVararg {
@ExpectLoadError("Parameter in method signature is not vararg, but in alternative signature it is vararg")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.lang.Number;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class RedundantProjectionKind {
@KotlinSignature("fun foo(list: List<out Number>)")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class ReturnTypeMissing {
@ExpectLoadError("Return type in alternative signature is missing, while in real signature it is 'kotlin.Int'")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class SyntaxError {
@ExpectLoadError("Alternative signature has 2 syntax errors, first is at 8: Expecting a parameter declaration")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class SyntaxErrorInFieldAnnotation {
@ExpectLoadError("Alternative signature has syntax error at 10: Type expected")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class VarargReplacedWithNotVararg {
@ExpectLoadError("Parameter in method signature is vararg, but in alternative signature it is not")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongFieldInitializer {
@ExpectLoadError("Default value is not expected in annotation for field")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongFieldMutability {
@ExpectLoadError("Wrong mutability in annotation for field")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongFieldName {
@ExpectLoadError("Field name mismatch, original: foo, alternative: bar")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongMethodName {
@ExpectLoadError("Function names mismatch, original: foo, alternative: bar")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.lang.Number;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongProjectionKind {
//@ExpectLoadError("Projection kind mismatch, actual: out, in alternative signature: ")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongReturnTypeStructure {
//@ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String<Int>' in alternative signature has 1 of them")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeName1 {
@ExpectLoadError("Alternative signature type mismatch, expected: Unit, actual: kotlin.String")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeName2 {
@ExpectLoadError("Alternative signature type mismatch, expected: Something.String, actual: kotlin.String")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeName3 {
@ExpectLoadError("Alternative signature type mismatch, expected: List, actual: kotlin.String")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeParameterBoundStructure1 {
//@ExpectLoadError("'java.lang.Runnable?' type in method signature has 0 type arguments, while 'Runnable<Int>' in alternative signature has 1 of them")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeParameterBoundStructure2 {
//@ExpectLoadError("'kotlin.List<kotlin.Cloneable>?' type in method signature has 1 type arguments, while 'List' in alternative signature has 0 of them")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeParametersCount {
@ExpectLoadError("Method signature has 2 type parameters, but alternative signature has 3")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongValueParameterStructure1 {
//@ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String<Int?>' in alternative signature has 1 of them")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongValueParameterStructure2 {
//@ExpectLoadError("'kotlin.Map.Entry<kotlin.String, kotlin.String>' type in method signature has 2 type arguments, while 'Map.Entry<String?>' in alternative signature has 1 of them")
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java
+1 -1
View File
@@ -1,7 +1,7 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongValueParametersCount {
@ExpectLoadError("Method signature has 0 value parameters, but alternative signature has 1")
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
public interface ChangeProjectionKind1 {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
public interface ChangeProjectionKind2 {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
public interface InheritMutability {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
public interface InheritProjectionKind {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
public interface InheritReadOnliness {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
public interface MutableToReadOnly {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface NotNullToNullable {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface NullableToNotNull {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface NullableToNotNullKotlinSignature {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
public interface ReadOnlyToMutable {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface AddNullabilityJavaSubtype {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface AddNullabilitySameGenericType1 {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface AddNullabilitySameGenericType2 {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface AddNullabilitySameJavaType {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java
+1 -1
View File
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface CantMakeImmutableInSubclass {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
import java.util.List;
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
import org.jetbrains.annotations.NotNull;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
import java.util.*;
public interface InheritReadOnliness {
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java
+2 -2
View File
@@ -1,7 +1,7 @@
package test;
import java.util.List;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface ArraysInSubtypes {
interface Super {
@@ -18,4 +18,4 @@ public interface ArraysInSubtypes {
T[] objArray();
}
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java
+1 -1
View File
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface TwoSuperclassesInconsistentGenericTypes {
@KotlinSignature("fun foo(): MutableList<String?>")
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java
+1 -1
View File
@@ -6,7 +6,7 @@ import java.lang.String;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public interface TwoSuperclassesVarargAndNot {
public interface Super1 {