jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-09 00:21:47 +00:00
Code Issues 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

12
compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java vendored
View File

@@ -1,12 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
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?'")
@KotlinSignature("fun foo() : Int?")
public int foo() {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class AddingNullability {
public constructor AddingNullability()
public open fun foo(): kotlin.Int
}

15
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java vendored
View File

@@ -1,15 +0,0 @@
package test;
import java.lang.Number;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class ConflictingProjectionKind {
@ExpectLoadError("Projection kind 'in' is conflicting with variance of kotlin.List")
@KotlinSignature("fun foo(list: List<in Number>)")
public void foo(List<Number> list) {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class ConflictingProjectionKind {
public constructor ConflictingProjectionKind()
public open fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.Number!>!): kotlin.Unit
}

10
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java vendored
View File

@@ -1,10 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class ExplicitFieldGettersAndSetters {
@ExpectLoadError("Field annotation for shouldn't have getters and setters")
@KotlinSignature("var foo: String get() { return \"hello\" }")
public String foo;
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class ExplicitFieldGettersAndSetters {
public constructor ExplicitFieldGettersAndSetters()
public final var foo: kotlin.String!
}

12
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java vendored
View File

@@ -1,12 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class ExtraUpperBound {
@ExpectLoadError("Upper bound number mismatch for A. Expected 1, but found 2")
@KotlinSignature("fun <A : Runnable> foo() : String where A : Cloneable")
public <A extends Runnable> String foo() {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class ExtraUpperBound {
public constructor ExtraUpperBound()
public open fun </*0*/ A : java.lang.Runnable!> foo(): kotlin.String!
}

12
compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java vendored
View File

@@ -1,12 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class MissingUpperBound {
@ExpectLoadError("Upper bound number mismatch for A. Expected 2, but found 1")
@KotlinSignature("fun <A : Runnable> foo() : String")
public <A extends Runnable & Cloneable> String foo() {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class MissingUpperBound {
public constructor MissingUpperBound()
public open fun </*0*/ A : java.lang.Runnable!> foo(): kotlin.String! where A : kotlin.Cloneable!
}

10
compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java vendored
View File

@@ -1,10 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class NoFieldTypeRef {
@ExpectLoadError("Field annotation for shouldn't have type reference")
@KotlinSignature("var foo")
public String foo;
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class NoFieldTypeRef {
public constructor NoFieldTypeRef()
public final var foo: kotlin.String!
}

13
compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java vendored
View File

@@ -1,13 +0,0 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
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")
@KotlinSignature("fun foo(vararg s : String)")
public void foo(String s) {
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class NotVarargReplacedWithVararg {
public constructor NotVarargReplacedWithVararg()
public open fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
}

14
compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java vendored
View File

@@ -1,14 +0,0 @@
package test;
import java.lang.Number;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class RedundantProjectionKind {
@KotlinSignature("fun foo(list: List<out Number>)")
public void foo(List<Number> list) {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class RedundantProjectionKind {
public constructor RedundantProjectionKind()
public open fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.Number!>!): kotlin.Unit
}

12
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java vendored
View File

@@ -1,12 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
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'")
@KotlinSignature("fun foo(a : String)")
public int foo(String a) {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class ReturnTypeMissing {
public constructor ReturnTypeMissing()
public open fun foo(/*0*/ p0: kotlin.String!): kotlin.Int
}

12
compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java vendored
View File

@@ -1,12 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
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")
@KotlinSignature("fun foo(,) : Int")
public Integer foo() {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class SyntaxError {
public constructor SyntaxError()
public open fun foo(): kotlin.Int!
}

10
compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java vendored
View File

@@ -1,10 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class SyntaxErrorInFieldAnnotation {
@ExpectLoadError("Alternative signature has syntax error at 10: Type expected")
@KotlinSignature("var foo : ")
public String foo;
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class SyntaxErrorInFieldAnnotation {
public constructor SyntaxErrorInFieldAnnotation()
public final var foo: kotlin.String!
}

13
compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java vendored
View File

@@ -1,13 +0,0 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
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")
@KotlinSignature("fun foo(s : String)")
public void foo(String... s) {
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class VarargReplacedWithNotVararg {
public constructor VarargReplacedWithNotVararg()
public open fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}

10
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java vendored
View File

@@ -1,10 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongFieldInitializer {
@ExpectLoadError("Default value is not expected in annotation for field")
@KotlinSignature("var foo : String = \"Test\"")
public String foo;
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongFieldInitializer {
public constructor WrongFieldInitializer()
public final var foo: kotlin.String!
}

14
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java vendored
View File

@@ -1,14 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongFieldMutability {
@ExpectLoadError("Wrong mutability in annotation for field")
@KotlinSignature("val fooNotFinal : String")
public String fooNotFinal;
@ExpectLoadError("Wrong mutability in annotation for field")
@KotlinSignature("var fooFinal : String")
public final String fooFinal = "Test";
}

7
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt vendored
View File

@@ -1,7 +0,0 @@
package test
public open class WrongFieldMutability {
public constructor WrongFieldMutability()
public final val fooFinal: kotlin.String! = "Test"
public final var fooNotFinal: kotlin.String!
}

10
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java vendored
View File

@@ -1,10 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongFieldName {
@ExpectLoadError("Field name mismatch, original: foo, alternative: bar")
@KotlinSignature("var bar: String")
public String foo;
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongFieldName {
public constructor WrongFieldName()
public final var foo: kotlin.String!
}

12
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java vendored
View File

@@ -1,12 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongMethodName {
@ExpectLoadError("Function names mismatch, original: foo, alternative: bar")
@KotlinSignature("fun bar() : String")
public String foo() {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongMethodName {
public constructor WrongMethodName()
public open fun foo(): kotlin.String!
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java vendored
View File

@@ -1,14 +1,8 @@
package test;
import java.lang.Number;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongProjectionKind {
//@ExpectLoadError("Projection kind mismatch, actual: out, in alternative signature: ")
@KotlinSignature("fun copy(a : Array<out Number>, b : Array<Number>) : MutableList<Number>")
public List<Number> copy(Number[] from, Number[] to) {
throw new UnsupportedOperationException();
}

4
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java vendored
View File

@@ -1,12 +1,8 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
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")
@KotlinSignature("fun foo(a : String, b : List<Map.Entry<String?, String>?>) : String<Int>?")
public String foo(String a, List<Map.Entry<String, String>> b) {
throw new UnsupportedOperationException();
}

13
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java vendored
View File

@@ -1,13 +0,0 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeName1 {
@ExpectLoadError("Alternative signature type mismatch, expected: Unit, actual: kotlin.String")
@KotlinSignature("fun foo(a : String) : Unit")
public String foo(String a) {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongTypeName1 {
public constructor WrongTypeName1()
public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String!
}

13
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java vendored
View File

@@ -1,13 +0,0 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeName2 {
@ExpectLoadError("Alternative signature type mismatch, expected: Something.String, actual: kotlin.String")
@KotlinSignature("fun foo(a : Something.String) : String")
public String foo(String a) {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongTypeName2 {
public constructor WrongTypeName2()
public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String!
}

13
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java vendored
View File

@@ -1,13 +0,0 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeName3 {
@ExpectLoadError("Alternative signature type mismatch, expected: List, actual: kotlin.String")
@KotlinSignature("fun foo(a : String) : List")
public String foo(String a) {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongTypeName3 {
public constructor WrongTypeName3()
public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String!
}

5
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java vendored
View File

@@ -2,12 +2,7 @@ package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
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")
@KotlinSignature("fun <A, B : Runnable<Int>> foo(a : A, b : List<B>) where B : List<Cloneable>")
public <A, B extends Runnable & List<Cloneable>> void foo(A a, List<? extends B> b) {
}
}

13
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java vendored
View File

@@ -1,13 +0,0 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
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")
@KotlinSignature("fun <A, B : Runnable> foo(a : A, b : List<B>) where B : List")
public <A, B extends Runnable & List<Cloneable>> void foo(A a, List<? extends B> b) {
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongTypeParameterBoundStructure2 {
public constructor WrongTypeParameterBoundStructure2()
public open fun </*0*/ A : kotlin.Any!, /*1*/ B : java.lang.Runnable!> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList<out B!>..kotlin.List<B!>?)): kotlin.Unit where B : kotlin.(Mutable)List<kotlin.Cloneable!>!
}

13
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java vendored
View File

@@ -1,13 +0,0 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeParametersCount {
@ExpectLoadError("Method signature has 2 type parameters, but alternative signature has 3")
@KotlinSignature("fun <A, B, C> foo(a : A, b : List<B>)")
public <A, B> void foo(A a, List<? extends B> b) {
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongTypeParametersCount {
public constructor WrongTypeParametersCount()
public open fun </*0*/ A : kotlin.Any!, /*1*/ B : kotlin.Any!> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList<out B!>..kotlin.List<B!>?)): kotlin.Unit
}

4
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java vendored
View File

@@ -1,12 +1,8 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
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")
@KotlinSignature("fun foo(a : String<Int?>, b : List<Map.Entry<String?, String>?>) : String")
public String foo(String a, List<Map.Entry<String, String>> b) {
throw new UnsupportedOperationException();
}

13
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java vendored
View File

@@ -1,13 +0,0 @@
package test;
import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
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")
@KotlinSignature("fun foo(a : String, b : List<Map.Entry<String?>?>) : String")
public String foo(String a, List<Map.Entry<String, String>> b) {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongValueParameterStructure2 {
public constructor WrongValueParameterStructure2()
public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List<kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
}

12
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java vendored
View File

@@ -1,12 +0,0 @@
package test;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
public class WrongValueParametersCount {
@ExpectLoadError("Method signature has 0 value parameters, but alternative signature has 1")
@KotlinSignature("fun foo(a : Int) : Int")
public Integer foo() {
throw new UnsupportedOperationException();
}
}

6
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt vendored
View File

@@ -1,6 +0,0 @@
package test
public open class WrongValueParametersCount {
public constructor WrongValueParametersCount()
public open fun foo(): kotlin.Int!
}