j2k: flatten test cases and testData directory structure

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

j2k/testData/fileOrElement/class/ClassShadowing.java

@@ -0,0 +1,13 @@
+package test;
+
+public class Short {
+	public static Short valueOf(String value) {return new Short();}
+}
+
+class Test {
+	public static void test() {
+		Short.valueOf("1");
+		test.Short.valueOf("1");
+		java.lang.Short.valueOf("1");
+	}
+}

j2k/testData/fileOrElement/class/ClassShadowing.kt

@@ -0,0 +1,19 @@
+package test
+
+public class Short {
+    class object {
+        public fun valueOf(value: String): Short {
+            return Short()
+        }
+    }
+}
+
+class Test {
+    class object {
+        public fun test() {
+            test.Short.valueOf("1")
+            test.Short.valueOf("1")
+            java.lang.Short.valueOf("1")
+        }
+    }
+}

j2k/testData/fileOrElement/class/abstractClass.java

@@ -0,0 +1,8 @@
+//class
+abstract class A { 
+  abstract void callme();
+
+  void callmetoo() {
+    print("This is a concrete method.");
+  }
+}

j2k/testData/fileOrElement/class/abstractClass.kt

@@ -0,0 +1,7 @@
+abstract class A {
+    abstract fun callme()
+
+    fun callmetoo() {
+        print("This is a concrete method.")
+    }
+}

j2k/testData/fileOrElement/class/abstractClassShape.java

@@ -0,0 +1,13 @@
+//class
+abstract class Shape {
+	public String color;
+	public Shape() {
+	}
+	public void setColor(String c) {
+		color = c;
+	}
+	public String getColor() {
+		return color;
+	}
+	public abstract double area();
+}

j2k/testData/fileOrElement/class/abstractClassShape.kt

@@ -0,0 +1,4 @@
+abstract class Shape {
+    public var color: String
+    public abstract fun area(): Double
+}

j2k/testData/fileOrElement/class/class.java

@@ -0,0 +1,2 @@
+//class
+class Test {}

j2k/testData/fileOrElement/class/class.kt

@@ -0,0 +1 @@
+class Test

j2k/testData/fileOrElement/class/classWithEmptyMethods.java

@@ -0,0 +1,2 @@
+//class
+final class T {void main() {}int i() {}String s() {}}

j2k/testData/fileOrElement/class/classWithEmptyMethods.kt

@@ -0,0 +1,10 @@
+class T {
+    fun main() {
+    }
+
+    fun i(): Int {
+    }
+
+    fun s(): String {
+    }
+}

j2k/testData/fileOrElement/class/classWithFields.java

@@ -0,0 +1,2 @@
+//class
+final class T {String a = "abc";int b = 10;}

j2k/testData/fileOrElement/class/classWithFields.kt

@@ -0,0 +1,4 @@
+class T {
+    var a = "abc"
+    var b = 10
+}

j2k/testData/fileOrElement/class/classWithMultiplyFields.java

@@ -0,0 +1,2 @@
+//class
+final class T {String a, b, c = "abc";}

j2k/testData/fileOrElement/class/classWithMultiplyFields.kt

@@ -0,0 +1,5 @@
+class T {
+    var a: String
+    var b: String
+    var c = "abc"
+}

j2k/testData/fileOrElement/class/emptyClass.java

@@ -0,0 +1,2 @@
+//class
+final class A {}

j2k/testData/fileOrElement/class/emptyClass.kt

@@ -0,0 +1 @@
+class A

j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java

@@ -0,0 +1,2 @@
+//class
+final class A extends Base implements I {}

j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.kt

@@ -0,0 +1 @@
+class A : Base(), I

j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java

@@ -0,0 +1,2 @@
+//class
+final class A extends Base implements I0, I1, I2 {}

j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -0,0 +1 @@
+class A : Base(), I0, I1, I2

j2k/testData/fileOrElement/class/finalClass.java

@@ -0,0 +1,2 @@
+//class
+final class Test {}

j2k/testData/fileOrElement/class/finalClass.kt

@@ -0,0 +1 @@
+class Test

j2k/testData/fileOrElement/class/genericClass.java

@@ -0,0 +1,2 @@
+//class
+final class Entry<K, V> {}

j2k/testData/fileOrElement/class/genericClass.kt

@@ -0,0 +1 @@
+class Entry<K, V>

j2k/testData/fileOrElement/class/innerClassInInterface.java

@@ -0,0 +1,3 @@
+interface A {
+    class B {}
+}

j2k/testData/fileOrElement/class/innerClassInInterface.kt

@@ -0,0 +1,3 @@
+trait A {
+    public class B
+}

j2k/testData/fileOrElement/class/innerEmptyClass.java

@@ -0,0 +1,2 @@
+//class
+final class A { final class B {} }

j2k/testData/fileOrElement/class/innerEmptyClass.kt

@@ -0,0 +1,3 @@
+class A {
+    inner class B
+}

j2k/testData/fileOrElement/class/innerEnum.java

@@ -0,0 +1,7 @@
+class A {
+    enum E {
+        A,
+        B,
+        C
+    }
+}

j2k/testData/fileOrElement/class/innerEnum.kt

@@ -0,0 +1,7 @@
+class A {
+    enum class E {
+        A
+        B
+        C
+    }
+}

