Do not include kotlin-reflect at runtime by default in codegen tests

Change some tests to either include reflection or to avoid using it
This commit is contained in:
Alexander Udalov
2016-03-05 23:55:09 +03:00
committed by Alexander Udalov
parent 20e36438e2
commit 2564a2f91f
20 changed files with 37 additions and 24 deletions
@@ -1,3 +1,5 @@
// WITH_REFLECT
import kotlin.reflect.KProperty
class Delegate {
@@ -17,7 +17,7 @@ class K
fun box(): String {
val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
val argName1 = args[0].java.simpleName ?: "fail 1"
val argName2 = args[1].java.simpleName ?: "fail 2"
return argName1 + argName2
}
@@ -20,7 +20,7 @@ class MyJavaClass {}
fun box(): String {
val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).args
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
val argName1 = args[0].java.simpleName ?: "fail 1"
val argName2 = args[1].java.simpleName ?: "fail 2"
return argName1 + argName2
}
@@ -17,5 +17,5 @@ class OK
fun box(): String {
val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find JavaAnn on MyClass"
return ann.value.simpleName!!
return ann.value.java.simpleName!!
}
@@ -20,5 +20,5 @@ class MyJavaClass {}
fun box(): String {
val ann = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java)
if (ann == null) return "fail: cannot find JavaAnn on MyClass"
return ann.value.simpleName!!
return ann.value.java.simpleName!!
}
@@ -17,7 +17,7 @@ class K
fun box(): String {
val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).value
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
val argName1 = args[0].java.simpleName ?: "fail 1"
val argName2 = args[1].java.simpleName ?: "fail 2"
return argName1 + argName2
}
@@ -23,7 +23,7 @@ class K
fun box(): String {
val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).value
val argName1 = args[0].simpleName ?: "fail 1"
val argName2 = args[1].simpleName ?: "fail 2"
val argName1 = args[0].java.simpleName ?: "fail 1"
val argName2 = args[1].java.simpleName ?: "fail 2"
return argName1 + argName2
}
@@ -1,3 +1,4 @@
// WITH_REFLECT
// FILE: J.java
public class J {
@@ -1,3 +1,4 @@
// WITH_REFLECT
// FILE: J.java
public class J {
@@ -1,3 +1,5 @@
// WITH_REFLECT
// FULL_JDK
// FILE: J.java
public class J {
@@ -11,7 +13,6 @@ public class J {
}
// FILE: 1.kt
// FULL_JDK
import java.lang.reflect.*
import kotlin.reflect.*
@@ -1,3 +1,4 @@
// WITH_REFLECT
// FILE: J.java
public class J {
@@ -1,3 +1,4 @@
// WITH_REFLECT
// FILE: test/J.java
package test;
@@ -2,7 +2,7 @@
package test
inline fun <reified T> className() = T::class.simpleName
inline fun <reified T : Any> className() = T::class.java.simpleName
// FILE: 2.kt
@@ -1,3 +1,4 @@
// WITH_REFLECT
// FILE: J.java
import java.util.List;
@@ -1,3 +1,5 @@
import kotlin.reflect.KMutableProperty1
class A {
class B(val result: String)
@@ -8,9 +10,11 @@ class A {
fun box(): String {
val a = A()
(A::q).set(a, arrayOf(arrayOf(A.B("array"))))
val aq = A::class.members.single { it.name == "q" } as KMutableProperty1<A, Array<Array<A.B>>>
aq.set(a, arrayOf(arrayOf(A.B("array"))))
if (a.q!![0][0].result != "array") return "Fail array"
(A::p).set(a, A.B("OK"))
val ap = A::class.members.single { it.name == "p" } as KMutableProperty1<A, A.B>
ap.set(a, A.B("OK"))
return a.p!!.result
}