j2k: flatten test cases and testData directory structure

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

j2k/testData/fileOrElement/function/abstractMethod.java

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

j2k/testData/fileOrElement/function/abstractMethod.kt

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

j2k/testData/fileOrElement/function/classGenericParam.java

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

j2k/testData/fileOrElement/function/classGenericParam.kt

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

j2k/testData/fileOrElement/function/emptyVoidMethod.java

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

j2k/testData/fileOrElement/function/emptyVoidMethod.kt

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

j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java

@@ -0,0 +1,56 @@
+//file
+package test;
+
+class Test extends Base {
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return super.equals(o);
+  }
+
+  @Override
+  protected Object clone() throws CloneNotSupportedException {
+    return super.clone();
+  }
+
+  @Override
+  public String toString() {
+    return super.toString();
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+  }
+}
+
+class Base {
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return super.equals(o);
+  }
+
+  @Override
+  protected Object clone() throws CloneNotSupportedException {
+    return super.clone();
+  }
+
+  @Override
+  public String toString() {
+    return super.toString();
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+  }
+}

j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt

@@ -0,0 +1,51 @@
+// ERROR: Unresolved reference: clone
+// ERROR: Unresolved reference: finalize
+package test
+
+class Test : Base() {
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    override fun equals(o: Any?): Boolean {
+        return super.equals(o)
+    }
+
+    throws(javaClass<CloneNotSupportedException>())
+    override fun clone(): Any {
+        return super.clone()
+    }
+
+    override fun toString(): String {
+        return super.toString()
+    }
+
+    throws(javaClass<Throwable>())
+    override fun finalize() {
+        super.finalize()
+    }
+}
+
+open class Base {
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    override fun equals(o: Any?): Boolean {
+        return super.equals(o)
+    }
+
+    throws(javaClass<CloneNotSupportedException>())
+    protected open fun clone(): Any {
+        return super.clone()
+    }
+
+    override fun toString(): String {
+        return super.toString()
+    }
+
+    throws(javaClass<Throwable>())
+    protected open fun finalize() {
+        super.finalize()
+    }
+}

j2k/testData/fileOrElement/function/final.java

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

j2k/testData/fileOrElement/function/final.kt

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

j2k/testData/fileOrElement/function/functionInFinalClass.java

@@ -0,0 +1,6 @@
+//file
+package demo;
+
+final class Final {
+  void test() {}
+}

j2k/testData/fileOrElement/function/functionInFinalClass.kt

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

j2k/testData/fileOrElement/function/internal.java

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

j2k/testData/fileOrElement/function/internal.kt

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

j2k/testData/fileOrElement/function/main.java

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

j2k/testData/fileOrElement/function/main.kt

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

j2k/testData/fileOrElement/function/main2.java

@@ -0,0 +1,5 @@
+//file
+public class A {
+    public static void main(String[] args) {
+    }
+}

j2k/testData/fileOrElement/function/main2.kt

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

j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java

@@ -0,0 +1,6 @@
+// !forceNotNullTypes: false
+//file
+public class A {
+    public static void main(String[] args) {
+    }
+}

j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt

@@ -0,0 +1,9 @@
+// !forceNotNullTypes: false
+public class A {
+    class object {
+        public fun main(args: Array<String>) {
+        }
+    }
+}
+
+fun main(args: Array<String>) = A.main(args)

j2k/testData/fileOrElement/function/methodClassType.java

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

j2k/testData/fileOrElement/function/methodClassType.kt

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

j2k/testData/fileOrElement/function/methodPrimitiveType.java

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

j2k/testData/fileOrElement/function/methodPrimitiveType.kt

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

j2k/testData/fileOrElement/function/methodPrimitiveType2.java

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

j2k/testData/fileOrElement/function/methodPrimitiveType2.kt

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

j2k/testData/fileOrElement/function/methodWithReturnStatement.java

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

j2k/testData/fileOrElement/function/methodWithReturnStatement.kt

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

j2k/testData/fileOrElement/function/open.java

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

j2k/testData/fileOrElement/function/open.kt

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

j2k/testData/fileOrElement/function/override.java

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

j2k/testData/fileOrElement/function/override.kt

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

j2k/testData/fileOrElement/function/overrideAndOpen.java

@@ -0,0 +1,12 @@
+//file
+class A {
+  void foo() {}
+}
+
+class B extends A {
+  void foo() {}
+}
+
+class C extends B {
+  void foo() {}
+}

