Generate field for const-val with same visibility as desciptor

Also add test checking that constant static final fields generated for them
This commit is contained in:
Denis Zharkov
2015-09-21 20:16:32 +03:00
parent ba6671edb4
commit d937a7cefc
8 changed files with 112 additions and 2 deletions
@@ -0,0 +1,47 @@
@file:JvmName("XYZ")
import java.lang.reflect.Modifier
private const val privateConst: Int = 1
public const val publicConst: Int = 3
public object A {
private const val privateConst: Int = 1
protected const val protectedConst: Int = 2
public const val publicConst: Int = 3
}
public class B {
companion object {
private const val privateConst: Int = 1
protected const val protectedConst: Int = 2
public const val publicConst: Int = 3
}
}
fun check(clazz: Class<*>, expectProtected: Boolean = true) {
val fields = clazz.declaredFields.filter { it.name.contains("Const") }
assert(fields.all { Modifier.isStatic(it.modifiers) }) { "`$clazz` contains non-static fields" }
assert(Modifier.isPrivate(fields.single { it.name.contains("private") }.modifiers)) {
"`$clazz`.privateConst is not private"
}
assert(Modifier.isPublic(fields.single { it.name.contains("public") }.modifiers)) {
"`$clazz`.publicConst is not public"
}
if (expectProtected) {
assert(Modifier.isProtected(fields.single { it.name.contains("protected") }.modifiers)) {
"`$clazz`.protectedConst is not protected"
}
}
}
fun box(): String {
check(A::class.java)
check(B::class.java)
check(Class.forName("XYZ"), false)
return "OK"
}
@@ -0,0 +1,6 @@
package test;
@Ann(ABC.TOP_LEVEL + A.OBJECT + B.COMPANION)
class Java {
}
@@ -0,0 +1,16 @@
@file:JvmName("ABC")
package test;
public const val TOP_LEVEL = "O"
public object A {
public const val OBJECT = "K"
}
public class B {
companion object {
public const val COMPANION = "56"
}
}
annotation class Ann(val value: String)
@@ -0,0 +1,26 @@
package test
public const val TOP_LEVEL: kotlin.String
public object A {
private constructor A()
public const final val OBJECT: kotlin.String
}
@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ kotlin.String)
public final val value: kotlin.String
}
public final class B {
public constructor B()
public companion object Companion {
private constructor Companion()
public const final val COMPANION: kotlin.String
}
}
@test.Ann(value = "OK56") public/*package*/ open class Java {
public/*package*/ constructor Java()
}