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()

j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt

@@ -1,6 +0,0 @@
-class Test() {
-    var str: String = 0
-    {
-        str = "Ola"
-    }
-}

j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt

@@ -1,5 +1,5 @@
-open class Test() {
-    var str: String? = null
+class Test() {
+    var str: String = 0
     {
         str = "Ola"
     }

j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt

@@ -1,9 +0,0 @@
-class Test() {
-    var str: String = 0
-
-    class object {
-        {
-            str = "Ola"
-        }
-    }
-}

j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt

@@ -1,5 +1,5 @@
-open class Test() {
-    var str: String? = null
+class Test() {
+    var str: String = 0
 
     class object {
         {

j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.ide.kt

@@ -1 +0,0 @@
-myArray[myLibrary.calculateIndex(100)]

j2k/tests/testData/ast/arrayAccessExpression/intIndex.ide.kt

@@ -1 +0,0 @@
-myArray[10]

j2k/tests/testData/ast/arrayAccessExpression/variableIndex.ide.kt

@@ -1 +0,0 @@
-myArray[i]

j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.ide.kt

@@ -1 +0,0 @@
-val a = doubleArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt

@@ -1 +1 @@
-var a: DoubleArray? = doubleArray(1.0, 2.0, 3.0)
+val a = doubleArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.ide.kt

@@ -1,4 +0,0 @@
-val a = 0
-val b = 0
-val c = 0
-val ds = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())

j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt

@@ -1,4 +1,4 @@
-var a: Double = 0
-var b: Double = 0
-var c: Double = 0
-var ds: DoubleArray? = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())
+val a = 0
+val b = 0
+val c = 0
+val ds = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())

j2k/tests/testData/ast/arrayInitializerExpression/floatArray.ide.kt

@@ -1 +0,0 @@
-val a = floatArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt

@@ -1 +1 @@
-var a: FloatArray? = floatArray(1.0, 2.0, 3.0)
+val a = floatArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.ide.kt

@@ -1 +0,0 @@
-val a = IntArray(10)

j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt

@@ -1 +1 @@
-var a: IntArray? = IntArray(10)
+val a = IntArray(10)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.ide.kt

@@ -1 +0,0 @@
-val a = array<java.lang.Double>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt

@@ -1 +1 @@
-var a: Array<java.lang.Double?>? = array<java.lang.Double?>(1.0, 2.0, 3.0)
+val a = array<java.lang.Double>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.ide.kt

@@ -1 +0,0 @@
-val a = array<java.lang.Float>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt

@@ -1 +1 @@
-var a: Array<java.lang.Float?>? = array<java.lang.Float?>(1.0, 2.0, 3.0)
+val a = array<java.lang.Float>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/newByte.ide.kt

@@ -1 +0,0 @@
-val a = byteArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt

@@ -1 +1 @@
-var a: ByteArray? = byteArray(1, 2, 3)
+val a = byteArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/newInt.ide.kt

@@ -1 +0,0 @@
-intArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.ide.kt

@@ -1 +0,0 @@
-val a = arrayOfNulls<Any>(10)

j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt

@@ -1 +1 @@
-var a: Array<Any?>? = arrayOfNulls<Any?>(10)
+val a = arrayOfNulls<Any>(10)

j2k/tests/testData/ast/arrayInitializerExpression/oneDim.ide.kt

@@ -1 +0,0 @@
-val a = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt

@@ -1 +1 @@
-var a: IntArray? = intArray(1, 2, 3)
+val a = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.ide.kt

@@ -1,4 +0,0 @@
-val a = 0
-val b = 0
-val c = 0
-val `is` = intArray(a, b, c)

j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt

@@ -1,4 +1,4 @@
-var a: Int = 0
-var b: Int = 0
-var c: Int = 0
-var `is`: IntArray? = intArray(a, b, c)
+val a = 0
+val b = 0
+val c = 0
+val `is` = intArray(a, b, c)

j2k/tests/testData/ast/arrayInitializerExpression/twoDim.ide.kt

@@ -1 +0,0 @@
-val a = array<IntArray>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))

j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt

@@ -1 +1 @@
-var a: Array<IntArray?>? = array<IntArray?>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))
+val a = array<IntArray>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))

j2k/tests/testData/ast/arrayType/arrayInitializationStatement.ide.kt

@@ -1 +0,0 @@
-val d2 = array<IntArray>()

j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt

@@ -1 +1 @@
-var d2: Array<IntArray?>? = array<IntArray?>()
+val d2 = array<IntArray>()

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.ide.kt

@@ -1 +0,0 @@
-val d2 = arrayOfNulls<IntArray>(5)

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt

@@ -1 +1 @@
-var d2: Array<IntArray?>? = arrayOfNulls<IntArray?>(5)
+val d2 = arrayOfNulls<IntArray>(5)

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt

