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

Fix codegen test data for genericTypeWithNothing.kt

Browse Source 
#KT-18367 Fixed

Co-authored-by: Zalim Bashorov <zalim.bashorov@jetbrains.com>
This commit is contained in:
Alexander Udalov
2021-01-11 17:20:55 +01:00
parent 0c0dbd6245
commit 92f3b759c0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/typeMapping/genericTypeWithNothing.kt
Vendored
+5 -5
View File
@@ -57,28 +57,28 @@ fun testAllDeclaredMembers(klass: KClass<*>, expectedIsRaw: Boolean): String? {
val clazz = klass.java val clazz = klass.java
for (it in clazz.declaredFields) { for (it in clazz.declaredFields) {
if ((it.type == it.genericType) == expectedIsRaw) return "failed on field '${clazz.simpleName}::${it.name}'" if ((it.type == it.genericType) != expectedIsRaw) return "failed on field '${clazz.simpleName}::${it.name}'"
} }
for (m in clazz.declaredMethods) { for (m in clazz.declaredMethods) {
for (i in m.parameterTypes.indices) { for (i in m.parameterTypes.indices) {
if ((m.parameterTypes[i] == m.genericParameterTypes[i]) == expectedIsRaw) return "failed on type of param#$i of method '${clazz.simpleName}::${m.name}'" if ((m.parameterTypes[i] == m.genericParameterTypes[i]) != expectedIsRaw) return "failed on type of param#$i of method '${clazz.simpleName}::${m.name}'"
} }
if (m.returnType != Void.TYPE && (m.returnType == m.genericReturnType) == expectedIsRaw) return "failed on return type of method '${clazz.simpleName}::${m.name}'" if (m.returnType != Void.TYPE && (m.returnType == m.genericReturnType) != expectedIsRaw) return "failed on return type of method '${clazz.simpleName}::${m.name}'"
} }
return null return null
} }
fun box(): String { fun box(): String {
testAllDeclaredMembers(TestRaw::class, expectedIsRaw = true) ?: testAllDeclaredMembers(TestRaw::class, expectedIsRaw = true)?.let { return it }
testAllDeclaredMembers(TestNotRaw::class, expectedIsRaw = false)?.let { return it } testAllDeclaredMembers(TestNotRaw::class, expectedIsRaw = false)?.let { return it }
if (C1::class.java.superclass != C1::class.java.genericSuperclass) return "failed on C1 superclass" if (C1::class.java.superclass != C1::class.java.genericSuperclass) return "failed on C1 superclass"
if (C2::class.java.superclass == C2::class.java.genericSuperclass) return "failed on C2 superclass" if (C2::class.java.superclass == C2::class.java.genericSuperclass) return "failed on C2 superclass"
testAllDeclaredMembers(C1::class, expectedIsRaw = true) ?: testAllDeclaredMembers(C1::class, expectedIsRaw = true)?.let { return it }
testAllDeclaredMembers(C2::class, expectedIsRaw = false)?.let { return it } testAllDeclaredMembers(C2::class, expectedIsRaw = false)?.let { return it }
return "OK" return "OK"