j2k/testData/fileOrElement/class/innerInterface.java

@@ -0,0 +1,3 @@
+class A {
+    interface I {}
+}

j2k/testData/fileOrElement/class/innerInterface.kt

@@ -0,0 +1,3 @@
+class A {
+    trait I
+}

j2k/testData/fileOrElement/class/innerStaticClass.java

@@ -0,0 +1,2 @@
+//class
+final class S { static class Inner {} }

j2k/testData/fileOrElement/class/innerStaticClass.kt

@@ -0,0 +1,3 @@
+class S {
+    class Inner
+}

j2k/testData/fileOrElement/class/internalClass.java

@@ -0,0 +1,2 @@
+//class
+class Test {}

j2k/testData/fileOrElement/class/internalClass.kt

@@ -0,0 +1 @@
+class Test

j2k/testData/fileOrElement/class/kt-639.java

@@ -0,0 +1,18 @@
+package demo;
+
+import java.util.HashMap;
+
+class Test {
+  Test() {  }
+  Test(String s) {  }
+}
+
+class User {
+  void main() {
+    HashMap m = new HashMap(1);
+    HashMap m2 = new HashMap(10);
+
+    Test t1 = new Test();
+    Test t2 = new Test("");
+  }
+}

j2k/testData/fileOrElement/class/kt-639.kt

@@ -0,0 +1,30 @@
+// ERROR: 'internal fun Test(): demo.Test' is already defined in demo
+// ERROR: 'public constructor Test()' is already defined in demo
+// ERROR: Overload resolution ambiguity:  internal fun Test(): demo.Test defined in demo public constructor Test() defined in demo.Test
+// ERROR: Overload resolution ambiguity:  internal fun Test(): demo.Test defined in demo public constructor Test() defined in demo.Test
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K, V>(p0: kotlin.Int) Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K, V>(p0: kotlin.Int) Please specify it explicitly.
+// ERROR: Overload resolution ambiguity:  internal fun Test(): demo.Test defined in demo public constructor Test() defined in demo.Test
+package demo
+
+import java.util.HashMap
+
+fun Test(): Test {
+    return Test()
+}
+
+fun Test(s: String): Test {
+    return Test()
+}
+
+class Test
+
+class User {
+    fun main() {
+        val m = HashMap(1)
+        val m2 = HashMap(10)
+
+        val t1 = Test()
+        val t2 = Test("")
+    }
+}

j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java

@@ -0,0 +1,2 @@
+//class
+final class S { boolean sB() { return true; } static int myI = 10; }

j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt

@@ -0,0 +1,9 @@
+class S {
+    fun sB(): Boolean {
+        return true
+    }
+
+    class object {
+        var myI = 10
+    }
+}

j2k/testData/fileOrElement/class/oneStaticMethod.java

@@ -0,0 +1,2 @@
+//class
+final class S { static boolean staticF() { return true; } }

j2k/testData/fileOrElement/class/oneStaticMethod.kt

@@ -0,0 +1,7 @@
+class S {
+    class object {
+        fun staticF(): Boolean {
+            return true
+        }
+    }
+}

j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java

@@ -0,0 +1,2 @@
+//class
+final class S { boolean sB() { return true; } static int sI() { return 1; } }

j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt

@@ -0,0 +1,11 @@
+class S {
+    fun sB(): Boolean {
+        return true
+    }
+
+    class object {
+        fun sI(): Int {
+            return 1
+        }
+    }
+}

j2k/testData/fileOrElement/class/pivateClass.java

@@ -0,0 +1,2 @@
+//class
+private class Test {}

j2k/testData/fileOrElement/class/pivateClass.kt

@@ -0,0 +1 @@
+private class Test

j2k/testData/fileOrElement/class/privateInit.java

@@ -0,0 +1,4 @@
+public class MyClass {
+  private void init(int arg1, int arg2, int arg3) {
+  }
+}

j2k/testData/fileOrElement/class/privateInit.kt

@@ -0,0 +1,4 @@
+public class MyClass {
+    private fun init(arg1: Int, arg2: Int, arg3: Int) {
+    }
+}

j2k/testData/fileOrElement/class/protectedClass.java

@@ -0,0 +1,2 @@
+//class
+protected class Test {}

j2k/testData/fileOrElement/class/protectedClass.kt

@@ -0,0 +1 @@
+protected class Test

j2k/testData/fileOrElement/class/publicClass.java

@@ -0,0 +1,2 @@
+//class
+public class Test {}

j2k/testData/fileOrElement/class/publicClass.kt

@@ -0,0 +1 @@
+public class Test

j2k/testData/fileOrElement/class/simpleInheritance.java

@@ -0,0 +1,2 @@
+//class
+final class A extends Base {}

j2k/testData/fileOrElement/class/simpleInheritance.kt

@@ -0,0 +1 @@
+class A : Base()

j2k/testData/fileOrElement/class/twoStaticMethod.java

@@ -0,0 +1,2 @@
+//class
+final class S { static boolean sB() { return true; } static int sI() { return 1; } }

j2k/testData/fileOrElement/class/twoStaticMethod.kt

@@ -0,0 +1,11 @@
+class S {
+    class object {
+        fun sB(): Boolean {
+            return true
+        }
+
+        fun sI(): Int {
+            return 1
+        }
+    }
+}