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

Minor, split and clean tests

Browse Source 
Tests that are using javaClass supposed to be deleted soon
while other ones just check that annotation loaded correctly
and shold use class literals
This commit is contained in:
Denis Zharkov
2015-04-17 17:30:48 +03:00
parent 7a02bdae23
commit 482b4e3688
7 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.kt
+2 -2
View File
@@ -12,11 +12,11 @@ public @interface A {
[A(*array("5", "6"), "7", y = 3)] fun test3() {}
[A("1", "2", "3", x = javaClass<String>(), y = 4)] fun test4() {}
[A("1", "2", "3", x = String::class, y = 4)] fun test4() {}
[A("4", y = 5)] fun test5() {}
[A(*array("5", "6"), "7", x = javaClass<Any>(), y = 6)] fun test6() {}
[A(*array("5", "6"), "7", x = Any::class, y = 6)] fun test6() {}
[A(y = 7)] fun test7() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt
+2 -2
View File
@@ -3,9 +3,9 @@ package
A(value = {"1", "2", "3"}: kotlin.Array<out kotlin.String>, y = IntegerValueType(1): IntegerValueType(1)) internal fun test1(): kotlin.Unit
A(value = {"4"}: kotlin.Array<out kotlin.String>, y = IntegerValueType(2): IntegerValueType(2)) internal fun test2(): kotlin.Unit
A(value = {{"5", "6"}, "7"}: kotlin.Array<out kotlin.String>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test3(): kotlin.Unit
A(value = {"1", "2", "3"}: kotlin.Array<out kotlin.String>, x = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, y = IntegerValueType(4): IntegerValueType(4)) internal fun test4(): kotlin.Unit
A(value = {"1", "2", "3"}: kotlin.Array<out kotlin.String>, x = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, y = IntegerValueType(4): IntegerValueType(4)) internal fun test4(): kotlin.Unit
A(value = {"4"}: kotlin.Array<out kotlin.String>, y = IntegerValueType(5): IntegerValueType(5)) internal fun test5(): kotlin.Unit
A(value = {{"5", "6"}, "7"}: kotlin.Array<out kotlin.String>, x = javaClass<kotlin.Any>(): java.lang.Class<kotlin.Any>, y = IntegerValueType(6): IntegerValueType(6)) internal fun test6(): kotlin.Unit
A(value = {{"5", "6"}, "7"}: kotlin.Array<out kotlin.String>, x = kotlin.Any::class: kotlin.reflect.KClass<kotlin.Any>, y = IntegerValueType(6): IntegerValueType(6)) internal fun test6(): kotlin.Unit
A(value = {}: kotlin.Array<out kotlin.String>, y = IntegerValueType(7): IntegerValueType(7)) internal fun test7(): kotlin.Unit
A(value = {"8", "9", "10"}: kotlin.Array<out kotlin.String>) internal fun test8(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt
+5 -5
View File
@@ -12,16 +12,16 @@ public @interface A {
[A(*array("5", "6"), "7")] fun test3() {}
[A("1", "2", "3", x = javaClass<String>())] fun test4() {}
[A("1", "2", "3", x = String::class)] fun test4() {}
[A("4", y = 2)] fun test5() {}
[A(*array("5", "6"), "7", x = javaClass<Any>(), y = 3)] fun test6() {}
[A(*array("5", "6"), "7", x = Any::class, y = 3)] fun test6() {}
[A()] fun test7() {}
[A] fun test8() {}
[A(x = <!TYPE_MISMATCH(kotlin.reflect.KClass<*>; java.lang.Class<kotlin.Any>)!>javaClass<Any>()<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>*array("5", "6")<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3)] fun test9() {}
[A(x = <!TYPE_MISMATCH(kotlin.reflect.KClass<*>; java.lang.Class<kotlin.Any>)!>javaClass<Any>()<!>, value = *array("5", "6"), <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3)] fun test10() {}
[A(x = javaClass<Any>(), value = *array("5", "6", "7"), y = 3)] fun test11() {}
[A(x = Any::class, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>*array("5", "6")<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3)] fun test9() {}
[A(x = Any::class, value = *array("5", "6"), <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3)] fun test10() {}
[A(x = Any::class, value = *array("5", "6", "7"), y = 3)] fun test11() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt
+5 -5
View File
@@ -1,16 +1,16 @@
package
A(value = {"1", "2", "3"}: kotlin.Array<out kotlin.String>) internal fun test1(): kotlin.Unit
A(value = {"5", "6"}: kotlin.Array<kotlin.String>, x = javaClass<kotlin.Any>(): java.lang.Class<kotlin.Any>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test10(): kotlin.Unit
A(value = {"5", "6", "7"}: kotlin.Array<kotlin.String>, x = javaClass<kotlin.Any>(): java.lang.Class<kotlin.Any>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test11(): kotlin.Unit
A(value = {"5", "6"}: kotlin.Array<kotlin.String>, x = kotlin.Any::class: kotlin.reflect.KClass<kotlin.Any>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test10(): kotlin.Unit
A(value = {"5", "6", "7"}: kotlin.Array<kotlin.String>, x = kotlin.Any::class: kotlin.reflect.KClass<kotlin.Any>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test11(): kotlin.Unit
A(value = {"4"}: kotlin.Array<out kotlin.String>) internal fun test2(): kotlin.Unit
A(value = {{"5", "6"}, "7"}: kotlin.Array<out kotlin.String>) internal fun test3(): kotlin.Unit
A(value = {"1", "2", "3"}: kotlin.Array<out kotlin.String>, x = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal fun test4(): kotlin.Unit
A(value = {"1", "2", "3"}: kotlin.Array<out kotlin.String>, x = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal fun test4(): kotlin.Unit
A(value = {"4"}: kotlin.Array<out kotlin.String>, y = IntegerValueType(2): IntegerValueType(2)) internal fun test5(): kotlin.Unit
A(value = {{"5", "6"}, "7"}: kotlin.Array<out kotlin.String>, x = javaClass<kotlin.Any>(): java.lang.Class<kotlin.Any>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test6(): kotlin.Unit
A(value = {{"5", "6"}, "7"}: kotlin.Array<out kotlin.String>, x = kotlin.Any::class: kotlin.reflect.KClass<kotlin.Any>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test6(): kotlin.Unit
A(value = {}: kotlin.Array<out kotlin.String>) internal fun test7(): kotlin.Unit
A(value = {}: kotlin.Array<out kotlin.String>) internal fun test8(): kotlin.Unit
A(value = {}: kotlin.Array<out kotlin.String>, x = javaClass<kotlin.Any>(): java.lang.Class<kotlin.Any>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test9(): kotlin.Unit
A(value = {}: kotlin.Array<out kotlin.String>, x = kotlin.Any::class: kotlin.reflect.KClass<kotlin.Any>, y = IntegerValueType(3): IntegerValueType(3)) internal fun test9(): kotlin.Unit
public final annotation class A : kotlin.Annotation {
public /*synthesized*/ constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/, /*1*/ x: java.lang.Class<*> = ..., /*2*/ y: kotlin.Int = ...)
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.kt
+8
View File
@@ -0,0 +1,8 @@
// FILE: A.java
public @interface A {
Class<?> x() default Integer.class;
int y();
}
// FILE: b.kt
[A(x = <!TYPE_MISMATCH(kotlin.reflect.KClass<*>; java.lang.Class<kotlin.Any>)!>javaClass<Any>()<!>, y = <!TYPE_MISMATCH!>""<!>)] fun test1() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.txt
+13
View File
@@ -0,0 +1,13 @@
package
A(x = javaClass<kotlin.Any>(): java.lang.Class<kotlin.Any>, y = "": kotlin.String) internal fun test1(): kotlin.Unit
public final annotation class A : kotlin.Annotation {
public /*synthesized*/ constructor A(/*0*/ x: java.lang.Class<*> = ..., /*1*/ y: kotlin.Int)
public constructor A(/*0*/ x: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun x(): kotlin.reflect.KClass<*>
public abstract fun y(): kotlin.Int
}