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/annotations/jetbrainsNotNull.ide.kt

@@ -1,26 +0,0 @@
-package test
-
-public class Test(str: String) {
-    var myStr: String = "String2"
-
-    public fun sout(str: String) {
-        System.out.println(str)
-    }
-
-    public fun dummy(str: String): String {
-        return str
-    }
-
-    public fun test() {
-        sout("String")
-        val test = "String2"
-        sout(test)
-        sout(dummy(test))
-
-        Test(test)
-    }
-
-    {
-        myStr = str
-    }
-}

j2k/tests/testData/ast/annotations/jetbrainsNotNull.java

@@ -1,4 +1,6 @@
 //file
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
 package test;
 
 import org.jetbrains.annotations.NotNull;

j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt

@@ -1,19 +1,21 @@
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
 package test
 
-public open class Test(str: String) {
+public class Test(str: String) {
     var myStr: String = "String2"
 
-    public open fun sout(str: String) {
+    public fun sout(str: String) {
         System.out?.println(str)
     }
 
-    public open fun dummy(str: String): String {
+    public fun dummy(str: String): String {
         return str
     }
 
-    public open fun test() {
+    public fun test() {
         sout("String")
-        var test: String = "String2"
+        val test: String = "String2"
         sout(test)
         sout(dummy(test))
 

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt

@@ -1,20 +0,0 @@
-package test
-
-class Foo() {
-    fun execute() {
-    }
-}
-
-class Bar() {
-    var fooNotNull: Foo = Foo()
-    var fooNullable: Foo = null
-}
-
-class Test() {
-    public fun test(barNotNull: Bar, barNullable: Bar) {
-        barNotNull.fooNotNull.execute()
-        barNotNull.fooNullable.execute()
-        barNullable.fooNotNull.execute()
-        barNullable.fooNullable.execute()
-    }
-}

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java

@@ -1,4 +1,6 @@
 //file
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
 package test;
 
 import org.jetbrains.annotations.NotNull;

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt

@@ -1,17 +1,19 @@
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
 package test
 
-open class Foo() {
-    open fun execute() {
+class Foo() {
+    fun execute() {
     }
 }
 
-open class Bar() {
+class Bar() {
     var fooNotNull: Foo = Foo()
     var fooNullable: Foo? = null
 }
 
-open class Test() {
-    public open fun test(barNotNull: Bar, barNullable: Bar?) {
+class Test() {
+    public fun test(barNotNull: Bar, barNullable: Bar?) {
         barNotNull.fooNotNull.execute()
         barNotNull.fooNullable?.execute()
         barNullable?.fooNotNull?.execute()