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

annotation() now has no arguments. Syntax migration to Retention / Repeatable / MustBeDocumented combination

Browse Source 
Deprecated test for annotation(params) completion deleted. A lot of tests changed.
This commit is contained in:
Mikhail Glukhikh
2015-09-03 18:34:48 +03:00
committed by Mikhail Glukhikh
parent 86f35acf9e
commit eab288bdd7
99 changed files with 300 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt
Vendored
+4 -2
View File
@@ -1,8 +1,10 @@
// KT-5665
annotation(retention = AnnotationRetention.RUNTIME) class First
@Retention(AnnotationRetention.RUNTIME)
annotation class First
annotation(retention = AnnotationRetention.RUNTIME) class Second(val value: String)
@Retention(AnnotationRetention.RUNTIME)
annotation class Second(val value: String)
enum class E {
@First
compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt
Vendored
+2 -1
View File
@@ -1,7 +1,8 @@
import java.lang.reflect.Method
import kotlin.test.assertEquals
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val x: String)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(val x: String)
fun foo0(block: () -> Unit) = block.javaClass
fun foo1(block: (String) -> Unit) = block.javaClass
compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt
Vendored
+2 -1
View File
@@ -2,7 +2,8 @@ import java.lang.reflect.Method
import kotlin.test.assertEquals
target(AnnotationTarget.EXPRESSION)
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val x: String)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(val x: String)
fun foo0(block: () -> Unit) = block.javaClass
compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
import kotlin.test.assertEquals
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val x: Int)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(val x: Int)
class A {
Ann(1) fun foo(x: Int, y: Int = 2, z: Int) {}
compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
import kotlin.reflect.KClass
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val i: Int = 1,
val s: String = "a",
val a: Ann2 = Ann2(),
compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class First
@Retention(AnnotationRetention.RUNTIME)
annotation class First
class MyClass() {
public var x: String by Delegate()
compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt
Vendored
+2 -1
View File
@@ -15,7 +15,8 @@ fun box(): String {
return "OK"
}
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val i: Int,
val s: Short,
val f: Float,
compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt
Vendored
+2 -1
View File
@@ -15,7 +15,8 @@ fun box(): String {
return "OK"
}
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val i: Int,
val s: Short,
val f: Float,
compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt
Vendored
+2 -1
View File
@@ -7,7 +7,8 @@ fun box(): String {
return "OK"
}
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val i: Int)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(val i: Int)
class A {
class B {
compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val b: Byte,
val s: Short,
val i: Int,
compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt
Vendored
+2 -1
View File
@@ -7,7 +7,8 @@ fun box(): String {
return "OK"
}
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val i: Int)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(val i: Int)
val i2: Int = 1
val i: Int = i2
compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(vararg val p: Int)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(vararg val p: Int)
Ann() class MyClass1
Ann(1) class MyClass2
compiler/testData/codegen/boxWithStdlib/evaluate/char.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package test
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val c1: Int)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(val c1: Int)
Ann('a' - 'a') class MyClass
compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val b: Byte,
val s: Short,
val i: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/infixCallBinary.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Int,
val p2: Int,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Int,
val p2: Short,
val p3: Byte,
compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Int,
val p2: Int,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Int,
val p2: Byte,
val p4: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Int,
val p2: Int,
val p4: Long,
compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Int,
val p2: Int,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/reflection/annotations/annotationRetentionAnnotation.kt
Vendored
+6 -7
View File
@@ -1,15 +1,14 @@
import kotlin.test.assertEquals
annotation(retention = AnnotationRetention.RUNTIME) class Anno
@Retention(AnnotationRetention.RUNTIME)
annotation class Anno
fun box(): String {
val a = Anno::class.annotations
/*
// TODO: support kotlin.annotation.annotation
if (a.size() != 1) return "Fail 1: $a"
val ann = a.single() as? annotation ?: return "Fail 2: ${a.single()}"
assertEquals(AnnotationRetention.RUNTIME, ann.retention)
*/
assert(a.isEmpty())
val ann = a.single() as? Retention ?: return "Fail 2: ${a.single()}"
assertEquals(AnnotationRetention.RUNTIME, ann.value)
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/annotations/retentions.kt
Vendored
+8 -3
View File
@@ -1,8 +1,13 @@
import kotlin.test.assertEquals
annotation(retention = AnnotationRetention.SOURCE) class SourceAnno
annotation(retention = AnnotationRetention.BINARY) class BinaryAnno
annotation(retention = AnnotationRetention.RUNTIME) class RuntimeAnno
@Retention(AnnotationRetention.SOURCE)
annotation class SourceAnno
@Retention(AnnotationRetention.BINARY)
annotation class BinaryAnno
@Retention(AnnotationRetention.RUNTIME)
annotation class RuntimeAnno
@SourceAnno
@BinaryAnno
compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleClassAnnotation.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Simple(val value: String)
@Retention(AnnotationRetention.RUNTIME)
annotation class Simple(val value: String)
@Simple("OK")
class A
compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleFunAnnotation.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Simple(val value: String)
@Retention(AnnotationRetention.RUNTIME)
annotation class Simple(val value: String)
@Simple("OK")
fun box(): String {
compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleParamAnnotation.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Simple(val value: String)
@Retention(AnnotationRetention.RUNTIME)
annotation class Simple(val value: String)
fun test(@Simple("OK") x: Int) {}
compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleValAnnotation.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annotation(retention = AnnotationRetention.RUNTIME) class Simple(val value: String)
@Retention(AnnotationRetention.RUNTIME)
annotation class Simple(val value: String)
@property:Simple("OK")
val foo: Int = 0
compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/array.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KClass
annotation(retention = AnnotationRetention.RUNTIME)
class Ann(val args: Array<KClass<*>>)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(val args: Array<KClass<*>>)
class O
class K
compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/basic.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KClass
annotation(retention = AnnotationRetention.RUNTIME)
class Ann(val arg: KClass<*>)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(val arg: KClass<*>)
class OK
compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/vararg.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KClass
annotation(retention = AnnotationRetention.RUNTIME)
class Ann(vararg val args: KClass<*>)
@Retention(AnnotationRetention.RUNTIME)
annotation class Ann(vararg val args: KClass<*>)
class O
class K
compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
import java.lang.annotation.Annotation
annotation(retention = AnnotationRetention.RUNTIME) class foo(val name : String)
@Retention(AnnotationRetention.RUNTIME)
annotation class foo(val name : String)
class Test() {
foo("OK") fun hello(input : String) {