@@ -1 +0,0 @@
-val d3 = Array<Array<IntArray>>(5, { arrayOfNulls<IntArray>(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt

@@ -1 +1 @@
-var d3: Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, { arrayOfNulls<IntArray?>(5) })
+val d3 = Array<Array<IntArray>>(5, { arrayOfNulls<IntArray>(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt

@@ -1 +0,0 @@
-val d2 = Array<IntArray>(5, { IntArray(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt

@@ -1 +1 @@
-var d2: Array<IntArray?>? = Array<IntArray?>(5, { IntArray(5) })
+val d2 = Array<IntArray>(5, { IntArray(5) })

j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt

@@ -1 +0,0 @@
-val ss = Array<Array<String>>(5, { arrayOfNulls<String>(5) })

j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt

@@ -1 +1 @@
-var ss: Array<Array<String?>?>? = Array<Array<String?>?>(5, { arrayOfNulls<String?>(5) })
+val ss = Array<Array<String>>(5, { arrayOfNulls<String>(5) })

j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt

@@ -1 +0,0 @@
-val sss = Array<Array<Array<String>>>(5, { Array<Array<String>>(5, { arrayOfNulls<String>(5) }) })

j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt

@@ -1 +1 @@
-var sss: Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, { Array<Array<String?>?>(5, { arrayOfNulls<String?>(5) }) })
+val sss = Array<Array<Array<String>>>(5, { Array<Array<String>>(5, { arrayOfNulls<String>(5) }) })

j2k/tests/testData/ast/arrayType/longArray.ide.kt

@@ -1 +0,0 @@
-val a = longArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/longArray.kt

@@ -1 +1 @@
-var a: LongArray? = longArray(1, 2, 3)
+val a = longArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt

@@ -1,2 +0,0 @@
-fun fromArrayToCollection(a: Array<Foo>) {
-}

j2k/tests/testData/ast/arrayType/methodArrayArgs.kt

@@ -1,2 +1,2 @@
-fun fromArrayToCollection(a: Array<Foo?>?) {
+fun fromArrayToCollection(a: Array<Foo>) {
 }

j2k/tests/testData/ast/arrayType/newIntArray.ide.kt

@@ -1 +0,0 @@
-val a = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/newIntArray.kt

@@ -1 +1 @@
-var a: IntArray? = intArray(1, 2, 3)
+val a = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/newStringArray.ide.kt

@@ -1 +0,0 @@
-val a = array<String>("abc")

j2k/tests/testData/ast/arrayType/newStringArray.kt

@@ -1 +1 @@
-var a: Array<String?>? = array<String?>("abc")
+val a = array<String>("abc")

j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt

@@ -1 +0,0 @@
-assert(boolMethod())

j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt

@@ -1 +0,0 @@
-assert((boolMethod()))

j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt

@@ -1 +0,0 @@
-assert(true) { "string details" }

j2k/tests/testData/ast/assignmentExpression/and.ide.kt

@@ -1 +0,0 @@
-x = x and 2

j2k/tests/testData/ast/assignmentExpression/assignment.ide.kt

@@ -1 +0,0 @@
-x = 2

j2k/tests/testData/ast/assignmentExpression/divideAssign.ide.kt

@@ -1 +0,0 @@
-x /= 2

j2k/tests/testData/ast/assignmentExpression/minusAssign.ide.kt

@@ -1 +0,0 @@
-x -= 2

j2k/tests/testData/ast/assignmentExpression/multiplyAssign.ide.kt

@@ -1 +0,0 @@
-x *= 2

j2k/tests/testData/ast/assignmentExpression/nullability-settings.java

@@ -0,0 +1,12 @@
+//file
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
+import java.util.BitSet;
+
+class Foo {
+  void foo(BitSet o) {
+    BitSet o2 = o;
+    int foo = 0;
+    foo = o2.size();
+  }
+}

j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt

@@ -0,0 +1,11 @@
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
+import java.util.BitSet
+
+class Foo() {
+    fun foo(o: BitSet?) {
+        val o2: BitSet? = o
+        val foo: Int = 0
+        foo = o2?.size()!!
+    }
+}

j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt

@@ -1,9 +0,0 @@
-import java.util.BitSet
-
-class Foo() {
-    fun foo(o: BitSet) {
-        val o2 = o
-        val foo = 0
-        foo = o2.size()
-    }
-}

j2k/tests/testData/ast/assignmentExpression/nullability.kt

@@ -1,9 +1,9 @@
 import java.util.BitSet
 
-open class Foo() {
-    open fun foo(o: BitSet?) {
-        var o2: BitSet? = o
-        var foo: Int = 0
-        foo = o2?.size()!!
+class Foo() {
+    fun foo(o: BitSet) {
+        val o2 = o
+        val foo = 0
+        foo = o2.size()
     }
 }

j2k/tests/testData/ast/assignmentExpression/or.ide.kt

@@ -1 +0,0 @@
-x = x or 2

j2k/tests/testData/ast/assignmentExpression/plusAssign.ide.kt

@@ -1 +0,0 @@
-x += 2

j2k/tests/testData/ast/assignmentExpression/reminder.ide.kt

@@ -1 +0,0 @@
-x %= 2

j2k/tests/testData/ast/assignmentExpression/shiftLeft.ide.kt

@@ -1 +0,0 @@
-x = x shl 2

j2k/tests/testData/ast/assignmentExpression/shiftRight.ide.kt

@@ -1 +0,0 @@
-x = x shr 2

j2k/tests/testData/ast/assignmentExpression/simpleAssignment.ide.kt

@@ -1 +0,0 @@
-i = 1

j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.ide.kt

@@ -1 +0,0 @@
-x = x ushr 2

j2k/tests/testData/ast/assignmentExpression/xor.ide.kt

@@ -1 +0,0 @@
-x = x xor 2

j2k/tests/testData/ast/binaryExpression/and.ide.kt

@@ -1 +0,0 @@
-x and 2

j2k/tests/testData/ast/binaryExpression/conditionalAnd.ide.kt

@@ -1 +0,0 @@
-true && false

j2k/tests/testData/ast/binaryExpression/conditionalOr.ide.kt

@@ -1 +0,0 @@
-true || false

j2k/tests/testData/ast/binaryExpression/divide.ide.kt

@@ -1 +0,0 @@
-1 / 2

j2k/tests/testData/ast/binaryExpression/greaterThan.ide.kt

@@ -1 +0,0 @@
-1 > 2

j2k/tests/testData/ast/binaryExpression/greaterThanEqual.ide.kt

@@ -1 +0,0 @@
-1 >= 2

j2k/tests/testData/ast/binaryExpression/lessThan.ide.kt

@@ -1 +0,0 @@
-1 < 2

j2k/tests/testData/ast/binaryExpression/lessThanEqual.ide.kt

@@ -1 +0,0 @@
-1 <= 2

j2k/tests/testData/ast/binaryExpression/minus.ide.kt

@@ -1 +0,0 @@
-1 - 2

j2k/tests/testData/ast/binaryExpression/multiply.ide.kt

@@ -1 +0,0 @@
-1 * 2

j2k/tests/testData/ast/binaryExpression/or.ide.kt

@@ -1 +0,0 @@
-x or 2

j2k/tests/testData/ast/binaryExpression/plus.ide.kt

@@ -1 +0,0 @@
-1 + 2

j2k/tests/testData/ast/binaryExpression/remainder.ide.kt

@@ -1 +0,0 @@
-1 % 2

j2k/tests/testData/ast/binaryExpression/shiftLeft.ide.kt

@@ -1 +0,0 @@
-x shl 2

j2k/tests/testData/ast/binaryExpression/shiftRight.ide.kt

@@ -1 +0,0 @@
-x shr 2

j2k/tests/testData/ast/binaryExpression/unsignedRightShift.ide.kt

@@ -1 +0,0 @@
-x.ushr(2)

j2k/tests/testData/ast/binaryExpression/xor.ide.kt

@@ -1 +0,0 @@
-x xor 2

j2k/tests/testData/ast/boxedType/Boxing.ide.kt

@@ -1,13 +0,0 @@
-import java.util.ArrayList
-
-class Boxing() {
-    fun test() {
-        val i = 0
-        val n = 0.0.toFloat()
-        i = 1
-        val j = i!!
-        val k = i!! + 2
-        i = null
-        j = i!!
-    }
-}

j2k/tests/testData/ast/boxedType/Boxing.kt

@@ -1,12 +1,12 @@
 import java.util.ArrayList
 
-open class Boxing() {
-    open fun test() {
-        var i: Int? = 0
-        var n: Number? = 0.0.toFloat()
+class Boxing() {
+    fun test() {
+        val i = 0
+        val n = 0.0.toFloat()
         i = 1
-        var j: Int = i!!
-        var k: Int? = i!! + 2
+        val j = i!!
+        val k = i!! + 2
         i = null
         j = i!!
     }

j2k/tests/testData/ast/boxedType/boolean.ide.kt

@@ -1 +0,0 @@
-val i = 10

j2k/tests/testData/ast/boxedType/boolean.kt

@@ -1 +1 @@
-var i: Boolean? = 10
+val i = 10

j2k/tests/testData/ast/boxedType/byte.ide.kt

@@ -1 +0,0 @@
-val i = 10

j2k/tests/testData/ast/boxedType/byte.kt

@@ -1 +1 @@
-var i: Byte? = 10
+val i = 10

j2k/tests/testData/ast/boxedType/character.ide.kt

@@ -1 +0,0 @@
-val i = 10