Java to Kotlin converter: no more 2 conversion modes for each test, just a few tests to test non-standard settings

j2k/tests/testData/ast/formatting/nonStaticMembers.ide.kt

@@ -1,13 +0,0 @@
-class F() {
-
-    fun f1() {
-    }
-
-
-    fun f2() {
-    }
-    var i: Int = 0
-
-    fun f3() {
-    }
-}

j2k/tests/testData/ast/formatting/nonStaticMembers.kt

@@ -1,13 +1,13 @@
-open class F() {
+class F() {
 
-    open fun f1() {
+    fun f1() {
     }
 
 
-    open fun f2() {
+    fun f2() {
     }
-    var i: Int? = 0
+    var i: Int = 0
 
-    open fun f3() {
+    fun f3() {
     }
 }

j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.ide.kt

@@ -1,26 +0,0 @@
-class F() {
-
-    //c1
-
-    /*c2*/
-
-    fun f1() {
-    }
-
-
-    //c3
-
-
-
-
-    //c4
-
-    fun f2() {
-    }
-    var i: Int = 0
-
-    fun f3() {
-    }
-
-    //c5
-}

j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt

@@ -1,10 +1,10 @@
-open class F() {
+class F() {
 
     //c1
 
     /*c2*/
 
-    open fun f1() {
+    fun f1() {
     }
 
 
@@ -15,11 +15,11 @@ open class F() {
 
     //c4
 
-    open fun f2() {
+    fun f2() {
     }
-    var i: Int? = 0
+    var i: Int = 0
 
-    open fun f3() {
+    fun f3() {
     }
 
     //c5

j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.ide.kt

@@ -1,38 +0,0 @@
-class F() {
-
-
-    //c3
-
-
-
-
-    //c4
-
-    fun f2() {
-    }
-
-    fun f3() {
-    }
-
-    fun f4() {
-    }
-
-    class object {
-
-        //c1
-
-        /*c2*/
-
-        fun f1() {
-        }
-        var i: Int = 0
-
-        //c5
-
-        fun f5() {
-        }
-
-        //c6
-
-    }
-}

j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt

@@ -1,4 +1,4 @@
-open class F() {
+class F() {
 
 
     //c3
@@ -8,13 +8,13 @@ open class F() {
 
     //c4
 
-    open fun f2() {
+    fun f2() {
     }
 
-    open fun f3() {
+    fun f3() {
     }
 
-    open fun f4() {
+    fun f4() {
     }
 
     class object {
@@ -23,13 +23,13 @@ open class F() {
 
         /*c2*/
 
-        open fun f1() {
+        fun f1() {
         }
-        var i: Int? = 0
+        var i: Int = 0
 
         //c5
 
-        open fun f5() {
+        fun f5() {
         }
 
         //c6

j2k/tests/testData/ast/formatting/staticMembersWithComments.ide.kt

@@ -1,28 +0,0 @@
-class F() {
-    class object {
-
-        //c1
-
-        /*c2*/
-
-        fun f1() {
-        }
-
-
-        //c3
-
-
-
-
-        //c4
-
-        fun f2() {
-        }
-        var i: Int = 0
-
-        fun f3() {
-        }
-
-        //c5
-    }
-}

j2k/tests/testData/ast/formatting/staticMembersWithComments.kt

@@ -1,11 +1,11 @@
-open class F() {
+class F() {
     class object {
 
         //c1
 
         /*c2*/
 
-        open fun f1() {
+        fun f1() {
         }
 
 
@@ -16,11 +16,11 @@ open class F() {
 
         //c4
 
-        open fun f2() {
+        fun f2() {
         }
-        var i: Int? = 0
+        var i: Int = 0
 
-        open fun f3() {
+        fun f3() {
         }
 
         //c5