New J2K: Split old j2k and new j2k tests

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -967,15 +967,9 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("nj2k/tests", "j2k/testData") {
-        testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
-            model("fileOrElement", extension = "java")
-        }
-    }
-
     testGroup("nj2k/tests", "nj2k/testData/") {
         testClass<AbstractNullabilityAnalysisTest> {
-            model("fileOrElement")
+            model("nullabilityAnalyzer")
         }
     }
 

j2k/testData/fileOrElement/assertStatement/withStringDetail2.java

@@ -1,3 +1,2 @@
 //statement
-String x = "nya"
 assert true : "string details:" + x;

j2k/testData/fileOrElement/assertStatement/withStringDetail2.kt

@@ -1,2 +1 @@
-val x = "nya"
 assert(true) { "string details:$x" }

j2k/testData/fileOrElement/assignmentExpression/and.java

@@ -1,3 +1,2 @@
 //statement
-int x = 0;
 x &= 2

j2k/testData/fileOrElement/assignmentExpression/and.kt

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

j2k/testData/fileOrElement/assignmentExpression/or.java

@@ -1,3 +1,2 @@
 //statement
-int x = 0;
 x |= 2

j2k/testData/fileOrElement/assignmentExpression/or.kt

@@ -1,2 +1 @@
-var x = 0
 x = x or 2

j2k/testData/fileOrElement/assignmentExpression/shiftLeft.java

@@ -1,3 +1,2 @@
 //statement
-int x = 0;
 x <<= 2

j2k/testData/fileOrElement/assignmentExpression/shiftLeft.kt

@@ -1,2 +1 @@
-var x = 0
 x = x shl 2

j2k/testData/fileOrElement/assignmentExpression/shiftRight.java

@@ -1,3 +1,2 @@
 //statement
-int x = 0;
 x >>= 2

j2k/testData/fileOrElement/assignmentExpression/shiftRight.kt

@@ -1,2 +1 @@
-var x = 0
 x = x shr 2

j2k/testData/fileOrElement/assignmentExpression/unsignedRightShift.java

@@ -1,3 +1,2 @@
 //statement
-int x = 0;
 x >>>= 2

j2k/testData/fileOrElement/assignmentExpression/unsignedRightShift.kt

@@ -1,2 +1 @@
-var x = 0
 x = x ushr 2

j2k/testData/fileOrElement/assignmentExpression/xor.java

@@ -1,3 +1,2 @@
 //statement
-int x = 0;
 x ^= 2

j2k/testData/fileOrElement/assignmentExpression/xor.kt

@@ -1,2 +1 @@
-var x = 0
 x = x xor 2

j2k/testData/fileOrElement/binaryExpression/and.java

@@ -1,3 +1,2 @@
-//statement
+//expression
-int x = 2;
+x & 2
-x & 2;

j2k/testData/fileOrElement/binaryExpression/and.kt

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

j2k/testData/fileOrElement/binaryExpression/or.java

@@ -1,3 +1,2 @@
-//statement
+//expression
-int x = 0;
+x | 2
-x | 2;

j2k/testData/fileOrElement/binaryExpression/or.kt

@@ -1,2 +1 @@
-val x = 0
 x or 2

j2k/testData/fileOrElement/binaryExpression/shiftLeft.java

@@ -1,3 +1,2 @@
-//statement
+//expression
-int x = 0;
+x << 2
-x << 2;

j2k/testData/fileOrElement/binaryExpression/shiftLeft.kt

@@ -1,2 +1 @@
-val x = 0
 x shl 2

j2k/testData/fileOrElement/binaryExpression/shiftRight.java

@@ -1,3 +1,2 @@
-//statement
+//expression
-int x = 0;
+x >> 2
-x >> 2;

j2k/testData/fileOrElement/binaryExpression/shiftRight.kt

@@ -1,2 +1 @@
-val x = 0
 x shr 2

j2k/testData/fileOrElement/binaryExpression/unsignedRightShift.java

