Migrate boxWithJava tests to multi-file framework

compiler/testData/codegen/java8/box/defaultMethodCallFromInterface.kt

@@ -0,0 +1,28 @@
+// FILE: Simple.java
+
+public interface Simple {
+    default String test(String s) {
+        return s + "K";
+    }
+
+    static String testStatic(String s) {
+        return s + "K";
+    }
+}
+
+// FILE: main.kt
+
+interface KInterface : Simple {
+    fun bar(): String {
+        return test("O") + Simple.testStatic("O")
+    }
+}
+
+class Test : KInterface {}
+
+fun box(): String {
+    val test = Test().bar()
+    if (test != "OKOK") return "fail $test"
+
+    return "OK"
+}

compiler/testData/codegen/java8/box/defaultMethodCallViaClass.kt

@@ -0,0 +1,22 @@
+// FILE: Simple.java
+
+interface Simple {
+    default String test(String s) {
+        return s + "K";
+    }
+
+    static String testStatic(String s) {
+        return s + "K";
+    }
+}
+
+// FILE: main.kt
+
+class Test : Simple {}
+
+fun box(): String {
+    val test = Test().test("O")
+    if (test != "OK") return "fail $test"
+
+    return Simple.testStatic("O")
+}

compiler/testData/codegen/java8/box/defaultMethodCallViaInterface.kt

@@ -0,0 +1,23 @@
+// FILE: Simple.java
+
+public interface Simple {
+    default String test(String s) {
+        return s + "K";
+    }
+
+    static String testStatic(String s) {
+        return s + "K";
+    }
+}
+
+// FILE: main.kt
+
+interface TestInterface : Simple {}
+class Test : TestInterface {}
+
+fun box(): String {
+    val test = Test().test("O")
+    if (test != "OK") return "fail $test"
+
+    return Simple.testStatic("O")
+}

compiler/testData/codegen/java8/box/defaultMethodOverride.kt

@@ -0,0 +1,23 @@
+// FILE: Simple.java
+
+public interface Simple {
+    default String test(String s) {
+        return s + "Fail";
+    }
+}
+
+// FILE: main.kt
+
+interface KInterface: Simple {
+    override fun test(s: String): String {
+        return s + "K"
+    }
+}
+
+class Test : KInterface {
+
+}
+
+fun box(): String {
+    return Test().test("O")
+}

compiler/testData/codegen/java8/box/dontDelegateToDefaultMethods.kt

