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

Fix expected FQ name in JavaTypeTest.nestedTypes

Browse Source
This commit is contained in:
Alexander Udalov
2020-06-17 19:47:45 +02:00
parent 2be94d9d2f
commit 650469024e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jvm/test/reflection/JavaTypeTest.kt
+3 -3
View File
@@ -263,7 +263,7 @@ class JavaTypeTest {
parameterized(nestedGenericType) { type -> parameterized(nestedGenericType) { type ->
assertEquals(listOf(IntRange::class.java), type.actualTypeArguments.toList()) assertEquals(listOf(IntRange::class.java), type.actualTypeArguments.toList())
assertEquals(T3::class.java, type.ownerType) assertEquals(T3::class.java, type.ownerType)
assertEquals("reflection.JavaTypeTest\$T3\$Nested<kotlin.ranges.IntRange>", type.typeName) assertEquals("test.reflection.JavaTypeTest\$T3\$Nested<kotlin.ranges.IntRange>", type.typeName)
} }
assertEqualsAndHashCode(javaTypeOf<T3.Nested<String>>(), javaTypeOf<T3.Nested<String>>()) assertEqualsAndHashCode(javaTypeOf<T3.Nested<String>>(), javaTypeOf<T3.Nested<String>>())
assertNotEquals(javaTypeOf<T3.Nested<String>>(), javaTypeOf<T3.Nested<Int>>()) assertNotEquals(javaTypeOf<T3.Nested<String>>(), javaTypeOf<T3.Nested<Int>>())
@@ -275,7 +275,7 @@ class JavaTypeTest {
parameterized(type.ownerType) { ownerType -> parameterized(type.ownerType) { ownerType ->
assertEquals(listOf(String::class.java, Unit::class.java), ownerType.actualTypeArguments.toList()) assertEquals(listOf(String::class.java, Unit::class.java), ownerType.actualTypeArguments.toList())
} }
assertEquals("reflection.JavaTypeTest\$T3<java.lang.String, kotlin.Unit>\$Inner<kotlin.ranges.IntRange>", type.typeName) assertEquals("test.reflection.JavaTypeTest\$T3<java.lang.String, kotlin.Unit>\$Inner<kotlin.ranges.IntRange>", type.typeName)
} }
assertEqualsAndHashCode(javaTypeOf<T3<String, Unit>.Inner<String>>(), javaTypeOf<T3<String, Unit>.Inner<String>>()) assertEqualsAndHashCode(javaTypeOf<T3<String, Unit>.Inner<String>>(), javaTypeOf<T3<String, Unit>.Inner<String>>())
assertNotEquals(javaTypeOf<T3<String, Unit>.Inner<String>>(), javaTypeOf<T3<String, Unit>.Inner<Int>>()) assertNotEquals(javaTypeOf<T3<String, Unit>.Inner<String>>(), javaTypeOf<T3<String, Unit>.Inner<Int>>())
@@ -296,7 +296,7 @@ class JavaTypeTest {
} }
} }
assertEquals( assertEquals(
"reflection.JavaTypeTest\$T3<java.lang.Object, java.lang.Integer>\$Inner<java.lang.Character>" + "test.reflection.JavaTypeTest\$T3<java.lang.Object, java.lang.Integer>\$Inner<java.lang.Character>" +
"\$NonGeneric\$DeepInner<java.lang.Byte, java.lang.Short>", deepInnerType.typeName "\$NonGeneric\$DeepInner<java.lang.Byte, java.lang.Short>", deepInnerType.typeName
) )
} }