j2k: flatten test cases and testData directory structure

Move j2k/test/tests -> j2k/tests, j2k/test/testData -> j2k/testData

j2k/testData/fileOrElement/field/classChildExtendsBase.java

@@ -0,0 +1,7 @@
+class Base {
+  private String myFirst;
+}
+
+class Child extends Base {
+  private String mySecond;
+}

j2k/testData/fileOrElement/field/classChildExtendsBase.kt

@@ -0,0 +1,7 @@
+open class Base {
+    private val myFirst: String? = null
+}
+
+class Child : Base() {
+    private val mySecond: String? = null
+}

j2k/testData/fileOrElement/field/conversion.java

@@ -0,0 +1,9 @@
+class A {
+    private Integer i = getByte();
+
+    static byte getByte() { return 0; }
+
+    void foo() {
+        i = 10;
+    }
+}

j2k/testData/fileOrElement/field/conversion.kt

@@ -0,0 +1,14 @@
+class A {
+    private var i: Int? = getByte().toInt()
+
+    fun foo() {
+        i = 10
+    }
+
+    class object {
+
+        fun getByte(): Byte {
+            return 0
+        }
+    }
+}

j2k/testData/fileOrElement/field/internalField.java

@@ -0,0 +1,3 @@
+class C {
+Foo f;
+}

j2k/testData/fileOrElement/field/internalField.kt

@@ -0,0 +1,5 @@
+// ERROR: Unresolved reference: Foo
+// ERROR: Property must be initialized or be abstract
+class C {
+    var f: Foo
+}

j2k/testData/fileOrElement/field/privateField.java

@@ -0,0 +1,3 @@
+class C {
+private Foo f;
+}

j2k/testData/fileOrElement/field/privateField.kt

@@ -0,0 +1,4 @@
+// ERROR: Unresolved reference: Foo
+class C {
+    private val f: Foo? = null
+}

j2k/testData/fileOrElement/field/protectedField.java

@@ -0,0 +1,3 @@
+class C {
+protected Foo f;
+}

j2k/testData/fileOrElement/field/protectedField.kt

@@ -0,0 +1,5 @@
+// ERROR: Unresolved reference: Foo
+// ERROR: Property must be initialized or be abstract
+class C {
+    protected var f: Foo
+}

j2k/testData/fileOrElement/field/publicField.java

@@ -0,0 +1,3 @@
+class C {
+public Foo f;
+}

j2k/testData/fileOrElement/field/publicField.kt

@@ -0,0 +1,5 @@
+// ERROR: Unresolved reference: Foo
+// ERROR: Property must be initialized or be abstract
+class C {
+    public var f: Foo
+}

j2k/testData/fileOrElement/field/specifyType.java

@@ -0,0 +1,28 @@
+import org.jetbrains.annotations.Nullable;
+import java.util.*;
+
+class A {
+    private final List<String> field1 = new ArrayList<String>();
+    final List<String> field2 = new ArrayList<String>();
+    public final int field3 = 0;
+    protected final int field4 = 0;
+
+    private List<String> field5 = new ArrayList<String>();
+    List<String> field6 = new ArrayList<String>();
+
+    private int field7 = 0;
+    int field8 = 0;
+
+    @Nullable private String field9 = "a"
+    @Nullable private String field10 = foo();
+
+    String foo() { return "x"; }
+
+    void bar() {
+        field5 = new ArrayList<String>();
+        field7++;
+        field8++;
+        field9 = null;
+        field10 = null;
+    }
+}

j2k/testData/fileOrElement/field/specifyType.kt

@@ -0,0 +1,29 @@
+import java.util.*
+
+class A {
+    private val field1 = ArrayList<String>()
+    val field2: List<String> = ArrayList()
+    public val field3: Int = 0
+    protected val field4: Int = 0
+
+    private var field5: List<String> = ArrayList()
+    var field6: List<String> = ArrayList()
+
+    private var field7 = 0
+    var field8 = 0
+
+    private var field9: String? = "a"
+    private var field10: String? = foo()
+
+    fun foo(): String {
+        return "x"
+    }
+
+    fun bar() {
+        field5 = ArrayList<String>()
+        field7++
+        field8++
+        field9 = null
+        field10 = null
+    }
+}

j2k/testData/fileOrElement/field/valOrVar.java

@@ -0,0 +1,28 @@
+class A {
+    private final int field1 = 0;
+    private int field2 = 0;
+    private int field3 = 0;
+    final int field4 = 0;
+    int field5 = 0;
+    private int field6;
+    private int field7;
+    private int field8;
+    private int field9;
+    private int field10;
+    private int field11;
+
+    A(int p1, int p2, A a) {
+        field6 = p1;
+        field7 = 10;
+        this.field8 = p2;
+        this.field9 = 10;
+        if (p1 > 0) {
+            this.field10 = 10;
+        }
+        a.field11 = 10;
+    }
+
+    void foo() {
+        field3 = field2;
+    }
+}

j2k/testData/fileOrElement/field/valOrVar.kt

@@ -0,0 +1,24 @@
+class A(private val field6: Int, private val field8: Int, a: A) {
+    private val field1 = 0
+    private val field2 = 0
+    private var field3 = 0
+    val field4 = 0
+    var field5 = 0
+    private val field7: Int
+    private val field9: Int
+    private var field10: Int = 0
+    private var field11: Int = 0
+
+    {
+        field7 = 10
+        this.field9 = 10
+        if (field6 > 0) {
+            this.field10 = 10
+        }
+        a.field11 = 10
+    }
+
+    fun foo() {
+        field3 = field2
+    }
+}

j2k/testData/fileOrElement/field/valWithInit.java

@@ -0,0 +1,3 @@
+class C {
+final Foo f = new Foo(1, 2);
+}

j2k/testData/fileOrElement/field/valWithInit.kt

@@ -0,0 +1,4 @@
+// ERROR: Unresolved reference: Foo
+class C {
+    val f = Foo(1, 2)
+}

j2k/testData/fileOrElement/field/varWithInit.java

@@ -0,0 +1,3 @@
+class C {
+Foo f = new Foo(1, 2);
+}

j2k/testData/fileOrElement/field/varWithInit.kt

@@ -0,0 +1,4 @@
+// ERROR: Unresolved reference: Foo
+class C {
+    var f = Foo(1, 2)
+}

j2k/testData/fileOrElement/field/varWithoutInit.java

@@ -0,0 +1,3 @@
+class C {
+Foo f;
+}

j2k/testData/fileOrElement/field/varWithoutInit.kt

@@ -0,0 +1,5 @@
+// ERROR: Unresolved reference: Foo
+// ERROR: Property must be initialized or be abstract
+class C {
+    var f: Foo
+}

j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.java

@@ -0,0 +1,8 @@
+class A {
+    @Deprecated
+    volatile int field1 = 0;
+
+    transient int field2 = 1;
+
+    strictfp double field3 = 2;
+}

j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt

@@ -0,0 +1,9 @@
+// ERROR: An integer literal does not conform to the expected type kotlin.Double
+class A {
+    deprecated("")
+    volatile var field1 = 0
+
+    transient var field2 = 1
+
+    strictfp var field3: Double = 2
+}