@@ -1,3 +1,16 @@
+// FILE: Test.java
+
+interface Test<T> {
+
+    T call();
+
+    default T testDefault(T p) {
+        return p;
+    }
+}
+
+// FILE: main.kt
+
 class Child : Test<String> {
     override fun call() : String {
         return "OK"

compiler/testData/codegen/java8/box/inheritKotlin.kt

@@ -1,15 +1,23 @@
-interface KTrait {
+// FILE: Simple.java
+
+interface Simple extends KInterface {
+    default String test() {
+        return "simple";
+    }
+}
+
+// FILE: main.kt
+
+interface KInterface {
     fun test(): String {
         return "base";
     }
 }
 
 class Test : Simple {
-
     fun bar(): String {
         return super.test()
     }
-
 }
 
 fun box(): String {
@@ -20,4 +28,4 @@ fun box(): String {
     if (bar != "simple") return "fail 2 $bar"
 
     return "OK"
-}
+}

compiler/testData/codegen/java8/box/invokeDefaultViaSuper.kt

@@ -1,4 +1,14 @@
-interface KTrait : Test {
+// FILE: Test.java
+
+public interface Test {
+    default String test() {
+        return "OK";
+    }
+}
+
+// FILE: test.kt
+
+interface KInterface : Test {
 
 }
 
@@ -8,7 +18,7 @@ class KClass : Test {
     }
 }
 
-class KTClass : KTrait {
+class KTClass : KInterface {
     fun ktest(): String {
         return super.test() + test()
     }
@@ -16,7 +26,7 @@ class KTClass : KTrait {
 
 
 fun box(): String {
-    val p = object : KTrait {
+    val p = object : KInterface {
         fun ktest(): String {
             return super.test() + test()
         }

compiler/testData/codegen/java8/box/longChainOfKotlinExtendsFromJavaWithDefault.kt

@@ -1,3 +1,13 @@
+// FILE: Base.java
+
+public interface Base {
+    default String foo() {
+        return "OK";
+    }
+}
+
+// FILE: derived.kt
+
 interface K1 : Base
 
 interface K2 : K1

compiler/testData/codegen/java8/box/reflection/realParameterNames.kt

@@ -1,3 +1,12 @@
+// FILE: J.java
+
+public class J {
+    public J(String constructorParam) {}
+
+    public static void foo(int methodParam) {}
+}
+
+// FILE: K.kt
 // JAVAC_OPTIONS: -parameters
 
 import kotlin.test.assertEquals

compiler/testData/codegen/java8/box/reflection/synthesizedParameterNames.kt

@@ -1,3 +1,13 @@
+// FILE: J.java
+
+public class J {
+    public J(String constructorParam) {}
+
+    public static void foo(int methodParam) {}
+}
+
+// FILE: K.kt
+
 import kotlin.test.assertEquals
 
 fun box(): String {

compiler/testData/codegen/java8/box/samOnInterfaceWithDefaultMethod.kt

@@ -0,0 +1,28 @@
+// FILE: JavaCall.java
+
+class JavaCall {
+    String call(Test test) {
+        return test.call();
+    }
+}
+
+// FILE: Test.java
+
+interface Test {
+
+    String call();
+
+    default String test() {
+        return "K";
+    }
+
+    static String testStatic() {
+        return "K";
+    }
+}
+
+// FILE: sam.kt
+
+fun box(): String {
+    return JavaCall().call {"OK"}
+}

compiler/testData/codegen/java8/boxWithJava/defaultMethodCallFromTrait/Simple.java

@@ -1,9 +0,0 @@
-public interface Simple {
-    default String test(String s) {
-        return s + "K";
-    }
-
-    static String testStatic(String s) {
-        return s + "K";
-    }
-}

compiler/testData/codegen/java8/boxWithJava/defaultMethodCallFromTrait/defaultCall.kt

@@ -1,14 +0,0 @@
-interface KTrait : Simple {
-    fun bar(): String {
-        return test("O") + Simple.testStatic("O")
-    }
-}
-
-class Test : KTrait {}
-
-fun box(): String {
-    val test = Test().bar()
-    if (test != "OKOK") return "fail $test"
-
-    return "OK"
-}

compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaClass/Simple.java

@@ -1,9 +0,0 @@
-interface Simple {
-    default String test(String s) {
-        return s + "K";
-    }
-
-    static String testStatic(String s) {
-        return s + "K";
-    }
-}

compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaClass/defaultCall.kt

@@ -1,8 +0,0 @@
-class Test : Simple {}
-
-fun box(): String {
-    val test = Test().test("O")
-    if (test != "OK") return "fail $test"
-
-    return Simple.testStatic("O")
-}

compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaTrait/Simple.java

@@ -1,9 +0,0 @@
-public interface Simple {
-    default String test(String s) {
-        return s + "K";
-    }
-
-    static String testStatic(String s) {
-        return s + "K";
-    }
-}

compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaTrait/defaultMethodCallViaTrait.kt

@@ -1,9 +0,0 @@
-interface TestTrait : Simple {}
-class Test : TestTrait {}
-
-fun box(): String {
-    val test = Test().test("O")
-    if (test != "OK") return "fail $test"
-
-    return Simple.testStatic("O")
-}

compiler/testData/codegen/java8/boxWithJava/defaultMethodOverride/Simple.java

@@ -1,5 +0,0 @@
-public interface Simple {
-    default String test(String s) {
-        return s + "Fail";
-    }
-}

compiler/testData/codegen/java8/boxWithJava/defaultMethodOverride/override.kt

@@ -1,13 +0,0 @@
-interface KTrait: Simple {
-    override fun test(s: String): String {
-        return s + "K"
-    }
-}
-
-class Test : KTrait {
-
-}
-
-fun box(): String {
-    return Test().test("O")
-}

compiler/testData/codegen/java8/boxWithJava/dontDelegateToDefaultMethods/Test.java

@@ -1,8 +0,0 @@
-interface Test<T> {
-
-    T call();
-
-    default T testDefault(T p) {
-        return p;
-    }
-}

compiler/testData/codegen/java8/boxWithJava/inheritKotlin/Simple.java

@@ -1,5 +0,0 @@
-interface Simple extends KTrait {
-    default String test() {
-        return "simple";
-    }
-}

compiler/testData/codegen/java8/boxWithJava/invokeDefaultViaSuper/Test.java

@@ -1,5 +0,0 @@
-public interface Test {
-    default String test() {
-        return "OK";
-    }
-}

compiler/testData/codegen/java8/boxWithJava/longChainOfKotlinExtendsFromJavaWithDefault/Base.java

@@ -1,5 +0,0 @@
-public interface Base {
-    default String foo() {
-        return "OK";
-    }
-}

compiler/testData/codegen/java8/boxWithJava/reflection/realParameterNames/J.java

@@ -1,5 +0,0 @@
-public class J {
-    public J(String constructorParam) {}
-
-    public static void foo(int methodParam) {}
-}

compiler/testData/codegen/java8/boxWithJava/reflection/synthesizedParameterNames/J.java

@@ -1,5 +0,0 @@
-public class J {
-    public J(String constructorParam) {}
-
-    public static void foo(int methodParam) {}
-}

compiler/testData/codegen/java8/boxWithJava/samOnInterfaceWithDefaultMethod/JavaCall.java

@@ -1,5 +0,0 @@
-class JavaCall {
-    String call(Test test) {
-        return test.call();
-    }
-}

compiler/testData/codegen/java8/boxWithJava/samOnInterfaceWithDefaultMethod/Test.java

@@ -1,12 +0,0 @@
-interface Test {
-
-    String call();
-
-    default String test() {
-        return "K";
-    }
-
-    static String testStatic() {
-        return "K";
-    }
-}

compiler/testData/codegen/java8/boxWithJava/samOnInterfaceWithDefaultMethod/sam.kt

@@ -1,3 +0,0 @@
-fun box(): String {
-    return JavaCall().call {"OK"}
-}