j2k: flatten test cases and testData directory structure

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

j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.java

@@ -0,0 +1,8 @@
+//file
+class C {
+    private String s = "";
+
+    void foo() {
+        s = null;
+    }
+}

j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt

@@ -0,0 +1,7 @@
+class C {
+    private var s: String? = ""
+
+    fun foo() {
+        s = null
+    }
+}

j2k/testData/fileOrElement/nullability/FieldComparedWithNull.java

@@ -0,0 +1,10 @@
+//file
+class C {
+    private String s = x();
+
+    void foo() {
+        if (s == null) {
+            System.out.print("null");
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt

@@ -0,0 +1,10 @@
+// ERROR: Unresolved reference: x
+class C {
+    private val s = x()
+
+    fun foo() {
+        if (s == null) {
+            System.out.print("null")
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.java

@@ -0,0 +1,14 @@
+//file
+class C {
+    private String s;
+
+    public C(String s) {
+        this.s = s;
+    }
+
+    void foo() {
+        if (s != null) {
+            System.out.print("not null");
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt

@@ -0,0 +1,8 @@
+class C(private val s: String?) {
+
+    fun foo() {
+        if (s != null) {
+            System.out.print("not null")
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.java

@@ -0,0 +1,12 @@
+//file
+class C {
+    public String s = "";
+}
+
+class D {
+    void foo(C c) {
+        if (null == c.s) {
+            System.out.println("null");
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt

@@ -0,0 +1,11 @@
+class C {
+    public var s: String? = ""
+}
+
+class D {
+    fun foo(c: C) {
+        if (null == c.s) {
+            System.out.println("null")
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.java

@@ -0,0 +1,11 @@
+//file
+class C {
+    private String s;
+
+    public C(String s) {
+        this.s = s;
+        if (s == null) {
+            System.out.print("null");
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt

@@ -0,0 +1,8 @@
+class C(private val s: String?) {
+
+    {
+        if (s == null) {
+            System.out.print("null")
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.java

@@ -0,0 +1,8 @@
+//file
+class C {
+    private String s = null;
+
+    void foo() {
+        s = "x";
+    }
+}

j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt

@@ -0,0 +1,7 @@
+class C {
+    private var s: String? = null
+
+    fun foo() {
+        s = "x"
+    }
+}

j2k/testData/fileOrElement/nullability/IndirectOverride.java

@@ -0,0 +1,4 @@
+//file
+class C extends javaApi.Derived {
+    public String foo(String s) { return s; }
+}

j2k/testData/fileOrElement/nullability/IndirectOverride.kt

@@ -0,0 +1,5 @@
+class C : javaApi.Derived() {
+    override fun foo(s: String?): String? {
+        return s
+    }
+}

j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java

@@ -0,0 +1,8 @@
+//file
+class C {
+    private void foo(String s){}
+
+    void bar() {
+        foo(null);
+    }
+}

j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt

@@ -0,0 +1,8 @@
+class C {
+    private fun foo(s: String?) {
+    }
+
+    fun bar() {
+        foo(null)
+    }
+}

j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java

@@ -0,0 +1,10 @@
+//file
+class C {
+    public void foo(String s){}
+}
+
+class D {
+    void bar(C c) {
+        c.foo(null);
+    }
+}

j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt

@@ -0,0 +1,10 @@
+class C {
+    public fun foo(s: String?) {
+    }
+}
+
+class D {
+    fun bar(c: C) {
+        c.foo(null)
+    }
+}

j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java

@@ -0,0 +1,8 @@
+//file
+class C {
+    private void foo(String s){}
+
+    void bar(boolean b) {
+        foo(b ? "a" : null);
+    }
+}

j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt

@@ -0,0 +1,8 @@
+class C {
+    private fun foo(s: String?) {
+    }
+
+    fun bar(b: Boolean) {
+        foo(if (b) "a" else null)
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.java

@@ -0,0 +1,12 @@
+//file
+interface I {
+    String getString();
+}
+
+class C {
+    void foo(I i) {
+        if (i.getString() == null) {
+            println("null");
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt

@@ -0,0 +1,11 @@
+trait I {
+    public fun getString(): String?
+}
+
+class C {
+    fun foo(i: I) {
+        if (i.getString() == null) {
+            println("null")
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java

@@ -0,0 +1,13 @@
+//file
+interface I {
+    String getString();
+}
+
+class C {
+    void foo(I i) {
+        final String result = i.getString();
+        if (result != null) {
+            print(result);
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt

@@ -0,0 +1,12 @@
+trait I {
+    public fun getString(): String?
+}
+
+class C {
+    fun foo(i: I) {
+        val result = i.getString()
+        if (result != null) {
+            print(result)
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java

@@ -0,0 +1,13 @@
+//file
+interface I {
+    String getString();
+}
+
+class C {
+    void foo(I i) {
+        String result = i.getString();
+        if (result != null) {
+            print(result);
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt

@@ -0,0 +1,12 @@
+trait I {
+    public fun getString(): String?
+}
+
+class C {
+    fun foo(i: I) {
+        val result = i.getString()
+        if (result != null) {
+            print(result)
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java

@@ -0,0 +1,14 @@
+//file
+interface I {
+    String getString();
+}
+
+class C {
+    void foo(I i, boolean b) {
+        String result = i.getString();
+        if (b) result = null;
+        if (result != null) {
+            print(result);
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt

@@ -0,0 +1,13 @@
+trait I {
+    public fun getString(): String
+}
+
+class C {
+    fun foo(i: I, b: Boolean) {
+        var result: String? = i.getString()
+        if (b) result = null
+        if (result != null) {
+            print(result)
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java

@@ -0,0 +1,8 @@
+//file
+import org.jetbrains.annotations.Nullable;
+
+class C {
+    @Nullable private final String string = getString();
+
+    static String getString() { return x(); }
+}

j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt

@@ -0,0 +1,11 @@
+// ERROR: Unresolved reference: x
+class C {
+    private val string = getString()
+
+    class object {
+
+        fun getString(): String? {
+            return x()
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsNull.java

@@ -0,0 +1,11 @@
+//file
+class C {
+    String foo(boolean b) {
+        if (b) {
+            return "abc";
+        }
+        else {
+            return null;
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt

@@ -0,0 +1,9 @@
+class C {
+    fun foo(b: Boolean): String? {
+        if (b) {
+            return "abc"
+        } else {
+            return null
+        }
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java

@@ -0,0 +1,16 @@
+//file
+interface Getter {
+    String get();
+}
+
+class C {
+    String foo(boolean b) {
+        Getter getter = new Getter() {
+            @Override
+            public String get() {
+                return null;
+            }
+        };
+        return "";
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt

@@ -0,0 +1,15 @@
+// ERROR: Return type of 'get' is not a subtype of the return type of overridden member public abstract fun get(): kotlin.String defined in Getter
+trait Getter {
+    public fun get(): String
+}
+
+class C {
+    fun foo(b: Boolean): String {
+        val getter = object : Getter {
+            override fun get(): String? {
+                return null
+            }
+        }
+        return ""
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java

@@ -0,0 +1,9 @@
+class C {
+    String foo() {
+        class Local {
+            String foo() { return null; }
+        }
+        new Local().foo();
+        return "";
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt

@@ -0,0 +1,11 @@
+class C {
+    fun foo(): String {
+        class Local {
+            fun foo(): String? {
+                return null
+            }
+        }
+        Local().foo()
+        return ""
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java

@@ -0,0 +1,6 @@
+//file
+class C {
+    String foo(boolean b) {
+        return b ? "abc" : null;
+    }
+}

j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt

@@ -0,0 +1,5 @@
+class C {
+    fun foo(b: Boolean): String? {
+        return if (b) "abc" else null
+    }
+}

j2k/testData/fileOrElement/nullability/NullableIntNoCrash.java

@@ -0,0 +1,8 @@
+import org.jetbrains.annotations.Nullable;
+
+//file
+class A {
+    int field = foo();
+
+    @Nullable int foo() { return 1; }
+}

j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt

@@ -0,0 +1,7 @@
+class A {
+    var field = foo()
+
+    fun foo(): Int {
+        return 1
+    }
+}

j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.java

@@ -0,0 +1,10 @@
+//file
+class C {
+    String getString(boolean b) {
+        return b ? "a" : null;
+    }
+
+    int foo() {
+        return getString(true).length();
+    }
+}

j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt

@@ -0,0 +1,9 @@
+class C {
+    fun getString(b: Boolean): String? {
+        return if (b) "a" else null
+    }
+
+    fun foo(): Int {
+        return getString(true)!!.length()
+    }
+}

j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.java

@@ -0,0 +1,6 @@
+//method
+int foo(String s, boolean b) {
+  if (s == null) System.out.println("null")
+  if (b) return s.length();
+  return 10;
+}

j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt

@@ -0,0 +1,5 @@
+fun foo(s: String?, b: Boolean): Int {
+    if (s == null) System.out.println("null")
+    if (b) return s!!.length()
+    return 10
+}

j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java

@@ -0,0 +1,8 @@
+//file
+class A extends B {
+    public void foo(String s) {}
+}
+
+class B extends A {
+    public void foo(String s) {}
+}

j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt

@@ -0,0 +1,11 @@
+// ERROR: There's a cycle in the inheritance hierarchy for this type
+// ERROR: There's a cycle in the inheritance hierarchy for this type
+open class A : B() {
+    public open fun foo(s: String) {
+    }
+}
+
+open class B : A() {
+    public open fun foo(s: String) {
+    }
+}

j2k/testData/fileOrElement/nullability/Overrides.java

@@ -0,0 +1,26 @@
+//file
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+class Base {
+    @Nullable
+    public String foo(@Nullable String s) { return ""; }
+
+    public String bar(String s) {
+        return s != null ? s + 1 : null;
+    }
+
+    public String zoo(Object o){ return ""; }
+}
+
+interface I {
+    @Nullable String zoo(@Nullable Object o);
+}
+
+class C extends Base implements I {
+    public String foo(String s) { return ""; }
+
+    public String bar(String s) { return ""; }
+
+    public String zoo(Object o) { return ""; }
+}

j2k/testData/fileOrElement/nullability/Overrides.kt

@@ -0,0 +1,31 @@
+open class Base {
+    public open fun foo(s: String?): String? {
+        return ""
+    }
+
+    public open fun bar(s: String?): String? {
+        return if (s != null) s + 1 else null
+    }
+
+    public open fun zoo(o: Any): String {
+        return ""
+    }
+}
+
+trait I {
+    public fun zoo(o: Any?): String?
+}
+
+class C : Base(), I {
+    override fun foo(s: String?): String? {
+        return ""
+    }
+
+    override fun bar(s: String?): String? {
+        return ""
+    }
+
+    override fun zoo(o: Any?): String? {
+        return ""
+    }
+}

j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.java

@@ -0,0 +1,6 @@
+//method
+void foo(String s) {
+  if (s != null) {
+      zoo(s);
+  }
+}

j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt

@@ -0,0 +1,5 @@
+fun foo(s: String?) {
+    if (s != null) {
+        zoo(s)
+    }
+}

j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java

@@ -0,0 +1,8 @@
+//method
+// !specifyLocalVariableTypeByDefault: true
+void foo(boolean b) {
+  String s = "abc";
+  if (b) {
+      s = null;
+  }
+}

j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt

@@ -0,0 +1,7 @@
+// !specifyLocalVariableTypeByDefault: true
+fun foo(b: Boolean) {
+    var s: String? = "abc"
+    if (b) {
+        s = null
+    }
+}

j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java

@@ -0,0 +1,8 @@
+//method
+// !specifyLocalVariableTypeByDefault: true
+void foo() {
+  String s = bar();
+  if (s != null) {
+      zoo(s);
+  }
+}

j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt

@@ -0,0 +1,7 @@
+// !specifyLocalVariableTypeByDefault: true
+fun foo() {
+    val s: String? = bar()
+    if (s != null) {
+        zoo(s)
+    }
+}

j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java

@@ -0,0 +1,8 @@
+//method
+// !specifyLocalVariableTypeByDefault: true
+void foo(boolean b) {
+  String s = null;
+  if (b) {
+      s = "abc";
+  }
+}

j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt

@@ -0,0 +1,7 @@
+// !specifyLocalVariableTypeByDefault: true
+fun foo(b: Boolean) {
+    var s: String? = null
+    if (b) {
+        s = "abc"
+    }
+}

j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java

@@ -0,0 +1,5 @@
+//method
+// !specifyLocalVariableTypeByDefault: true
+void foo(boolean b) {
+  String s = (b ? "abc" : null);
+}

j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt

@@ -0,0 +1,4 @@
+// !specifyLocalVariableTypeByDefault: true
+fun foo(b: Boolean) {
+    val s: String? = (if (b) "abc" else null)
+}

j2k/testData/fileOrElement/nullability/autoNotNull.java

@@ -0,0 +1,9 @@
+//file
+class A {
+    int foo(String s) {
+        if (s != null) {
+            return s.length();
+        }
+        return -1;
+    }
+}

j2k/testData/fileOrElement/nullability/autoNotNull.kt

@@ -0,0 +1,8 @@
+class A {
+    fun foo(s: String?): Int {
+        if (s != null) {
+            return s.length()
+        }
+        return -1
+    }
+}