Merge boxWithStdlib testData into box, delete BoxWithStdlib test

compiler/testData/codegen/box/when/stringOptimization/duplicatingItems.kt

@@ -0,0 +1,21 @@
+// WITH_RUNTIME
+
+import kotlin.test.assertEquals
+
+fun foo(x : String) : String {
+    when (x) {
+        "abc" -> return "abc"
+        "efg", "ghi", "abc" -> return "efg_ghi"
+        else -> return "other"
+    }
+}
+
+fun box() : String {
+    assertEquals("abc", foo("abc"))
+    assertEquals("efg_ghi", foo("efg"))
+    assertEquals("efg_ghi", foo("ghi"))
+
+    assertEquals("other", foo("xyz"))
+
+    return "OK"
+}

compiler/testData/codegen/box/when/stringOptimization/duplicatingItemsSameHashCode.kt

@@ -0,0 +1,26 @@
+// WITH_RUNTIME
+
+import kotlin.test.assertEquals
+
+fun foo(x : String) : String {
+    assert("abz]".hashCode() == "aby|".hashCode())
+
+    when (x) {
+        "abz]" -> return "abz"
+        "ghi"  -> return "ghi"
+        "aby|" -> return "aby"
+        "abz]" -> return "fail"
+    }
+
+    return "other"
+}
+
+fun box() : String {
+    assertEquals("abz", foo("abz]"))
+    assertEquals("aby", foo("aby|"))
+    assertEquals("ghi", foo("ghi"))
+
+    assertEquals("other", foo("xyz"))
+
+    return "OK"
+}

compiler/testData/codegen/box/when/stringOptimization/expression.kt

@@ -0,0 +1,22 @@
+// WITH_RUNTIME
+
+import kotlin.test.assertEquals
+
+fun foo(x : String) : String {
+    return when (x) {
+        "abc", "cde" -> "abc_cde"
+        "efg", "ghi" -> "efg_ghi"
+        else -> "other"
+    }
+}
+
+fun box() : String {
+    assertEquals("abc_cde", foo("abc"))
+    assertEquals("abc_cde", foo("cde"))
+    assertEquals("efg_ghi", foo("efg"))
+    assertEquals("efg_ghi", foo("ghi"))
+
+    assertEquals("other", foo("xyz"))
+
+    return "OK"
+}

compiler/testData/codegen/box/when/stringOptimization/nullability.kt

@@ -0,0 +1,43 @@
+// WITH_RUNTIME
+
+import kotlin.test.assertEquals
+
+fun foo1(x : String?) : String {
+    when (x) {
+        "abc", "cde" -> return "abc_cde"
+        "efg", "ghi", null -> return "efg_ghi"
+    }
+
+    return "other"
+}
+
+fun foo2(x : String?) : String {
+    when (x) {
+        "abc", "cde" -> return "abc_cde"
+        "efg", "ghi" -> return "efg_ghi"
+        else -> return "other"
+    }
+}
+
+fun box() : String {
+    //foo1
+    assertEquals("abc_cde", foo1("abc"))
+    assertEquals("abc_cde", foo1("cde"))
+    assertEquals("efg_ghi", foo1("efg"))
+    assertEquals("efg_ghi", foo1("ghi"))
+    assertEquals("efg_ghi", foo1(null))
+
+    assertEquals("other",   foo1("xyz"))
+
+    //foo2
+    assertEquals("abc_cde", foo2("abc"))
+    assertEquals("abc_cde", foo2("cde"))
+    assertEquals("efg_ghi", foo2("efg"))
+    assertEquals("efg_ghi", foo2("ghi"))
+
+
+    assertEquals("other",   foo2("xyz"))
+    assertEquals("other",   foo2(null))
+
+    return "OK"
+}

compiler/testData/codegen/box/when/stringOptimization/sameHashCode.kt

@@ -0,0 +1,25 @@
+// WITH_RUNTIME
+
+import kotlin.test.assertEquals
+
+fun foo(x : String) : String {
+    assert("abz]".hashCode() == "aby|".hashCode())
+
+    when (x) {
+        "abz]", "cde" -> return "abz_cde"
+        "aby|", "ghi", "abz]" -> return "aby_ghi"
+    }
+
+    return "other"
+}
+
+fun box() : String {
+    assertEquals("abz_cde", foo("abz]"))
+    assertEquals("abz_cde", foo("cde"))
+    assertEquals("aby_ghi", foo("aby|"))
+    assertEquals("aby_ghi", foo("ghi"))
+
+    assertEquals("other", foo("xyz"))
+
+    return "OK"
+}

compiler/testData/codegen/box/when/stringOptimization/statement.kt

@@ -0,0 +1,40 @@
+// WITH_RUNTIME
+
+import kotlin.test.assertEquals
+
+fun foo1(x : String) : String {
+    when (x) {
+        "abc", "cde" -> return "abc_cde"
+        "efg", "ghi" -> return "efg_ghi"
+    }
+
+    return "other"
+}
+
+fun foo2(x : String) : String {
+    when (x) {
+        "abc", "cde" -> return "abc_cde"
+        "efg", "ghi" -> return "efg_ghi"
+        else -> return "other"
+    }
+}
+
+fun box() : String {
+    //foo1
+    assertEquals("abc_cde", foo1("abc"))
+    assertEquals("abc_cde", foo1("cde"))
+    assertEquals("efg_ghi", foo1("efg"))
+    assertEquals("efg_ghi", foo1("ghi"))
+
+    assertEquals("other", foo1("xyz"))
+
+    //foo2
+    assertEquals("abc_cde", foo2("abc"))
+    assertEquals("abc_cde", foo2("cde"))
+    assertEquals("efg_ghi", foo2("efg"))
+    assertEquals("efg_ghi", foo2("ghi"))
+
+    assertEquals("other", foo2("xyz"))
+
+    return "OK"
+}