Migrate boxInline tests to new multi-file framework

compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.2.kt

@@ -1,21 +0,0 @@
-package test
-
-inline public fun String.run(p1: String? = null): String {
-    return this + p1
-}
-
-inline public fun String.run(p1: String = "", lambda: (a: String, b: Int) -> String, p2: Int = 0): String {
-    return lambda(p1, p2) + this
-}
-
-public class Z(val value: Int = 0) {
-
-    inline public fun String.run(p1: String? = null): String? {
-        return this + p1
-    }
-
-    inline public fun String.run(p1: String = "", lambda: (a: String, b: Int) -> String, p2: Int = 0): String {
-        return lambda(p1, p2) + this
-    }
-
-}

compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.kt

@@ -1,3 +1,29 @@
+// FILE: 1.kt
+
+package test
+
+inline public fun String.run(p1: String? = null): String {
+    return this + p1
+}
+
+inline public fun String.run(p1: String = "", lambda: (a: String, b: Int) -> String, p2: Int = 0): String {
+    return lambda(p1, p2) + this
+}
+
+public class Z(val value: Int = 0) {
+
+    inline public fun String.run(p1: String? = null): String? {
+        return this + p1
+    }
+
+    inline public fun String.run(p1: String = "", lambda: (a: String, b: Int) -> String, p2: Int = 0): String {
+        return lambda(p1, p2) + this
+    }
+
+}
+
+// FILE: 2.kt
+
 import test.*
 
 fun testExtensionInClass() : String {

compiler/testData/codegen/boxInline/defaultValues/defaultMethod.2.kt

@@ -1,12 +0,0 @@
-package test
-
-
-inline fun <T> simpleFun(arg: String = "O", lambda: (String) -> T): T {
-    return lambda(arg)
-}
-
-
-inline fun <T> simpleFunR(lambda: (String) -> T, arg: String = "O"): T {
-    return lambda(arg)
-}
-

compiler/testData/codegen/boxInline/defaultValues/defaultMethod.kt

@@ -1,3 +1,19 @@
+// FILE: 1.kt
+
+package test
+
+
+inline fun <T> simpleFun(arg: String = "O", lambda: (String) -> T): T {
+    return lambda(arg)
+}
+
+
+inline fun <T> simpleFunR(lambda: (String) -> T, arg: String = "O"): T {
+    return lambda(arg)
+}
+
+// FILE: 2.kt
+
 import test.*
 
 fun simple(): String {
@@ -19,4 +35,4 @@ fun box(): String {
     if (result != "OOKK") return "fail2: ${result}"
 
     return "OK"
-}
+}

compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt

@@ -1,13 +0,0 @@
-import test.*
-
-fun box(): String {
-    if (Z().run() != "null0") return "fail 1: ${Z().run()}"
-
-    if (Z().run("OK") != "OK0") return "fail 2"
-
-    if (Z().run("OK", { a, b -> a + b }, 1) != "OK1") return "fail 3"
-
-    if (Z().run(lambda = { a: String, b: Int -> a + b }) != "0") return "fail 4"
-
-    return "OK"
-}

compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.2.kt

@@ -1,13 +0,0 @@
-package test
-
-public class Z(public val value: Int = 0) {
-
-    inline public fun run(p1: String? = null): String? {
-        return p1 + value
-    }
-
-
-    inline public fun run(p1: String = "", lambda: (a: String, b: Int) -> String, p2: Int = 0): String {
-        return lambda(p1, p2)
-    }
-}

compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.kt

@@ -0,0 +1,31 @@
+// FILE: 1.kt
+
+package test
+
+public class Z(public val value: Int = 0) {
+
+    inline public fun run(p1: String? = null): String? {
+        return p1 + value
+    }
+
+
+    inline public fun run(p1: String = "", lambda: (a: String, b: Int) -> String, p2: Int = 0): String {
+        return lambda(p1, p2)
+    }
+}
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    if (Z().run() != "null0") return "fail 1: ${Z().run()}"
+
+    if (Z().run("OK") != "OK0") return "fail 2"
+
+    if (Z().run("OK", { a, b -> a + b }, 1) != "OK1") return "fail 3"
+
+    if (Z().run(lambda = { a: String, b: Int -> a + b }) != "0") return "fail 4"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/defaultValues/defaultParamRemapping.1.kt

@@ -1,9 +0,0 @@
-import test.*
-
-fun box(): String {
-    val z = "OK".b { a, b ->
-        a + b
-    }
-
-    return if (z == "s1OK") "OK" else "fail $z"
-}

compiler/testData/codegen/boxInline/defaultValues/defaultParamRemapping.2.kt

@@ -1,5 +0,0 @@
-package test
-
-inline fun a(s1: String = "s1", s2: String = "s2", body: (a1: String, a2: String) -> String) = body(s1, s2)
-
-inline fun String.b(body: (a1: String, a2: String) -> String) = a(s2 = this,  body = body)

compiler/testData/codegen/boxInline/defaultValues/defaultParamRemapping.kt

@@ -0,0 +1,19 @@
+// FILE: 1.kt
+
+package test
+
+inline fun a(s1: String = "s1", s2: String = "s2", body: (a1: String, a2: String) -> String) = body(s1, s2)
+
+inline fun String.b(body: (a1: String, a2: String) -> String) = a(s2 = this,  body = body)
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    val z = "OK".b { a, b ->
+        a + b
+    }
+
+    return if (z == "s1OK") "OK" else "fail $z"
+}

compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.2.kt

@@ -1,5 +0,0 @@
-package test
-
-inline fun getStringInline(): String {
-    return "OK"
-}

compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.kt

@@ -1,3 +1,13 @@
+// FILE: 1.kt
+
+package test
+
+inline fun getStringInline(): String {
+    return "OK"
+}
+
+// FILE: 2.kt
+
 import test.*
 
 fun testCompilation(arg: String = getStringInline()): String {
@@ -23,4 +33,4 @@ fun box(): String {
     if (result != "OKOK") return "fail4: ${result}"
 
     return "OK"
-}
+}

compiler/testData/codegen/boxInline/defaultValues/kt5685.1.kt

@@ -1,10 +0,0 @@
-import test.*
-
-fun box(): String {
-    var s1 = ""
-    val s2 = Measurements().measure("K") {
-        s1 = "O"
-    }
-
-    return s1 + s2
-}

compiler/testData/codegen/boxInline/defaultValues/kt5685.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 class Measurements
@@ -6,4 +8,17 @@ class Measurements
         body()
         return key
     }
-}
+}
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    var s1 = ""
+    val s2 = Measurements().measure("K") {
+        s1 = "O"
+    }
+
+    return s1 + s2
+}

compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.2.kt

@@ -1,17 +0,0 @@
-package test
-
-inline fun emptyFun(arg: String = "O") {
-
-}
-
-inline fun simpleFun(arg: String = "O"): String {
-    val r = arg;
-    return r;
-}
-
-
-inline fun simpleDoubleFun(arg: Double = 1.0): Double {
-    val r = arg + 1;
-    return r;
-}
-

compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.kt

@@ -1,3 +1,24 @@
+// FILE: 1.kt
+
+package test
+
+inline fun emptyFun(arg: String = "O") {
+
+}
+
+inline fun simpleFun(arg: String = "O"): String {
+    val r = arg;
+    return r;
+}
+
+
+inline fun simpleDoubleFun(arg: Double = 1.0): Double {
+    val r = arg + 1;
+    return r;
+}
+
+// FILE: 2.kt
+
 import test.*
 
 fun testCompilation(): String {
@@ -22,4 +43,4 @@ fun box(): String {
     if (result2 != 2.0 + 1.0) return "fail3: ${result2}"
 
     return "OK"
-}
+}