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

Drop loading Java annotation methods as functions

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-15 16:27:11 +03:00
parent 25b40455ad
commit 9ae3b0fa9c
81 changed files with 30 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt
Vendored
+4 -4
View File
@@ -5,21 +5,21 @@
fun box(): String {
val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value()
val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
if (value1.size() != 2) return "fail1: ${value1.size()}"
if (value1[0] != "d1") return "fail2: ${value1[0]}"
if (value1[1] != "d2") return "fail3: ${value1[1]}"
val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value()
val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
if (value2.size() != 2) return "fail4: ${value2.size()}"
if (value2[0] != "d1") return "fail5: ${value2[0]}"
if (value2[1] != "d2") return "fail6: ${value2[1]}"
val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value()
val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
if (value3.size() != 1) return "fail7: ${value3.size()}"
if (value3[0] != "asd") return "fail8: ${value3[0]}"
val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value()
val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
if (value4.size() != 0) return "fail 9: ${value4.size()}"
return "OK"
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt
Vendored
+4 -4
View File
@@ -5,17 +5,17 @@
fun box(): String {
val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value()
val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
if (value1.size() != 0) return "fail1: ${value1.size()}"
val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value()
val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
if (value2.size() != 0) return "fail2: ${value2.size()}"
val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value()
val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
if (value3.size() != 1) return "fail3: ${value3.size()}"
if (value3[0] != "asd") return "fail4: ${value3[0]}"
val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value()
val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
if (value4.size() != 0) return "fail 5: ${value4.size()}"
return "OK"
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationCall.kt
Vendored
+1 -1
View File
@@ -3,6 +3,6 @@
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.value() != "value") return "fail: annotation parameter i should be 'value', but was ${ann.value()}"
if (ann.value != "value") return "fail: annotation parameter i should be 'value', but was ${ann.value}"
return "OK"
}
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationDefault.kt
Vendored
+8 -8
View File
@@ -4,17 +4,17 @@
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
if (ann == null) return "fail: cannot find Ann on MyClass}"
if (ann.value() != "default") return "fail: annotation parameter i should be 'default', but was ${ann.value()}"
if (ann.value != "default") return "fail: annotation parameter i should be 'default', but was ${ann.value}"
val ann2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn2>())
if (ann2 == null) return "fail: cannot find Ann on MyClass}"
if (ann2.a() != 1) return "fail for a: expected = 1, but was ${ann2.a()}"
if (ann2.b() != 1.toByte()) return "fail for b: expected = 1, but was ${ann2.b()}"
if (ann2.c() != 1.toShort()) return "fail for c: expected = 1, but was ${ann2.c()}"
if (ann2.d() != 1.0) return "fail for d: expected = 1, but was ${ann2.d()}"
if (ann2.e() != 1F) return "fail for e: expected = 1, but was ${ann2.e()}"
if (ann2.j() != 1L) return "fail for j: expected = 1, but was ${ann2.j()}"
if (ann2.f() != "default") return "fail for f: expected = default, but was ${ann2.f()}"
if (ann2.a != 1) return "fail for a: expected = 1, but was ${ann2.a}"
if (ann2.b != 1.toByte()) return "fail for b: expected = 1, but was ${ann2.b}"
if (ann2.c != 1.toShort()) return "fail for c: expected = 1, but was ${ann2.c}"
if (ann2.d != 1.0) return "fail for d: expected = 1, but was ${ann2.d}"
if (ann2.e != 1F) return "fail for e: expected = 1, but was ${ann2.e}"
if (ann2.j != 1L) return "fail for j: expected = 1, but was ${ann2.j}"
if (ann2.f != "default") return "fail for f: expected = default, but was ${ann2.f}"
return "OK"
}
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class K
@JavaAnn(args = arrayOf(O::class, K::class)) class MyClass
fun box(): String {
val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).args()
val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
fun box(): String {
val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).args()
val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameter.kt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ class OK
fun box(): String {
val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
if (ann == null) return "fail: cannot find JavaAnn on MyClass"
return ann.value().simpleName!!
return ann.value.simpleName!!
}
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@
fun box(): String {
val ann = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>())
if (ann == null) return "fail: cannot find JavaAnn on MyClass"
return ann.value().simpleName!!
return ann.value.simpleName!!
}
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameter.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class K
@JavaAnn(O::class, K::class) class MyClass
fun box(): String {
val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).value()
val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).value
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2
compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameterOnJavaClass.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ class O
class K
fun box(): String {
val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).value()
val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).value
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
return argName1 + argName2