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

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

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

@@ -1,3 +1,4 @@
+//file
 package test;
 
 import org.jetbrains.annotations.NotNull;

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

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

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

@@ -1,3 +1,4 @@
+//file
 package test;
 
 import org.jetbrains.annotations.NotNull;

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

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

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

@@ -1,3 +1,4 @@
+//file
 class Test {
   String str;
   {

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

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

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

@@ -1,3 +1,4 @@
+//file
 class Test {
   String str;
   static {

j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.jav

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

j2k/tests/testData/ast/arrayAccessExpression/intIndex.jav

@@ -0,0 +1,2 @@
+//expression
+myArray[10]

j2k/tests/testData/ast/arrayAccessExpression/variableIndex.jav

@@ -0,0 +1,2 @@
+//expression
+myArray[i]

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

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

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

@@ -1 +1,2 @@
+//statement
 double[] a = new double[]{1.0, 2, 3}

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

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

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

@@ -1,2 +1,3 @@
+//statement
 double a = 0, b = 0, c = 0;
 double ds[] = {a, b, c};

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

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

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

@@ -1 +1,2 @@
+//statement
 float[] a = new float[]{1, 2, 3.0}

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

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

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

@@ -1 +1,2 @@
+//statement
 int[] a = new int[10]

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

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

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

@@ -1 +1,2 @@
+//statement
 java.lang.Double[] a = new java.lang.Double[]{1, 2, 3};

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

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

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

@@ -1 +1,2 @@
+//statement
 java.lang.Float[] a = new java.lang.Float[]{1, 2, 3};

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

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

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

@@ -1 +1,2 @@
+//statement
 byte[] a = new byte[] {1, 2, 3};

j2k/tests/testData/ast/arrayInitializerExpression/newInt.jav

@@ -1 +1,2 @@
+//expression
 new int[] {1, 2, 3};

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

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

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

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

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

@@ -1 +1,2 @@
+//statement
 Object[] a = new Object[10]

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

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

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

@@ -1 +1,2 @@
+//statement
 int[] a = {1, 2, 3};

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

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

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

@@ -1,2 +1,3 @@
+//statement
 int a = 0, b = 0, c = 0;
 int is[] = {a, b, c};

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

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

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

@@ -1 +1,2 @@
+//statement
 int[][] a = { {1, 2, 3}, {4, 5, 6}, {7, 8, 9} };

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

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

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

@@ -1 +1,2 @@
+//statement
 int [][] d2 = new int[][]{};

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

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

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

@@ -1 +1,2 @@
+//statement
 int [][] d2 = new int[5][];

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

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

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

@@ -1 +1,2 @@
+//statement
 int [][][] d3 = new int[5][5][];

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

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

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

@@ -1 +1,2 @@
+//statement
 int [][] d2 = new int[5][5];

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

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

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

@@ -1 +1,2 @@
+//statement
 String [][] ss = new String[5][5];

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

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

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

@@ -1 +1,2 @@
+//statement
 String [][][] sss = new String[5][5][5];

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

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

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

@@ -1 +1,2 @@
+//statement
 long[] a = new long[]{1, 2, 3}

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

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

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

@@ -1 +1,2 @@
+//method
 void fromArrayToCollection(Foo[] a) {}

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

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

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

@@ -1 +1,2 @@
+//statement
 int[] a = new int[]{1, 2, 3}

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

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

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

@@ -1 +1,2 @@
+//statement
 String[] a = new String[]{"abc"}

j2k/tests/testData/ast/assertStatement/onlyCondition.jav

@@ -1 +1,2 @@
+//statement
 assert boolMethod();

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

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

j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.jav

@@ -1 +1,2 @@
+//statement
 assert(boolMethod());

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

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

j2k/tests/testData/ast/assertStatement/withStringDetail.jav

@@ -1 +1,2 @@
+//statement
 assert true : "string details";

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

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

j2k/tests/testData/ast/assignmentExpression/and.jav

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

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

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