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

Fix test in JDK independent way

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-10-18 15:43:18 +02:00
parent a4206a543a
commit ce1d6e7217
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/dataClasses/typeParameterWithNonTrivialBound.kt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ fun box(): String {
if (b1.hashCode() == b2.hashCode()) return "Fail 1" if (b1.hashCode() == b2.hashCode()) return "Fail 1"
if (b1.equals(b2)) return "Fail 2" if (b1.equals(b2)) return "Fail 2"
val anno = C::class.java.annotations.first() as Anno val anno = C::class.java.annotations.filterIsInstance<Anno>().first()
val c1 = C(anno) val c1 = C(anno)
val c2 = C(anno) val c2 = C(anno)
if (c1.hashCode() != c2.hashCode()) return "Fail 3" if (c1.hashCode() != c2.hashCode()) return "Fail 3"
compiler/testData/codegen/box/reflection/annotations/annotationsOnJavaMembers.kt
Vendored
+8 -7
View File
@@ -1,7 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND: JS_IR // TARGET_BACKEND: JVM
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE
// WITH_REFLECT // WITH_REFLECT
// FILE: J.java // FILE: J.java
@@ -21,14 +19,17 @@ public class J {
// FILE: K.kt // FILE: K.kt
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.reflect.KAnnotatedElement
annotation class Anno(val value: String) annotation class Anno(val value: String)
fun box(): String { fun box(): String {
assertEquals("[@Anno(value=J)]", J::class.annotations.toString()) assertEquals("J", getSingleAnnoAnnotation(J::class).value)
assertEquals("[@Anno(value=foo)]", J::foo.annotations.toString()) assertEquals("foo", getSingleAnnoAnnotation(J::foo).value)
assertEquals("[@Anno(value=bar)]", J::bar.annotations.toString()) assertEquals("bar", getSingleAnnoAnnotation(J::bar).value)
assertEquals("[@Anno(value=constructor)]", ::J.annotations.toString()) assertEquals("constructor", getSingleAnnoAnnotation(::J).value)
return "OK" return "OK"
} }
fun getSingleAnnoAnnotation(annotated: KAnnotatedElement): Anno = annotated.annotations.single() as Anno