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

Replace annotations with brackets in testData

Browse Source 
Just in tests that changed after deprecation
This commit is contained in:
Denis Zharkov
2015-05-06 14:58:59 +03:00
parent 5bc7c9600f
commit 849b8acbf8
87 changed files with 224 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt
+4 -4
View File
@@ -1,14 +1,14 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
import kotlin.platform.*
[<!ILLEGAL_PLATFORM_NAME!>platformName("")<!>]
<!ILLEGAL_PLATFORM_NAME!>@platformName("")<!>
fun foo(a: Any) {}
[<!ILLEGAL_PLATFORM_NAME!>platformName(".")<!>]
<!ILLEGAL_PLATFORM_NAME!>@platformName(".")<!>
fun foo() {}
[<!ILLEGAL_PLATFORM_NAME!>platformName("/")<!>]
<!ILLEGAL_PLATFORM_NAME!>@platformName("/")<!>
fun fooSlash() {}
[<!ILLEGAL_PLATFORM_NAME!>platformName("<")<!>]
<!ILLEGAL_PLATFORM_NAME!>@platformName("<")<!>
fun fooLT() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt
+19 -19
View File
@@ -2,66 +2,66 @@
import kotlin.platform.*
[platformName("a")]
@platformName("a")
fun foo() {}
[platformName("b")]
@platformName("b")
fun Any.foo() {}
[<!INAPPLICABLE_ANNOTATION!>platformName("c")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("c")<!>
val px = 1
[<!INAPPLICABLE_ANNOTATION!>platformName("d")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("d")<!>
val Any.px : Int
get() = 1
val valx: Int
[platformName("e")]
@platformName("e")
get() = 1
var varx: Int
[platformName("f")]
@platformName("f")
get() = 1
[platformName("g")]
@platformName("g")
set(v) {}
var vardef: Int = 1
[platformName("h")]
@platformName("h")
get
[platformName("i")]
@platformName("i")
set
[<!INAPPLICABLE_ANNOTATION!>platformName("C")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("C")<!>
class C [<!INAPPLICABLE_ANNOTATION!>platformName("primary")<!>]() {
<!INAPPLICABLE_ANNOTATION!>platformName("ctr")<!> constructor(x: Int): this() {}
[<!INAPPLICABLE_ANNOTATION!>platformName("a")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("a")<!>
fun foo() {}
[<!INAPPLICABLE_ANNOTATION!>platformName("b")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("b")<!>
fun Any.foo() {}
[<!INAPPLICABLE_ANNOTATION!>platformName("c")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("c")<!>
val px = 1
[<!INAPPLICABLE_ANNOTATION!>platformName("d")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("d")<!>
val Any.px : Int
get() = 1
val valx: Int
[<!INAPPLICABLE_ANNOTATION!>platformName("e")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("e")<!>
get() = 1
var varx: Int
[<!INAPPLICABLE_ANNOTATION!>platformName("f")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("f")<!>
get() = 1
[<!INAPPLICABLE_ANNOTATION!>platformName("g")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("g")<!>
set(v) {}
}
fun foo1() {
[<!INAPPLICABLE_ANNOTATION!>platformName("a")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("a")<!>
fun foo() {}
[<!INAPPLICABLE_ANNOTATION!>platformName("a")<!>]
<!INAPPLICABLE_ANNOTATION!>@platformName("a")<!>
val x = 1
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.kt
+8 -8
View File
@@ -6,18 +6,18 @@ public @interface A {
}
// FILE: b.kt
[A("1", "2", "3", y = 1)] fun test1() {}
@A("1", "2", "3", y = 1) fun test1() {}
[A("4", y = 2)] fun test2() {}
@A("4", y = 2) fun test2() {}
[A(*arrayOf("5", "6"), "7", y = 3)] fun test3() {}
@A(*arrayOf("5", "6"), "7", y = 3) fun test3() {}
[A("1", "2", "3", x = String::class, y = 4)] fun test4() {}
@A("1", "2", "3", x = String::class, y = 4) fun test4() {}
[A("4", y = 5)] fun test5() {}
@A("4", y = 5) fun test5() {}
[A(*arrayOf("5", "6"), "7", x = Any::class, y = 6)] fun test6() {}
@A(*arrayOf("5", "6"), "7", x = Any::class, y = 6) fun test6() {}
[A(y = 7)] fun test7() {}
@A(y = 7) fun test7() {}
[A("8", "9", "10"<!NO_VALUE_FOR_PARAMETER!>)<!>] fun test8() {}
@A("8", "9", "10"<!NO_VALUE_FOR_PARAMETER!>)<!> fun test8() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt
+11 -11
View File
@@ -6,22 +6,22 @@ public @interface A {
}
// FILE: b.kt
[A("1", "2", "3")] fun test1() {}
@A("1", "2", "3") fun test1() {}
[A("4")] fun test2() {}
@A("4") fun test2() {}
[A(*arrayOf("5", "6"), "7")] fun test3() {}
@A(*arrayOf("5", "6"), "7") fun test3() {}
[A("1", "2", "3", x = String::class)] fun test4() {}
@A("1", "2", "3", x = String::class) fun test4() {}
[A("4", y = 2)] fun test5() {}
@A("4", y = 2) fun test5() {}
[A(*arrayOf("5", "6"), "7", x = Any::class, y = 3)] fun test6() {}
@A(*arrayOf("5", "6"), "7", x = Any::class, y = 3) fun test6() {}
[A()] fun test7() {}
@A() fun test7() {}
[A] fun test8() {}
@A fun test8() {}
[A(x = Any::class, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>*arrayOf("5", "6")<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3)] fun test9() {}
[A(x = Any::class, value = *arrayOf("5", "6"), <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3)] fun test10() {}
[A(x = Any::class, value = *arrayOf("5", "6", "7"), y = 3)] fun test11() {}
@A(x = Any::class, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>*arrayOf("5", "6")<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3) fun test9() {}
@A(x = Any::class, value = *arrayOf("5", "6"), <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3) fun test10() {}
@A(x = Any::class, value = *arrayOf("5", "6", "7"), y = 3) fun test11() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.kt
+1 -1
View File
@@ -5,4 +5,4 @@ public @interface A {
}
// FILE: b.kt
[A(x = <!TYPE_MISMATCH(kotlin.reflect.KClass<*>; java.lang.Class<kotlin.Any>)!>javaClass<Any>()<!>, y = <!TYPE_MISMATCH!>""<!>)] fun test1() {}
@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/valueArrayOnly.kt
+5 -5
View File
@@ -4,12 +4,12 @@ public @interface A {
}
// FILE: b.kt
[A("1", "2", "3")] fun test1() {}
@A("1", "2", "3") fun test1() {}
[A("4")] fun test2() {}
@A("4") fun test2() {}
[A(*arrayOf("5", "6"), "7")] fun test3() {}
@A(*arrayOf("5", "6"), "7") fun test3() {}
[A()] fun test4() {}
@A() fun test4() {}
[A] fun test5() {}
@A fun test5() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.kt
+5 -5
View File
@@ -4,12 +4,12 @@ public @interface A {
}
// FILE: b.kt
[A("1", "2", "3")] fun test1() {}
@A("1", "2", "3") fun test1() {}
[A("4")] fun test2() {}
@A("4") fun test2() {}
[A(*arrayOf("5", "6"), "7")] fun test3() {}
@A(*arrayOf("5", "6"), "7") fun test3() {}
[A()] fun test4() {}
@A() fun test4() {}
[A] fun test5() {}
@A fun test5() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
+1 -1
View File
@@ -4,6 +4,6 @@ public @interface A {
}
// FILE: b.kt
[A(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH(kotlin.Array<out kotlin.String>; IGNORE)!>arrayOf<!>(1, "b"))]
@A(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH(kotlin.Array<out kotlin.String>; IGNORE)!>arrayOf<!>(1, "b"))
fun test() {
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
+1 -1
View File
@@ -1,5 +1,5 @@
annotation class B(vararg val args: String)
[B(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH(kotlin.Array<out kotlin.String>; IGNORE)!>arrayOf<!>(1, "b"))]
@B(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH(kotlin.Array<out kotlin.String>; IGNORE)!>arrayOf<!>(1, "b"))
fun test() {
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt
+2 -2
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>[kotlin.jvm.overloads] constructor()<!> {
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>@kotlin.jvm.overloads constructor()<!> {
}
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>[kotlin.jvm.overloads] fun foo(s: String)<!> {}
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>@kotlin.jvm.overloads fun foo(s: String)<!> {}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.kt
+2 -2
View File
@@ -1,8 +1,8 @@
trait T {
<!OVERLOADS_ABSTRACT!>[kotlin.jvm.overloads] fun foo(s: String = "OK")<!>
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.overloads fun foo(s: String = "OK")<!>
}
abstract class C {
<!OVERLOADS_ABSTRACT!>[kotlin.jvm.overloads] abstract fun foo(s: String = "OK")<!>
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.overloads abstract fun foo(s: String = "OK")<!>
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.kt
+4 -4
View File
@@ -1,20 +1,20 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!OVERLOADS_PRIVATE!>[kotlin.jvm.overloads] private fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.overloads private fun foo(s: String = "OK")<!> {
}
[kotlin.jvm.overloads] fun bar(s: String = "OK") {
@kotlin.jvm.overloads fun bar(s: String = "OK") {
}
}
fun foo() {
class D {
<!OVERLOADS_PRIVATE!>[kotlin.jvm.overloads] fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.overloads fun foo(s: String = "OK")<!> {
}
}
val <!UNUSED_VARIABLE!>x<!> = object {
<!OVERLOADS_PRIVATE!>[kotlin.jvm.overloads] fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.overloads fun foo(s: String = "OK")<!> {
}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt
+8 -8
View File
@@ -12,24 +12,24 @@ abstract class A {
object B: A() {
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] final override fun c()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic final override fun c()<!> {}
[platformStatic] open fun d() {}
@platformStatic open fun d() {}
}
class C {
companion object: A() {
[platformStatic] override fun a() {}
@platformStatic override fun a() {}
[platformStatic] override fun b() {}
@platformStatic override fun b() {}
[platformStatic] final override fun c() {}
@platformStatic final override fun c() {}
[platformStatic] open fun d() {}
@platformStatic open fun d() {}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt
+1 -1
View File
@@ -2,7 +2,7 @@
import kotlin.platform.platformStatic
fun main(args: Array<String>) {
<!PLATFORM_STATIC_NOT_IN_OBJECT!>[platformStatic] fun a()<!>{
<!PLATFORM_STATIC_NOT_IN_OBJECT!>@platformStatic fun a()<!>{
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt
+10 -10
View File
@@ -9,38 +9,38 @@ open class B {
class A {
companion object : B() {
var p1:Int = 1
[platformStatic] set(p: Int) {
@platformStatic set(p: Int) {
p1 = 1
}
[platformStatic] val z = 1;
@platformStatic val z = 1;
[platformStatic] override val base1: Int = 0
@platformStatic override val base1: Int = 0
override val base2: Int = 0
[platformStatic] get
@platformStatic get
}
object A : B() {
var p:Int = 1
[platformStatic] set(p1: Int) {
@platformStatic set(p1: Int) {
p = 1
}
[platformStatic] val z = 1;
@platformStatic val z = 1;
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] override val base1: Int<!> = 0
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic override val base1: Int<!> = 0
platformStatic open fun f() {}
override val base2: Int = 0
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] get<!>
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic get<!>
}
var p:Int = 1
<!PLATFORM_STATIC_NOT_IN_OBJECT!>[platformStatic] set(p1: Int)<!> {
<!PLATFORM_STATIC_NOT_IN_OBJECT!>@platformStatic set(p1: Int)<!> {
p = 1
}
<!PLATFORM_STATIC_NOT_IN_OBJECT!>[platformStatic] val z2<!> = 1;
<!PLATFORM_STATIC_NOT_IN_OBJECT!>@platformStatic val z2<!> = 1;
}