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/function/abstractMethod.ide.kt

@@ -1 +0,0 @@
-abstract fun getNoofGears(): Int

j2k/tests/testData/ast/function/classGenericParam.ide.kt

@@ -1,2 +0,0 @@
-fun getT(): T {
-}

j2k/tests/testData/ast/function/classGenericParam.kt

@@ -1,2 +1,2 @@
-fun getT(): T? {
+fun getT(): T {
 }

j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt

@@ -1,2 +0,0 @@
-fun main() {
-}

j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt

@@ -1,45 +0,0 @@
-package test
-
-class Test() : Base() {
-    override fun hashCode(): Int {
-        return super.hashCode()
-    }
-
-    override fun equals(o: Any): Boolean {
-        return super.equals(o)
-    }
-
-    override fun clone(): Any {
-        return super.clone()
-    }
-
-    override fun toString(): String {
-        return super.toString()
-    }
-
-    override fun finalize() {
-        super.finalize()
-    }
-}
-
-class Base() {
-    public fun hashCode(): Int {
-        return System.identityHashCode(this)
-    }
-
-    public fun equals(o: Any): Boolean {
-        return this.identityEquals(o)
-    }
-
-    protected fun clone(): Any {
-        return super.clone()
-    }
-
-    public fun toString(): String {
-        return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
-    }
-
-    protected fun finalize() {
-        super.finalize()
-    }
-}

j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt

@@ -1,19 +1,19 @@
 package test
 
-open class Test() : Base() {
+class Test() : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
 
-    override fun equals(o: Any?): Boolean {
+    override fun equals(o: Any): Boolean {
         return super.equals(o)
     }
 
-    override fun clone(): Any? {
+    override fun clone(): Any {
         return super.clone()
     }
 
-    override fun toString(): String? {
+    override fun toString(): String {
         return super.toString()
     }
 
@@ -22,24 +22,24 @@ open class Test() : Base() {
     }
 }
 
-open class Base() {
-    public open fun hashCode(): Int {
+class Base() {
+    public fun hashCode(): Int {
         return System.identityHashCode(this)
     }
 
-    public open fun equals(o: Any?): Boolean {
+    public fun equals(o: Any): Boolean {
         return this.identityEquals(o)
     }
 
-    protected open fun clone(): Any? {
+    protected fun clone(): Any {
         return super.clone()
     }
 
-    public open fun toString(): String? {
+    public fun toString(): String {
         return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
     }
 
-    protected open fun finalize() {
+    protected fun finalize() {
         super.finalize()
     }
 }

j2k/tests/testData/ast/function/final.ide.kt

@@ -1,3 +0,0 @@
-fun getString(): String {
-    return ""
-}

j2k/tests/testData/ast/function/final.kt

@@ -1,3 +1,3 @@
-fun getString(): String? {
+fun getString(): String {
     return ""
 }

j2k/tests/testData/ast/function/functionInFinalClass.ide.kt

@@ -1,6 +0,0 @@
-package demo
-
-class Final() {
-    fun test() {
-    }
-}

j2k/tests/testData/ast/function/internal.ide.kt

@@ -1,2 +0,0 @@
-fun test() {
-}

j2k/tests/testData/ast/function/main.ide.kt

@@ -1,4 +0,0 @@
-class object {
-    public fun main(args: Array<String>) {
-    }
-}

j2k/tests/testData/ast/function/main.kt

@@ -1,4 +1,4 @@
 class object {
-    public fun main(args: Array<String?>?) {
+    public fun main(args: Array<String>) {
     }
 }

j2k/tests/testData/ast/function/methodClassType.ide.kt

@@ -1,2 +0,0 @@
-fun main(): String {
-}

j2k/tests/testData/ast/function/methodClassType.kt

@@ -1,2 +1,2 @@
-fun main(): String? {
+fun main(): String {
 }

j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt

@@ -1,2 +0,0 @@
-fun main(): Int {
-}

j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt

@@ -1,2 +0,0 @@
-fun main(): Boolean {
-}

j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt

@@ -1,3 +0,0 @@
-fun isTrue(): Boolean {
-    return true
-}

j2k/tests/testData/ast/function/open.ide.kt

@@ -1,3 +0,0 @@
-fun getString(): String {
-    return ""
-}

j2k/tests/testData/ast/function/open.kt

@@ -1,3 +1,3 @@
-fun getString(): String? {
+fun getString(): String {
     return ""
 }

j2k/tests/testData/ast/function/override.ide.kt

@@ -1,8 +0,0 @@
-class A() {
-    fun a() {
-    }
-}
-class B() : A() {
-    override fun a() {
-    }
-}

j2k/tests/testData/ast/function/override.kt

@@ -1,5 +1,5 @@
-open class A() {
-    open fun a() {
+class A() {
+    fun a() {
     }
 }
 class B() : A() {

j2k/tests/testData/ast/function/overrideAndOpen.ide.kt

@@ -1,14 +0,0 @@
-class A() {
-    fun foo() {
-    }
-}
-
-class B() : A() {
-    override fun foo() {
-    }
-}
-
-class C() : B() {
-    override fun foo() {
-    }
-}

j2k/tests/testData/ast/function/overrideAndOpen.kt

@@ -1,14 +1,14 @@
-open class A() {
-    open fun foo() {
+class A() {
+    fun foo() {
     }
 }
 
-open class B() : A() {
+class B() : A() {
     override fun foo() {
     }
 }
 
-open class C() : B() {
+class C() : B() {
     override fun foo() {
     }
 }

j2k/tests/testData/ast/function/overrideObject.ide.kt

@@ -1,23 +0,0 @@
-package test
-
-class Test() {
-    public fun hashCode(): Int {
-        return System.identityHashCode(this)
-    }
-
-    public fun equals(o: Any): Boolean {
-        return this.identityEquals(o)
-    }
-
-    protected fun clone(): Any {
-        return super.clone()
-    }
-
-    public fun toString(): String {
-        return getJavaClass<Test>.getName() + '@' + Integer.toHexString(hashCode())
-    }
-
-    protected fun finalize() {
-        super.finalize()
-    }
-}

j2k/tests/testData/ast/function/overrideObject.kt

@@ -1,23 +1,23 @@
 package test
 
-open class Test() {
-    public open fun hashCode(): Int {
+class Test() {
+    public fun hashCode(): Int {
         return System.identityHashCode(this)
     }
 
-    public open fun equals(o: Any?): Boolean {
+    public fun equals(o: Any): Boolean {
         return this.identityEquals(o)
     }
 
-    protected open fun clone(): Any? {
+    protected fun clone(): Any {
         return super.clone()
     }
 
-    public open fun toString(): String? {
+    public fun toString(): String {
         return getJavaClass<Test>.getName() + '@' + Integer.toHexString(hashCode())
     }
 
-    protected open fun finalize() {
+    protected fun finalize() {
         super.finalize()
     }
 }

j2k/tests/testData/ast/function/ownGenericParam.ide.kt

@@ -1,2 +0,0 @@
-fun <U> putU(u: U) {
-}

j2k/tests/testData/ast/function/ownGenericParam.kt

@@ -1,2 +1,2 @@
-fun <U> putU(u: U?) {
+fun <U> putU(u: U) {
 }

j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt

@@ -1,2 +0,0 @@
-fun <U, V, W> putUVW(u: U, v: V, w: W) {
-}

j2k/tests/testData/ast/function/ownSeveralGenericParams.kt

@@ -1,2 +1,2 @@
-fun <U, V, W> putUVW(u: U?, v: V?, w: W?) {
+fun <U, V, W> putUVW(u: U, v: V, w: W) {
 }

j2k/tests/testData/ast/function/private.ide.kt

@@ -1,2 +0,0 @@
-private fun test() {
-}

j2k/tests/testData/ast/function/protected.ide.kt

@@ -1,2 +0,0 @@
-protected fun test() {
-}

j2k/tests/testData/ast/function/public.ide.kt

@@ -1,2 +0,0 @@
-public fun test() {
-}

j2k/tests/testData/ast/function/varVararg.ide.kt

@@ -1,7 +0,0 @@
-package demo
-
-class Test() {
-    fun test(vararg args: Any) {
-        args = array<Int>(1, 2, 3)
-    }
-}

j2k/tests/testData/ast/function/varVararg.kt

@@ -1,7 +1,7 @@
 package demo
 
-open class Test() {
-    open fun test(vararg args: Any?) {
-        args = array<Int?>(1, 2, 3)
+class Test() {
+    fun test(vararg args: Any) {
+        args = array<Int>(1, 2, 3)
     }
 }

j2k/tests/testData/ast/function/writableParameter.ide.kt

@@ -1,8 +0,0 @@
-package demo
-
-class Test() {
-    fun test(i: Int): Int {
-        i = 10
-        return i + 20
-    }
-}

j2k/tests/testData/ast/function/writableParameter.kt

@@ -1,7 +1,7 @@
 package demo
 
-open class Test() {
-    open fun test(i: Int): Int {
+class Test() {
+    fun test(i: Int): Int {
         i = 10
         return i + 20
     }