Converter tests:

Use generated tests approach in converter tests

Introduce two seperate generated test cases of each of configurations, all tests are generated in both test cases
Test data for plugin configuration has extension "ide.kt", for basic configuration "*.kt"
Test data file is used to determine type of the test (file/class/expression/...) instead of directory, all test data is moved accordingly
Add abstract base classes for generated tests
Rename test folder "file" to "misc" (for the lack of imagination)

j2k/tests/testData/ast/function/abstractMethod.jav

@@ -1 +1,2 @@
+//method
 abstract int getNoofGears();

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

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

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

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

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

@@ -1 +1,2 @@
+//method
 T getT() {}

j2k/tests/testData/ast/function/emptyVoidMethod.jav

@@ -1 +1,2 @@
+//method
 void main() {}

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

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

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

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

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

@@ -1,3 +1,4 @@
+//file
 package test;
 
 class Test extends Base {

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

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

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

@@ -1 +1,2 @@
+//method
 final String getString() { return ""; }

j2k/tests/testData/ast/function/functionInFinalClass.jav

@@ -1,3 +1,4 @@
+//file
 package demo;
 
 final class Final {

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

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

j2k/tests/testData/ast/function/internal.jav

@@ -1 +1,2 @@
+//method
 void test() {}

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

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

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

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

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

@@ -1 +1,2 @@
+//method
 public static void main(String[] args) {}

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

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

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

@@ -1 +1,2 @@
+//method
 String main() {}

j2k/tests/testData/ast/function/methodPrimitiveType.jav

@@ -1 +1,2 @@
+//method
 int main() {}

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

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

j2k/tests/testData/ast/function/methodPrimitiveType2.jav

@@ -1 +1,2 @@
+//method
 boolean main() {}

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

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

j2k/tests/testData/ast/function/methodWithReturnStatement.jav

@@ -1 +1,2 @@
+//method
 boolean isTrue() { return true; }

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

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

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

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

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

@@ -1 +1,2 @@
+//method
 String getString() { return ""; }

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

@@ -1 +1,2 @@
+//file
 class A {void a() {}} final class B extends A {void a() {}}

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

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

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

@@ -1,3 +1,4 @@
+//file
 class A {
   void foo() {}
 }

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

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

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

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

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

@@ -1,3 +1,4 @@
+//file
 package test;
 
 class Test {

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

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

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

@@ -1 +1,2 @@
+//method
 <U> void putU(U u) {}

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

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

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

@@ -1 +1,2 @@
+//method
 <U, V, W> void putUVW(U u, V v, W w) {}

j2k/tests/testData/ast/function/private.jav

@@ -1 +1,2 @@
+//method
 private void test() {}

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

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

j2k/tests/testData/ast/function/protected.jav

@@ -1 +1,2 @@
+//method
 protected void test() {}

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

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

j2k/tests/testData/ast/function/public.jav

@@ -1 +1,2 @@
+//method
 public void test() {}

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

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

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

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

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

@@ -1,3 +1,4 @@
+//file
 package demo;
 
 class Test {

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

@@ -1,3 +1,4 @@
+//file
 package demo;
 
 class Test {

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

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