From 92f3b759c0ad973d4277aef57a40d6a4deb3683f Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Mon, 11 Jan 2021 17:20:55 +0100
Subject: [PATCH] Fix codegen test data for genericTypeWithNothing.kt

 #KT-18367 Fixed

Co-authored-by: Zalim Bashorov <zalim.bashorov@jetbrains.com>
---
 .../codegen/box/typeMapping/genericTypeWithNothing.kt  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/testData/codegen/box/typeMapping/genericTypeWithNothing.kt b/compiler/testData/codegen/box/typeMapping/genericTypeWithNothing.kt
index 8cd253b338c..5dd6e1799db 100644
--- a/compiler/testData/codegen/box/typeMapping/genericTypeWithNothing.kt
+++ b/compiler/testData/codegen/box/typeMapping/genericTypeWithNothing.kt
@@ -57,28 +57,28 @@ fun testAllDeclaredMembers(klass: KClass<*>, expectedIsRaw: Boolean): String? {
     val clazz = klass.java
 
     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 (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
 }
 
 fun box(): String {
-    testAllDeclaredMembers(TestRaw::class, expectedIsRaw = true) ?:
+    testAllDeclaredMembers(TestRaw::class, expectedIsRaw = true)?.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 (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 }
 
     return "OK"