New J2K: Split old j2k and new j2k tests

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/interfaceWithFields.new.kt

@@ -1,7 +0,0 @@
-internal interface INode {
-    companion object {
-        const val IN = "in"
-        const val AT = "@"
-        const val COMMA_WITH_SPACE = IN + AT
-    }
-}

j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.new.kt

@@ -1,4 +0,0 @@
-internal interface INode {
-    val tag: Tag?
-    fun toKotlin(): String?
-}

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/trait/interfaceWithStaticFields.new.kt

@@ -1,7 +0,0 @@
-interface INode {
-    companion object {
-        const val IN = "in"
-        const val AT = "@"
-        const val COMMA_WITH_SPACE = IN + AT
-    }
-}