j2k/testData/fileOrElement/function/overrideAndOpen.kt

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

j2k/testData/fileOrElement/function/overrideObject.java

@@ -0,0 +1,29 @@
+//file
+class X {
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
+
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+}
+
+class Y extends Thread {
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+}

j2k/testData/fileOrElement/function/overrideObject.kt

@@ -0,0 +1,26 @@
+// ERROR: Unresolved reference: clone
+class X {
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    override fun equals(o: Any?): Boolean {
+        return super.equals(o)
+    }
+
+    override fun toString(): String {
+        return super.toString()
+    }
+
+    throws(javaClass<CloneNotSupportedException>())
+    protected fun clone(): Any {
+        return super.clone()
+    }
+}
+
+class Y : Thread() {
+    throws(javaClass<CloneNotSupportedException>())
+    override fun clone(): Any {
+        return super.clone()
+    }
+}

j2k/testData/fileOrElement/function/overrideObject2.java

@@ -0,0 +1,24 @@
+//file
+class Base {}
+
+class X extends Base {
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
+
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+}

j2k/testData/fileOrElement/function/overrideObject2.kt

@@ -0,0 +1,21 @@
+// ERROR: Unresolved reference: clone
+open class Base
+
+class X : Base() {
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    override fun equals(o: Any?): Boolean {
+        return super.equals(o)
+    }
+
+    override fun toString(): String {
+        return super.toString()
+    }
+
+    throws(javaClass<CloneNotSupportedException>())
+    protected fun clone(): Any {
+        return super.clone()
+    }
+}

j2k/testData/fileOrElement/function/overrideObject3.java

@@ -0,0 +1,14 @@
+//file
+class Base {
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o);
+    }
+}
+
+class X extends Base {
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o);
+    }
+}

j2k/testData/fileOrElement/function/overrideObject3.kt

@@ -0,0 +1,11 @@
+open class Base {
+    override fun equals(o: Any?): Boolean {
+        return super.equals(o)
+    }
+}
+
+class X : Base() {
+    override fun equals(o: Any?): Boolean {
+        return super.equals(o)
+    }
+}

j2k/testData/fileOrElement/function/ownGenericParam.java

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

j2k/testData/fileOrElement/function/ownGenericParam.kt

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

j2k/testData/fileOrElement/function/ownSeveralGenericParams.java

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

j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt

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

j2k/testData/fileOrElement/function/parameterModification.java

@@ -0,0 +1,6 @@
+//method
+int foo(int p1, int p2, int p3) {
+    p1++;
+    if (p2 > 0) p3 = 0;
+    return p1 + p2 + p3;
+}

j2k/testData/fileOrElement/function/parameterModification.kt

@@ -0,0 +1,7 @@
+fun foo(p1: Int, p2: Int, p3: Int): Int {
+    var p1 = p1
+    var p3 = p3
+    p1++
+    if (p2 > 0) p3 = 0
+    return p1 + p2 + p3
+}

j2k/testData/fileOrElement/function/private.java

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

j2k/testData/fileOrElement/function/private.kt

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

j2k/testData/fileOrElement/function/protected.java

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

j2k/testData/fileOrElement/function/protected.kt

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

j2k/testData/fileOrElement/function/public.java

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

j2k/testData/fileOrElement/function/public.kt

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

j2k/testData/fileOrElement/function/synchronizedMethod.java

@@ -0,0 +1,8 @@
+class A {
+    synchronized void foo() {
+        bar();
+    }
+
+    void bar() {
+    }
+}

j2k/testData/fileOrElement/function/synchronizedMethod.kt

@@ -0,0 +1,8 @@
+class A {
+    synchronized fun foo() {
+        bar()
+    }
+
+    fun bar() {
+    }
+}

j2k/testData/fileOrElement/function/throws.java

@@ -0,0 +1,2 @@
+//method
+void foo() throws IOException, SerializationException;

j2k/testData/fileOrElement/function/throws.kt

@@ -0,0 +1,2 @@
+throws(javaClass<IOException>(), javaClass<SerializationException>())
+fun foo()

j2k/testData/fileOrElement/function/varVararg.java

@@ -0,0 +1,8 @@
+//file
+package demo;
+
+class Test {
+  void test(Object ... args) {
+    args = new Integer[] {1, 2, 3};
+  }
+}

j2k/testData/fileOrElement/function/varVararg.kt

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