@@ -1,3 +1,2 @@
-//statement
+//expression
-int x = 0;
+x >>> 2
-x >>> 2;

j2k/testData/fileOrElement/binaryExpression/unsignedRightShift.kt

@@ -1,2 +1 @@
-val x = 0
 x.ushr(2)

j2k/testData/fileOrElement/binaryExpression/xor.java

@@ -1,3 +1,2 @@
-//statement
+//expression
-int x = 0;
+x ^ 2
-x ^ 2;

j2k/testData/fileOrElement/binaryExpression/xor.kt

@@ -1,2 +1 @@
-val x = 0
 x xor 2

j2k/testData/fileOrElement/blocks/Blocks.java

@@ -1,5 +1,4 @@
 //method
-void bar(int a) {}
 void foo() {
     {
         int a = 1;

j2k/testData/fileOrElement/blocks/Blocks.kt

@@ -1,4 +1,3 @@
-fun bar(a: Int) {}
 fun foo() {
     run {
         val a = 1

j2k/testData/fileOrElement/boxedType/boolean.java

@@ -1,2 +1,2 @@
 //statement
-Boolean i = false;
+Boolean i = 10;

j2k/testData/fileOrElement/boxedType/boolean.kt

@@ -1 +1 @@
-val i = false
+val i = 10

j2k/testData/fileOrElement/class/anonymousClass.java

@@ -6,7 +6,7 @@ public class Test {
     private Listener listener = new Listener() {
         @Override
         public void onChange(int visibility) {
-            int a = (visibility & 1)
+            val a = (visibility & 1)
         }
     }
 }

j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java

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

j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.kt

@@ -1,3 +1 @@
-internal interface I
-internal open class Base
 internal class A : Base(), I

j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java

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

j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -1,5 +1 @@
-internal open class Base
-internal interface I0
-internal interface I1
-internal interface I2
 internal class A : Base(), I0, I1, I2

j2k/testData/fileOrElement/class/simpleInheritance.java

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

j2k/testData/fileOrElement/class/simpleInheritance.kt

@@ -1,2 +1 @@
-internal open class Base
 internal class A : Base()

j2k/testData/fileOrElement/constructors/customerBuilder.kt

@@ -12,7 +12,6 @@ internal class Customer(val firstName: String, val lastName: String) {
 }
 
 internal class CustomerBuilder {
-    var _firstName = "Homer"
     var _firstName = "Homer"
     var _lastName = "Simpson"
 

j2k/testData/fileOrElement/doWhileStatement/whileWithBlock.java

@@ -1,4 +1,2 @@
 //statement
-int a = 0;
-int b = 0;
 do {int i = 1; i = i + 1;} while (a > b)

j2k/testData/fileOrElement/doWhileStatement/whileWithBlock.kt

@@ -1,5 +1,3 @@
-val a = 0
-val b = 0
 do {
     var i = 1
     i = i + 1

j2k/testData/fileOrElement/doWhileStatement/whileWithExpression.java

@@ -1,3 +1,2 @@
 //statement
-int i = 0;
+do i = i + 1; while (true)
-do i = i + 1; while (true);

j2k/testData/fileOrElement/doWhileStatement/whileWithExpression.kt

@@ -1,2 +1 @@
-var i = 0
 do i = i + 1 while (true)

j2k/testData/fileOrElement/docComments/deprecatedDocTagWithAnnotation.java

@@ -1,12 +1,12 @@
+/**
+ * This is a deprecated class.
+ * @deprecated This class is deprecated
+ */
+@Deprecated
+class TestDeprecated {
     /**
-     * This is a deprecated class.
+     * @deprecated This method is deprecated
-     * @deprecated This class is deprecated
      */
     @Deprecated
-    class TestDeprecated {
+    public void deprecatedMethod() {}
-        /**
+}
-         * @deprecated This method is deprecated
-         */
-        @Deprecated
-        public void deprecatedMethod() {}
-    }

j2k/testData/fileOrElement/field/valWithInit.java

@@ -1,7 +1,3 @@
-class Foo {
-    Foo(int a, int b) {}
-}
-
 class C {
 final Foo f = new Foo(1, 2);
 }

j2k/testData/fileOrElement/field/valWithInit.kt

@@ -1,5 +1,4 @@
-internal class Foo(a: Int, b: Int)
+// ERROR: Unresolved reference: Foo
-
 internal class C {
     val f = Foo(1, 2)
 }

j2k/testData/fileOrElement/field/varWithInit.java

@@ -1,7 +1,3 @@
-class Foo {
-    Foo(int a, int b) {}
-}
-
 class C {
 Foo f = new Foo(1, 2);
 }

j2k/testData/fileOrElement/field/varWithInit.kt

@@ -1,5 +1,4 @@
-internal class Foo(a: Int, b: Int)
+// ERROR: Unresolved reference: Foo
-
 internal class C {
     var f = Foo(1, 2)
 }

j2k/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java

@@ -1,3 +1,2 @@
 //statement
-int j = 0;
 for (int i = 0; i < 0; j++, i++) {int i = 1; i++;}

j2k/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.kt

@@ -1,4 +1,3 @@
-var j = 0
 var i = 0
 while (i < 0) {
     run {

j2k/testData/fileOrElement/for/forWithEmptyBlock.java

@@ -1,3 +1,2 @@
 //statement
-int j = 0;
 for (int i = 0; i < 0; j++, i++) {}

j2k/testData/fileOrElement/for/forWithEmptyBlock.kt

@@ -1,4 +1,3 @@
-var j = 0
 var i = 0
 while (i < 0) {
     j++

j2k/testData/fileOrElement/for/forWithExpression.java

@@ -1,3 +1,2 @@
 //statement
-int t = 0;
 for (int i = 0; i < 0; i++) t++;

j2k/testData/fileOrElement/for/forWithExpression.kt

@@ -1,2 +1 @@
-var t = 0
 for (i in 0..-1) t++

j2k/testData/fileOrElement/for/forWithReturn.java

@@ -1,3 +1,2 @@
 //statement
-int j = 0;
 for (int i = 0; i < 0; j++, i++) return i;

j2k/testData/fileOrElement/for/forWithReturn.kt

@@ -1,4 +1,3 @@
-var j = 0
 var i = 0
 while (i < 0) {
     return i

j2k/testData/fileOrElement/for/infiniteFor.java

@@ -1,7 +1,4 @@
 //method
-boolean stop() {
-    return false;
-}
 void foo() {
     for(;;) {
         if (!stop()) break;

j2k/testData/fileOrElement/for/infiniteFor.kt

@@ -1,7 +1,3 @@
-fun stop(): Boolean {
-    return false
-}
-
 fun foo() {
     while (true) {
         if (!stop()) break

j2k/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java

@@ -1,3 +1,2 @@
 //statement
-int i = 0;
 for (Node n : list) i++;

j2k/testData/fileOrElement/foreachStatement/enhancedForWithExpression.kt

@@ -1,2 +1 @@
-var i = 0
 for (n in list) i++

j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.new.kt

@@ -1,3 +0,0 @@
-internal open class Base(name: String)
-
-internal class One(name: String, private val mySecond: String) : Base(name)

j2k/testData/fileOrElement/issues/kt-807.java

@@ -1,5 +1,4 @@
 import java.io.*;
-import java.io.*;
 
 class FileRead {
     public static void main(String args[]) {

j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java

@@ -1,9 +1,10 @@
 //file
-
 import kotlinApi.KotlinClass;
 
 class C {
     int foo() {
-        KotlinClass.Companion.getStaticVar()
+        KotlinClass.staticVar = KotlinClass.staticVar * 2;
+        KotlinClass.Companion.setStaticProperty(KotlinClass.Companion.getStaticVar() + KotlinClass.Companion.getStaticProperty());
+        return KotlinClass.Companion.staticFun(1);
     }
 }

j2k/testData/fileOrElement/methodCallExpression/stringMethods.java

@@ -132,3 +132,4 @@ class A {
     }
 
     void useSplit(String[] result) {}
+}

j2k/testData/fileOrElement/newClassExpression/classWithParam.java

@@ -1,9 +1,2 @@
-//class
+//expression
-class Foo {
+new Foo(param);
-    Foo(int a, int b) {
-    }
-
-    void foo() {
-        Foo f = new Foo(1, 2);
-    }
-}

j2k/testData/fileOrElement/newClassExpression/classWithParam.kt

@@ -1,6 +1 @@
-internal class Foo(a: Int, b: Int) {
+Foo(param)
-
-    fun foo() {
-        val f = Foo(1, 2)
-    }
-}

j2k/testData/fileOrElement/newClassExpression/classWithParams.java

@@ -1,9 +1,2 @@
-//class
+//expression
-class Foo {
+new Foo(param1, param2);
-    Foo(int a, int b) {
-    }
-
-    void foo() {
-        Foo f = new Foo(1, 2);
-    }
-}

j2k/testData/fileOrElement/newClassExpression/classWithParams.kt

@@ -1,6 +1 @@
-internal class Foo(a: Int, b: Int) {
+Foo(param1, param2)
-
-    fun foo() {
-        val f = Foo(1, 2)
-    }
-}

j2k/testData/fileOrElement/newClassExpression/classWithoutBody.java

@@ -1,7 +1,2 @@
-//class
+//expression
-class Foo {}
+new Foo();
-class Bar {
-    void bar() {
-        new Foo()
-    }
-}

j2k/testData/fileOrElement/newClassExpression/classWithoutBody.kt

@@ -1,6 +1 @@
-internal class Foo
+Foo()
-internal class Bar {
-    fun bar() {
-        Foo()
-    }
-}

j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java

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

j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt

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

j2k/testData/fileOrElement/parenthesizedExpression/parenthesized2.java

@@ -1,3 +1,2 @@
-//statement
+//expression
-Character str = ''
+(str.toString() + "abc").foo()
-(str.toString() + "abc").length()

j2k/testData/fileOrElement/parenthesizedExpression/parenthesized2.kt

@@ -1,2 +1 @@
-val str = ''
+(str.toString() + "abc").foo()
-(str.toString() + "abc").length

j2k/testData/fileOrElement/postfixOperator/decrement.java

@@ -1,3 +1,2 @@
 //statement
-int i = 0
 i--;

j2k/testData/fileOrElement/postfixOperator/decrement.kt

@@ -1,2 +1 @@
-var i = 0
 i--

j2k/testData/fileOrElement/postfixOperator/increment.java

@@ -1,3 +1,2 @@
 //statement
-int i = 0
 i++;

j2k/testData/fileOrElement/postfixOperator/increment.kt

@@ -1,2 +1 @@
-var i = 0
 i++

j2k/testData/fileOrElement/prefixOperator/decrement.java

@@ -1,3 +1,2 @@
 //statement
-int i = 0;
 --i;

j2k/testData/fileOrElement/prefixOperator/decrement.kt

@@ -1,2 +1 @@
-var i = 0
 --i

j2k/testData/fileOrElement/prefixOperator/increment.java

@@ -1,3 +1,2 @@
 //statement
-int i = 0;
 ++i;

j2k/testData/fileOrElement/prefixOperator/increment.kt

@@ -1,2 +1 @@
-var i = 0
 ++i

j2k/testData/fileOrElement/switch/fallDownWithBlocks.java

@@ -1,16 +1,16 @@
 //file
-    public class C {
+public class C {
-        public static void main(String[] args) {
+    public static void main(String[] args) {
-            switch (args.length) {
+        switch (args.length) {
-                case 1: {
+            case 1: {
-                    int a = 1;
+                int a = 1;
-                    System.out.print("1");
+                System.out.print("1");
-                }
+            }
 
-                case 2: {
+            case 2: {
-                    int a = 2;
+                int a = 2;
-                    System.out.print("2");
+                System.out.print("2");
-                }
             }
         }
     }
+}

j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java

@@ -1,5 +1,2 @@
 //class
-interface I0 {}
-interface I1 {}
-interface I2 {}
 interface A extends I0, I1, I2 {}

j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -1,4 +1 @@
-internal interface I0
-internal interface I1
-internal interface I2
 internal interface A : I0, I1, I2

j2k/testData/fileOrElement/trait/extendsOneInterface.java

@@ -1,2 +1,2 @@
-interface I {}
+//class
 interface A extends I {}

j2k/testData/fileOrElement/trait/extendsOneInterface.kt

@@ -1,2 +1 @@
-internal interface I
 internal interface A : I

j2k/testData/fileOrElement/trait/interfaceWithFields.java

@@ -1,2 +1,2 @@
 //class
-interface INode {String IN = "in";String AT = "@";String COMMA_WITH_SPACE = IN + AT;}
+interface INode {String IN = "in";String AT = "@";String COMMA_WITH_SPACE = COMMA + SPACE;}

j2k/testData/fileOrElement/trait/interfaceWithFields.kt

@@ -2,6 +2,6 @@ internal interface INode {
     companion object {
         val IN = "in"
         val AT = "@"
-        val COMMA_WITH_SPACE = IN + AT
+        val COMMA_WITH_SPACE = COMMA + SPACE
     }
 }

j2k/testData/fileOrElement/trait/interfaceWithStaticFields.java

@@ -1,2 +1,2 @@
 //class
-public interface INode {  public static final String IN = "in";  public static final String AT = "@";  public static final String COMMA_WITH_SPACE = IN + AT;}
+public interface INode {  public static final String IN = "in";  public static final String AT = "@";  public static final String COMMA_WITH_SPACE = COMMA + SPACE;}

j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt

@@ -2,6 +2,6 @@ interface INode {
     companion object {
         val IN = "in"
         val AT = "@"
-        val COMMA_WITH_SPACE = IN + AT
+        val COMMA_WITH_SPACE = COMMA + SPACE
     }
 }

j2k/testData/fileOrElement/typeCastExpression/castNullObject.java

@@ -1,2 +1,2 @@
-//statement
+//expression
-Object o = (Object) null
+(Object) null

j2k/testData/fileOrElement/typeCastExpression/castNullObject.kt

@@ -1 +1 @@
-val o = null as Any?
+null as Any?

j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java

@@ -1,4 +1,2 @@
-interface INode {}
+//class
-interface Node {}
+final class CC <T extends INode & Comparable<? super T>, K extends Node & Collection<? super K>> extends A {}
-class A {}
-final class CC <T extends INode & Comparable<? super T>, K extends Node & Collection<? extends K>> extends A {}

j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt

@@ -1,4 +1 @@
-internal interface INode
+internal class CC<T : INode, K : Node> : A() where T : Comparable<T>, K : Collection<in K>
-internal interface Node
-internal open class A
-internal class CC<T : INode, K : Node> : A() where T : Comparable<T>, K : Collection<K>

j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java

@@ -1,2 +1,2 @@
-interface INode {}
+//class
 final class C<T extends INode & Comparable<? super T>> {}

j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.kt

@@ -1,2 +1 @@
-internal interface INode
 internal class C<T : INode> where T : Comparable<T>

j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java

@@ -1,4 +1,2 @@
-interface INode {}
+//class
-class A {}
-
 final class C<T extends INode & Comparable<? super T>> extends A {}

j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt

@@ -1,4 +1 @@
-internal interface INode
-internal open class A
-
 internal class C<T : INode> : A() where T : Comparable<T>

j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java

@@ -1,5 +1,2 @@
-interface INode {}
+//class
-interface Node {}
+interface I <T extends INode & Comparable<? super T>, K extends Node & Collection<? super K>> extends II {}
-interface II {}
-
-interface I <T extends INode & Comparable<? super T>, K extends Node & Collection<? extends K>> extends II {}