New J2K: Fix existing test data

j2k/testData/fileOrElement/detectProperties/AssignFieldInsideSetter2.new.kt

@@ -0,0 +1,12 @@
+class C {
+    var x = ""
+        internal
+        set(x) {
+            println("setter invoked")
+            if (other != null) {
+                other!!.x = x
+            }
+            field = x
+        }
+    internal var other: C? = null
+}

j2k/testData/fileOrElement/detectProperties/DataClass.new.kt

@@ -1,4 +1,4 @@
-class Test(var id: String?, val name: String?, val age: Int) {
+class Test(var id: String, val name: String, val age: Int) {
 
     init {
         println(age)

j2k/testData/fileOrElement/detectProperties/DataClassWithAnnotations.new.kt

@@ -1,3 +1,3 @@
 internal annotation class TestAnnotation
 
-class Test(@field:TestAnnotation @set:TestAnnotation @get:TestAnnotation @param:TestAnnotation var arg: String?)
+class Test(@field:TestAnnotation @set:TestAnnotation @get:TestAnnotation @param:TestAnnotation var arg: String)

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect1.new.kt

@@ -1,7 +1,7 @@
 class C {
-    private var myX: String? = ""
+    private var myX = ""
 
-    var x: String?
+    var x: String
         get() {
             println("getter invoked")
             return myX

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect2.new.kt

@@ -1,12 +1,12 @@
 class C {
-    private var x: String? = ""
+    private var x = ""
 
-    fun getX(): String? {
+    fun getX(): String {
         println("getter invoked")
         return x
     }
 
-    fun setX(x: String?) {
+    fun setX(x: String) {
         this.x = x
     }
 

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect3.new.kt

@@ -1,12 +1,12 @@
 class C {
-    var x: String? = ""
+    var x = ""
 
-    fun getX(): String? {
+    fun getX(): String {
         println("getter invoked")
         return x
     }
 
-    fun setX(x: String?) {
+    fun setX(x: String) {
         this.x = x
     }
 }

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect4.new.kt

@@ -1,5 +1,5 @@
 class C {
-    var x: String? = ""
+    var x = ""
         get() {
             println("getter invoked")
             return field

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect5.new.kt

@@ -1,7 +0,0 @@
-class C {
-    var x: String? = ""
-        get() {
-            println("getter invoked")
-            return field
-        }
-}

j2k/testData/fileOrElement/detectProperties/PropertyType.new.kt

@@ -1,17 +1,16 @@
 internal class A {
-    private val list1: ArrayList<String?> = ArrayList()
-    private val list2: MutableList<String?> = ArrayList()
-    private val myList3: MutableList<String?> = ArrayList()
-
-    fun getList1(): List<String?>? {
+    private val list1: ArrayList<String> = ArrayList()
+    private val list2: MutableList<String> = ArrayList()
+    private val myList3: MutableList<String> = ArrayList()
+    fun getList1(): List<String> {
         return list1
     }
 
-    fun getList2(): List<String?>? {
+    fun getList2(): List<String> {
         return list2
     }
 
-    val list3: List<String?>?
+    val list3: List<String>
         get() = myList3
 
     fun foo() {

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect1.new.kt

@@ -1,7 +1,7 @@
 class C {
-    private var myX: String? = ""
+    private var myX = ""
 
-    var x: String?
+    var x: String
         get() = myX
         set(x) {
             println("setter invoked")

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect2.new.kt

@@ -1,11 +1,11 @@
 class C {
-    private var x: String? = ""
+    private var x = ""
 
-    fun getX(): String? {
+    fun getX(): String {
         return x
     }
 
-    fun setX(x: String?) {
+    fun setX(x: String) {
         println("setter invoked")
         this.x = x
     }

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect4.new.kt

@@ -1,5 +1,5 @@
 class C {
-    var x: String? = ""
+    var x = ""
         set(value) {
             println("setter invoked")
             field = value

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect5.new.kt

@@ -1,5 +1,5 @@
 class C {
-    var x: String? = ""
+    var x = ""
         set(x) {
             println("setter invoked")
             field = x

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect6.new.kt

@@ -1,5 +1,5 @@
 class C {
-    var x: String? = ""
+    var x = ""
         set(x) {
             println("old value: " + this.x)
             field = x