Migrate boxWithJava tests to multi-file framework

compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinProperty.kt

@@ -1,3 +1,5 @@
+// FILE: JavaClass.java
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -13,4 +15,18 @@ public class JavaClass {
         return KotlinClass.FOO_STRING +
                JavaClass.class.getMethod("test").getAnnotation(Foo.class).value();
     }
-}
+}
+
+// FILE: kotlinClass.kt
+
+class KotlinClass {
+    companion object {
+        const val FOO_INT: Int = 10
+        @JvmField val FOO_STRING: String = "OK"
+    }
+}
+
+fun box(): String {
+    val test = JavaClass().test()
+    return if (test == "OK10") "OK" else "fail : $test"
+}

compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinProperty/kotlinClass.kt

@@ -1,11 +0,0 @@
-class KotlinClass {
-    companion object {
-        const val FOO_INT: Int = 10
-        @JvmField val FOO_STRING: String = "OK"
-    }
-}
-
-fun box(): String {
-    val test = JavaClass().test()
-    return if (test == "OK10") "OK" else "fail : $test"
-}

compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinPropertyFromInterfaceCompanion.kt

@@ -1,3 +1,5 @@
+// FILE: JavaClass.java
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -13,4 +15,18 @@ public class JavaClass {
         return KotlinInterface.FOO_STRING +
                JavaClass.class.getMethod("test").getAnnotation(Foo.class).value();
     }
-}
+}
+
+// FILE: KotlinInterface.kt
+
+interface KotlinInterface {
+    companion object {
+        const val FOO_INT: Int = 10
+        const  val FOO_STRING: String = "OK"
+    }
+}
+
+fun box(): String {
+    val test = JavaClass().test()
+    return if (test == "OK10") "OK" else "fail : $test"
+}

compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinPropertyFromInterfaceCompanion/KotlinInterface.kt

@@ -1,11 +0,0 @@
-interface KotlinInterface {
-    companion object {
-        const val FOO_INT: Int = 10
-        const  val FOO_STRING: String = "OK"
-    }
-}
-
-fun box(): String {
-    val test = JavaClass().test()
-    return if (test == "OK10") "OK" else "fail : $test"
-}

compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt

@@ -1,22 +0,0 @@
-class Klass {
-    companion object {
-        const val NAME = "Klass"
-        @JvmField val JVM_NAME = "JvmKlass"
-    }
-}
-
-interface Trait {
-    companion object {
-        const val NAME = "Trait"
-    }
-}
-
-enum class Enoom {
-    ;
-    companion object {
-        const val NAME = "Enum"
-        @JvmField val JVM_NAME = "JvmEnum"
-    }
-}
-
-fun box() = Test().test()

compiler/testData/codegen/boxWithJava/properties/collectionSize.kt

@@ -1,3 +1,12 @@
+// FILE: Test.java
+
+public class Test extends java.util.ArrayList<String> {
+    public final int size() {
+        return 56;
+    }
+}
+
+// FILE: test.kt
 
 class OurTest : Test()
 

compiler/testData/codegen/boxWithJava/properties/collectionSize/Test.java

@@ -1,5 +0,0 @@
-public class Test extends java.util.ArrayList<String> {
-    public final int size() {
-        return 56;
-    }
-}

compiler/testData/codegen/boxWithJava/properties/commonProperties.kt

@@ -1,3 +1,32 @@
+// FILE: J.java
+
+public class J extends A {
+
+    public boolean okField = false;
+
+    public int getValProp() {
+        return 123;
+    }
+
+    public int getVarProp() {
+        return 456;
+    }
+
+    public void setVarProp(int x) {
+        okField = true;
+    }
+
+    public int isProp() {
+        return 789;
+    }
+
+    public void setProp(int x) {
+        okField = true;
+    }
+}
+
+// FILE: test.kt
+
 open class A {
     open val valProp: Int = -1
     open var varProp: Int = -1

compiler/testData/codegen/boxWithJava/properties/commonProperties/J.java

@@ -1,24 +0,0 @@
-public class J extends A {
-
-    public boolean okField = false;
-
-    public int getValProp() {
-        return 123;
-    }
-
-    public int getVarProp() {
-        return 456;
-    }
-
-    public void setVarProp(int x) {
-        okField = true;
-    }
-
-    public int isProp() {
-        return 789;
-    }
-
-    public void setProp(int x) {
-        okField = true;
-    }
-}

compiler/testData/codegen/boxWithJava/properties/companionObjectProperties.kt

@@ -1,3 +1,5 @@
+// FILE: Test.java
+
 class Test {
     String test() {
         String s;
@@ -20,3 +22,28 @@ class Test {
         return "OK";
     }
 }
+
+// FILE: test.kt
+
+class Klass {
+    companion object {
+        const val NAME = "Klass"
+        @JvmField val JVM_NAME = "JvmKlass"
+    }
+}
+
+interface Trait {
+    companion object {
+        const val NAME = "Trait"
+    }
+}
+
+enum class Enoom {
+    ;
+    companion object {
+        const val NAME = "Enum"
+        @JvmField val JVM_NAME = "JvmEnum"
+    }
+}
+
+fun box() = Test().test()

compiler/testData/codegen/boxWithJava/properties/protectedJavaProperty.kt

@@ -1,3 +1,20 @@
+// FILE: JavaBaseClass.java
+
+public class JavaBaseClass {
+
+    private String field = "fail";
+
+    protected String getFoo() {
+        return field;
+    }
+
+    protected void setFoo(String foo) {
+        field = foo;
+    }
+}
+
+// FILE: kotlin.kt
+
 package z
 
 import JavaBaseClass
@@ -16,4 +33,4 @@ fun runSlowly(f: () -> String): String {
 
 fun box(): String {
     return KotlinExtender.test()
-}
+}

compiler/testData/codegen/boxWithJava/properties/protectedJavaProperty/JavaBaseClass.java

@@ -1,12 +0,0 @@
-public class JavaBaseClass {
-
-    private String field = "fail";
-
-    protected String getFoo() {
-        return field;
-    }
-
-    protected void setFoo(String foo) {
-        field = foo;
-    }
-}

compiler/testData/codegen/boxWithJava/properties/protectedJavaPropertyInCompanion.kt

@@ -1,3 +1,20 @@
+// FILE: JavaBaseClass.java
+
+public class JavaBaseClass {
+
+    private String field = "fail";
+
+    protected String getFoo() {
+        return field;
+    }
+
+    protected void setFoo(String foo) {
+        field = foo;
+    }
+}
+
+// FILE: kotlin.kt
+
 package z
 
 import JavaBaseClass
@@ -24,4 +41,4 @@ fun box(): String {
     if (a.foo != "Kotlin") return "fail"
 
     return A.test()
-}
+}

compiler/testData/codegen/boxWithJava/properties/protectedJavaPropertyInCompanion/JavaBaseClass.java

@@ -1,12 +0,0 @@
-public class JavaBaseClass {
-
-    private String field = "fail";
-
-    protected String getFoo() {
-        return field;
-    }
-
-    protected void setFoo(String foo) {
-        field = foo;
-    }
-}

compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField.kt

@@ -1,3 +1,11 @@
+// FILE: Test.java
+
+public abstract class Test<F> {
+    protected final F value = null;
+}
+
+// FILE: test.kt
+
 class A : Test<String>() {
     fun foo(): String? = value
 }

compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField/Test.java

@@ -1,3 +0,0 @@
-public abstract class Test<F> {
-    protected final F value = null;
-}