New J2K: Fix existing test data

j2k/testData/fileOrElement/nullability/FieldComparedWithNull.new.kt

@@ -0,0 +1,10 @@
+// ERROR: Unresolved reference: x
+internal class C {
+    private val s: String? = x()
+
+    fun foo() {
+        if (s == null) {
+            print("null")
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/IndirectOverride.new.kt

@@ -0,0 +1,8 @@
+import javaApi.Derived
+
+internal class C : Derived() {
+    override fun foo(s: String?): String? {
+
+        return s
+    }
+}

j2k/testData/fileOrElement/nullability/LocalValReassignment.new.kt

@@ -0,0 +1,30 @@
+internal class A {
+
+    /* rare nullable, handle with caution */
+    fun nullableString(): String? {
+        return if (Math.random() > 0.999) {
+            "a string"
+        } else null
+    }
+
+    fun takesNotNullString(s: String) {
+        println(s.substring(1))
+    }
+
+    fun aVoid() {
+        var aString: String?
+        if (nullableString() != null) {
+            aString = nullableString()
+            if (aString != null) {
+                for (i in 0..9) {
+                    takesNotNullString(aString!!) // Bang-bang here
+                    aString = nullableString()
+                }
+            } else {
+                aString = "aaa"
+            }
+        } else {
+            aString = "bbbb"
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.new.kt

@@ -0,0 +1,13 @@
+internal interface I {
+    val string: String?
+}
+
+internal class C {
+    fun foo(i: I, b: Boolean) {
+        var result = i.string
+        if (b) result = null
+        if (result != null) {
+            print(result)
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.new.kt

@@ -0,0 +1,15 @@
+// ERROR: Return type of 'get' is not a subtype of the return type of the overridden member 'public abstract fun get(): String defined in Getter'
+internal interface Getter {
+    fun get(): String?
+}
+
+internal class C {
+    fun foo(b: Boolean): String {
+        val getter: Getter = object : Getter {
+            override fun get(): String? {
+                return null
+            }
+        }
+        return ""
+    }
+}

j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.new.kt

@@ -0,0 +1,9 @@
+// ERROR: There's a cycle in the inheritance hierarchy for this type
+// ERROR: There's a cycle in the inheritance hierarchy for this type
+internal open class A : B() {
+    open fun foo(s: String?) {}
+}
+
+internal open class B : A() {
+    open fun foo(s: String?) {}
+}

j2k/testData/fileOrElement/nullability/Overrides.new.kt

@@ -0,0 +1,31 @@
+internal open class Base {
+    open fun foo(s: String?): String? {
+        return ""
+    }
+
+    open fun bar(s: String?): String? {
+        return if (s != null) s + 1 else null
+    }
+
+    open fun zoo(o: Any?): String {
+        return ""
+    }
+}
+
+internal interface I {
+    fun zoo(o: Any?): String?
+}
+
+internal class C : Base(), I {
+    override fun foo(s: String?): String? {
+        return ""
+    }
+
+    override fun bar(s: String?): String? {
+        return ""
+    }
+
+    override fun zoo(o: Any?): String {
+        return ""
+    }
+}

j2k/testData/fileOrElement/nullability/notNullCast.new.kt

@@ -0,0 +1,29 @@
+// ERROR: Type mismatch: inferred type is Passenger.PassChild? but Passenger.PassChild was expected
+// ERROR: Type mismatch: inferred type is Passenger.PassChild? but Passenger.PassChild was expected
+class Passenger {
+    open class PassParent
+
+    class PassChild : PassParent()
+
+    fun provideNullable(p: Int): PassParent? {
+        return if (p > 0) PassChild() else null
+    }
+
+    fun test1() {
+        val pass = provideNullable(1)!!
+        accept1(pass as PassChild)
+    }
+
+    fun test2() {
+        val pass = provideNullable(1)
+        if (1 == 2) {
+            assert(pass != null)
+            accept2(pass as PassChild?)
+        }
+        accept2(pass as PassChild?)
+    }
+
+    fun accept1(p: PassChild?) {}
+
+    fun accept2(p: PassChild?) {}
+}

j2k/testData/fileOrElement/nullability/nullableInitializer2.new.kt

@@ -0,0 +1,19 @@
+class TestJava {
+
+    var nullableInitializerFieldCast = nullableObj(3) as String?
+    private val nullableInitializerPrivateFieldCast = nullableObj(3) as String?
+    fun nullableObj(p: Int): Any? {
+        return if (p > 0) "response" else null
+    }
+
+    fun testProperty() {
+        nullableInitializerFieldCast!![0]
+        nullableInitializerPrivateFieldCast!![0]
+    }
+
+    fun testLocalVariable() {
+        val nullableInitializerValCast = nullableObj(3) as String?
+
+        nullableInitializerValCast!![0]
+    }
+}