Merge boxWithStdlib testData into box, delete BoxWithStdlib test

compiler/testData/codegen/box/jvmStatic/closure.kt

@@ -0,0 +1,48 @@
+// WITH_RUNTIME
+
+object A {
+
+    val b: String = "OK"
+
+    @JvmStatic val c: String = "OK"
+
+    @JvmStatic fun test1() : String {
+        return {b}()
+    }
+
+    @JvmStatic fun test2() : String {
+        return {test1()}()
+    }
+
+    fun test3(): String {
+        return {"1".test5()}()
+    }
+
+    @JvmStatic fun test4(): String {
+        return {"1".test5()}()
+    }
+
+    @JvmStatic fun String.test5() : String {
+        return {this + b}()
+    }
+
+    fun test6(): String {
+        return {c}()
+    }
+}
+
+fun box(): String {
+    if (A.test1() != "OK") return "fail 1"
+
+    if (A.test2() != "OK") return "fail 2"
+
+    if (A.test3() != "1OK") return "fail 3"
+
+    if (A.test4() != "1OK") return "fail 4"
+
+    if (with(A) {"1".test5()} != "1OK") return "fail 5"
+
+    if (A.test6() != "OK") return "fail 6"
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/convention.kt

@@ -0,0 +1,33 @@
+// WITH_RUNTIME
+
+class B(var s: Int = 0) {
+
+}
+
+object A {
+
+    fun test1(v: B) {
+        v += B(1000)
+    }
+
+    @JvmStatic operator fun B.plusAssign(b: B) {
+        this.s += b.s
+    }
+}
+
+fun box(): String {
+
+    val b1 = B(11)
+
+    with(A) {
+        b1 += B(1000)
+    }
+
+    if (b1.s != 1011) return "fail 1"
+
+    val b = B(11)
+    A.test1(b)
+    if (b.s != 1011) return "fail 2"
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/default.kt

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+object A {
+
+    @JvmStatic fun test(b: String = "OK") : String {
+        return b
+    }
+}
+
+fun box(): String {
+
+    if (A.test() != "OK") return "fail 1"
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/explicitObject.kt

@@ -0,0 +1,34 @@
+// WITH_RUNTIME
+
+object AX {
+
+    @JvmStatic val c: String = "OK"
+
+    @JvmStatic fun aStatic(): String {
+        return AX.b()
+    }
+
+    fun aNonStatic(): String {
+        return AX.b()
+    }
+
+    @JvmStatic fun b(): String {
+        return "OK"
+    }
+
+    fun getProperty(): String {
+        return AX.c
+    }
+
+}
+
+fun box() : String {
+
+    if (AX.aStatic() != "OK") return "fail 1"
+
+    if (AX.aNonStatic() != "OK") return "fail 2"
+
+    if (AX.getProperty() != "OK") return "fail 3"
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/funAccess.kt

@@ -0,0 +1,18 @@
+// WITH_RUNTIME
+
+var holder = ""
+
+fun getA(): A {
+    holder += "OK"
+    return A
+}
+
+object A {
+    @JvmStatic fun a(): String {
+        return holder
+    }
+}
+
+fun box(): String {
+    return getA().a()
+}

compiler/testData/codegen/box/jvmStatic/importStaticMemberFromObject.kt

@@ -0,0 +1,32 @@
+// WITH_RUNTIME
+
+import O.p
+import O.f
+import C.Companion.p1
+import C.Companion.f1
+
+object O {
+    @JvmStatic
+    fun f(): Int = 3
+
+    @JvmStatic
+    val p: Int = 6
+}
+
+class C {
+    companion object {
+        @JvmStatic
+        fun f1(): Int = 3
+
+        @JvmStatic
+        val p1: Int = 6
+    }
+
+}
+
+fun box(): String {
+    if (p + f() != 9) return "fail"
+    if (p1 + f1() != 9) return "fail2"
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/inline.kt

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+object A {
+
+    @JvmStatic inline fun test(b: String = "OK") : String {
+        return b
+    }
+}
+
+fun box(): String {
+
+    if (A.test() != "OK") return "fail 1"
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/kt9897_static.kt

@@ -0,0 +1,43 @@
+// WITH_RUNTIME
+
+object Test {
+    var z = "0"
+    var l = 0L
+
+    fun changeObject(): String {
+        "1".someProperty += 1
+        return z
+    }
+
+    fun changeLong(): Long {
+        2L.someProperty -= 1
+        return l
+    }
+
+    @JvmStatic var String.someProperty: Int
+        get() {
+            return this.length
+        }
+        set(left) {
+            z += this + left
+        }
+
+    @JvmStatic var Long.someProperty: Long
+        get() {
+            return l
+        }
+        set(left) {
+            l += this + left
+        }
+
+}
+
+fun box(): String {
+    val changeObject = Test.changeObject()
+    if (changeObject != "012") return "fail 1: $changeObject"
+
+    val changeLong = Test.changeLong()
+    if (changeLong != 1L) return "fail 1: $changeLong"
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/postfixInc.kt

@@ -0,0 +1,47 @@
+// WITH_RUNTIME
+
+object A {
+
+    @JvmStatic var a: Int = 1
+
+    var b: Int = 1
+        @JvmStatic get
+
+    var c: Int = 1
+        @JvmStatic set
+
+}
+
+var holder = ""
+fun getA(): A {
+    holder += "getA()"
+    return A
+}
+
+
+fun box(): String {
+
+    var p = A.a++
+    if (p != 1 || A.a != 2) return "fail 1"
+
+    p = A.b++
+    if (p != 1 || A.b != 2) return "fail 2"
+
+    p = A.c++
+    if (p != 1 || A.c != 2) return "fail 3"
+
+
+    p = getA().a++
+    if (p != 2 || A.a != 3 || holder != "getA()") return "fail 4: $holder"
+    holder = ""
+
+    p = getA().b++
+    if (p != 2 || A.b != 3 || holder != "getA()") return "fail 5: $holder"
+    holder = ""
+
+    p = getA().c++
+    if (p != 2 || A.c != 3 || holder != "getA()") return "fail 6: $holder"
+    holder = ""
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/prefixInc.kt

@@ -0,0 +1,47 @@
+// WITH_RUNTIME
+
+object A {
+
+    @JvmStatic var a: Int = 1
+
+    var b: Int = 1
+        @JvmStatic get
+
+    var c: Int = 1
+        @JvmStatic set
+
+}
+
+var holder = ""
+fun getA(): A {
+    holder += "getA()"
+    return A
+}
+
+
+fun box(): String {
+
+    var p = ++A.a
+    if (p != 2 || A.a != 2) return "fail 1"
+
+    p = ++A.b
+    if (p != 2 || A.b != 2) return "fail 2"
+
+    p = ++A.c
+    if (p != 2 || A.c != 2) return "fail 3"
+
+
+    p = ++getA().a
+    if (p != 3 || A.a != 3 || holder != "getA()") return "fail 4: $holder"
+    holder = ""
+
+    p = ++getA().b
+    if (p != 3 || A.b != 3 || holder != "getA()") return "fail 5: $holder"
+    holder = ""
+
+    p = ++getA().c
+    if (p != 3 || A.c != 3 || holder != "getA()") return "fail 6: $holder"
+    holder = ""
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/privateMethod.kt

@@ -0,0 +1,16 @@
+// WITH_RUNTIME
+
+object A {
+
+    private @JvmStatic fun a(): String {
+        return "OK"
+    }
+
+    object Z {
+        val p = a()
+    }
+}
+
+fun box(): String {
+    return A.Z.p
+}

compiler/testData/codegen/box/jvmStatic/propertyAccess.kt

@@ -0,0 +1,47 @@
+// WITH_RUNTIME
+
+var holder = ""
+
+fun getA(): A {
+    holder += "getA()"
+    return A
+}
+
+object A {
+
+    @JvmStatic var a: Int = 1
+
+    var b: Int = 1
+        @JvmStatic get
+
+    var c: Int = 1
+        @JvmStatic set
+
+}
+
+
+fun box(): String {
+
+    if (getA().a != 1 || holder != "getA()") return "fail 1: $holder"
+    holder = ""
+
+    if (getA().b != 1 || holder != "getA()") return "fail 2: $holder"
+    holder = ""
+
+    if (getA().c != 1 || holder != "getA()") return "fail 3: $holder"
+    holder = ""
+
+    getA().a = 2
+    if (getA().a != 2 || holder != "getA()getA()") return "fail 1: $holder"
+    holder = ""
+
+    getA().b = 2
+    if (getA().b != 2 || holder != "getA()getA()") return "fail 2: $holder"
+    holder = ""
+
+    getA().c = 2
+    if (getA().c != 2 || holder != "getA()getA()") return "fail 3: $holder"
+    holder = ""
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/propertyAsDefault.kt

@@ -0,0 +1,11 @@
+// WITH_RUNTIME
+
+object X {
+    @JvmStatic val x = "OK"
+
+    fun fn(value : String = x): String = value
+}
+
+fun box(): String {
+    return X.fn()
+}

compiler/testData/codegen/box/jvmStatic/simple.kt

@@ -0,0 +1,44 @@
+// WITH_RUNTIME
+
+object A {
+
+    val b: String = "OK"
+
+    @JvmStatic val c: String = "OK"
+
+    @JvmStatic fun test1() : String {
+        return b
+    }
+
+    @JvmStatic fun test2() : String {
+        return test1()
+    }
+
+    fun test3(): String {
+        return "1".test5()
+    }
+
+    @JvmStatic fun test4(): String {
+        return "1".test5()
+    }
+
+    @JvmStatic fun String.test5() : String {
+        return this + b
+    }
+}
+
+fun box(): String {
+    if (A.test1() != "OK") return "fail 1"
+
+    if (A.test2() != "OK") return "fail 2"
+
+    if (A.test3() != "1OK") return "fail 3"
+
+    if (A.test4() != "1OK") return "fail 4"
+
+    if (with(A) {"1".test5()} != "1OK") return "fail 5"
+
+    if (A.c != "OK") return "fail 6"
+
+    return "OK"
+}

compiler/testData/codegen/box/jvmStatic/syntheticAccessor.kt

@@ -0,0 +1,17 @@
+// WITH_RUNTIME
+
+class C {
+    companion object {
+        private @JvmStatic fun foo(): String {
+            return "OK"
+        }
+    }
+
+    fun bar(): String {
+        return foo()
+    }
+}
+
+fun box(): String {
+    return C().bar()
+}