Remove traces of 'boxWithStdlib' directory in other tests

compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java

@@ -105,7 +105,7 @@ public class CodegenTestsOnAndroidRunner {
     /*
     Output example:
     [exec] Error in testKt344:
-    [exec] java.lang.RuntimeException: File: compiler\testData\codegen\boxWithStdlib\regressions\kt344.kt
+    [exec] java.lang.RuntimeException: File: compiler\testData\codegen\box\regressions\kt344.kt
     [exec] 	at org.jetbrains.kotlin.android.tests.AbstractCodegenTestCaseOnAndroid.invokeBoxMethod(AbstractCodegenTestCaseOnAndroid.java:38)
     [exec] 	at org.jetbrains.kotlin.android.tests.CodegenTestCaseOnAndroid.testKt344(CodegenTestCaseOnAndroid.java:595)
     [exec] 	at java.lang.reflect.Method.invokeNative(Native Method)
@@ -114,9 +114,9 @@ public class CodegenTestsOnAndroidRunner {
     [exec] 	at java.lang.reflect.Method.invokeNative(Native Method)
     [exec] 	at org.jetbrains.kotlin.android.tests.AbstractCodegenTestCaseOnAndroid.invokeBoxMethod(AbstractCodegenTestCaseOnAndroid.java:35)
     [exec] 	... 13 more
-    [exec] Caused by: java.lang.VerifyError: compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage$t6$foo$1
-    [exec] 	at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.t6(dummy.kt:94)
-    [exec] 	at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.box(dummy.kt:185)
+    [exec] Caused by: java.lang.VerifyError: compiler_testData_codegen_box_regressions_kt344_kt.Compiler_testData_codegen_box_regressions_kt344_ktPackage$t6$foo$1
+    [exec] 	at compiler_testData_codegen_box_regressions_kt344_kt.Compiler_testData_codegen_box_regressions_kt344_ktPackage.t6(dummy.kt:94)
+    [exec] 	at compiler_testData_codegen_box_regressions_kt344_kt.Compiler_testData_codegen_box_regressions_kt344_ktPackage.box(dummy.kt:185)
     [exec] 	... 16 more
     [exec] ...............
     [exec] Error in testKt529:

compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java

@@ -106,7 +106,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
         p.println("public class ", testClassName, " extends ", baseTestClassName, " {");
         p.pushIndent();
 
-        generateTestMethodsForDirectories(p, new File("compiler/testData/codegen/box"), new File("compiler/testData/codegen/boxWithStdlib"));
+        generateTestMethodsForDirectories(p, new File("compiler/testData/codegen/box"));
 
         p.popIndent();
         p.println("}");
@@ -218,14 +218,9 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
                     String packageName = file.getPath().replaceAll("\\\\|-|\\.|/", "_");
                     text = changePackage(packageName, text);
 
-                    if (!file.getCanonicalPath().contains("boxWithStdlib")) {
-                        CodegenTestFiles codegenFile = CodegenTestFiles.create(file.getName(), text, holderMock.environment.getProject());
-                        holderMock.files.add(codegenFile.getPsiFile());
-                    }
-                    else {
-                        CodegenTestFiles codegenFile = CodegenTestFiles.create(file.getName(), text, holderFull.environment.getProject());
-                        holderFull.files.add(codegenFile.getPsiFile());
-                    }
+                    // TODO: use holderMock when there's no WITH_RUNTIME or WITH_REFLECT in the test
+                    CodegenTestFiles codegenFile = CodegenTestFiles.create(file.getName(), text, holderFull.environment.getProject());
+                    holderFull.files.add(codegenFile.getPsiFile());
 
                     generateTestMethod(printer, generatedTestName, StringUtil.escapeStringCharacters(file.getPath()));
                 }

js/js.translator/testData/callableReference/function/cases/abstractClassMember.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 abstract class A {

js/js.translator/testData/callableReference/function/cases/booleanNotIntrinsic.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun box(): String {

js/js.translator/testData/callableReference/function/cases/classMemberFromClass.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/classMemberFromExtension.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringNoArgs.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringOneStringArg.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitNoArgs.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitOneStringArg.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/closureWithSideEffect.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {

js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelNoArgs.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelOneStringArg.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A(val result: String)

js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt

@@ -18,4 +18,4 @@ fun box():String {
     val ref = ::A
     var result = ref(1).s + (::B)("23", "45").msg
     return (if (result == "sA:init:12345") "OK" else result)
-}
+}

js/js.translator/testData/callableReference/function/cases/extension.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 class A

js/js.translator/testData/callableReference/function/cases/extensionFromClass.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/extensionFromExtension.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A

js/js.translator/testData/callableReference/function/cases/extensionFromTopLevel.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun <T> run(arg1: A, arg2: T, funRef:(A, T) -> T): T {

js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringNoArgs.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg1: A, funRef:A.() -> String): String {

js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringOneStringArg.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg1: A, arg2: String, funRef:A.(String) -> String): String {

js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitNoArgs.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {

js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitOneStringArg.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg1: A, arg2: String, funRef:A.(String) -> Unit): Unit {

js/js.translator/testData/callableReference/function/cases/extensionToPrimitive.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {

js/js.translator/testData/callableReference/function/cases/extensionWithClosure.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 class A

js/js.translator/testData/callableReference/function/cases/localLocal.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {

js/js.translator/testData/callableReference/function/cases/recursiveClosure.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun foo(until: Int): String {

js/js.translator/testData/callableReference/function/cases/simple.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {

js/js.translator/testData/callableReference/function/cases/simpleClosure.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {

js/js.translator/testData/callableReference/function/cases/simpleWithArg.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {

js/js.translator/testData/callableReference/function/cases/topLevelFromClass.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun <T> run(arg1: T, arg2: T, funRef:(T,T) -> T): T {

js/js.translator/testData/callableReference/function/cases/topLevelFromExtension.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun <T> run(arg1: T, arg2: T, funRef:(T,T) -> T): T {

js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelStringNoArgs.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(funRef:() -> String): String {

js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelViaFunCall.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg: Int, funRef:(Int) -> Int): Int {
@@ -17,4 +17,4 @@ fun box(): Boolean {
     if (run(5, tmp()) != 6) return false
 
     return true
-}
+}

js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelWithArg.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg: Int, funRef:(Int) -> Int): Int {
@@ -15,4 +15,4 @@ fun box(): Boolean {
     if (run(5) {x -> x + 1} != 6) return false
 
     return true
-}
+}

js/js.translator/testData/callableReference/function/cases/unitWithSideEffect.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 var state = 23

js/js.translator/testData/callableReference/property/cases/accessViaSubclass.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 abstract class Base {

js/js.translator/testData/callableReference/property/cases/delegated.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 import kotlin.reflect.KProperty

js/js.translator/testData/callableReference/property/cases/delegatedMutable.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 import kotlin.reflect.KProperty

js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 import kotlin.reflect.KProperty1

js/js.translator/testData/callableReference/property/cases/overriddenInSubclass.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 open class Base {

js/js.translator/testData/callableReference/property/cases/simpleExtension.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 val String.id: String

js/js.translator/testData/callableReference/property/cases/simpleMember.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 class A(val x: Int)

js/js.translator/testData/callableReference/property/cases/simpleMutableExtension.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 var storage = 0

js/js.translator/testData/callableReference/property/cases/simpleMutableMember.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 data class Box(var value: String)

js/js.translator/testData/callableReference/property/cases/simpleMutableTopLevel.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 data class Box(val value: String)

js/js.translator/testData/callableReference/property/cases/simpleTopLevel.kt

@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 data class Box(val value: String)