From fe7ee3fb665d66e573b06e96340af807399041df Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 8 Jun 2015 15:11:01 +0300 Subject: [PATCH] JS backend tests: replace `run` with `myRun` in closure tests --- .../testData/closure/_commonFiles/utils.kt | 3 +++ .../closure/cases/closureFunctionByInnerFunction.kt | 4 ++-- .../testData/closure/cases/closureInNestedFunctions.kt | 10 +++++----- .../closure/cases/closureInNestedFunctionsInMethod.kt | 10 +++++----- .../closureInNestedFunctionsWhichMixedWithObject.kt | 4 ++-- .../cases/closureLocalFunctionByInnerFunction.kt | 4 ++-- ...closureLocalFunctionByInnerFunctionInConstructor.kt | 2 +- .../cases/closureThisInExtLambdaInsideMethod.kt | 2 +- .../withManyClosuresInNestedFunctionsAndObjects.kt | 4 ++-- 9 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 js/js.translator/testData/closure/_commonFiles/utils.kt diff --git a/js/js.translator/testData/closure/_commonFiles/utils.kt b/js/js.translator/testData/closure/_commonFiles/utils.kt new file mode 100644 index 00000000000..79f75e0832e --- /dev/null +++ b/js/js.translator/testData/closure/_commonFiles/utils.kt @@ -0,0 +1,3 @@ +package foo + +fun myRun(f: () -> T) = f() diff --git a/js/js.translator/testData/closure/cases/closureFunctionByInnerFunction.kt b/js/js.translator/testData/closure/cases/closureFunctionByInnerFunction.kt index 8f0623f09fe..f85f4c0364c 100644 --- a/js/js.translator/testData/closure/cases/closureFunctionByInnerFunction.kt +++ b/js/js.translator/testData/closure/cases/closureFunctionByInnerFunction.kt @@ -5,7 +5,7 @@ val r = "OK" fun simple(s: String? = null): String { if (s != null) return s - return run { + return myRun { simple("OK") } } @@ -14,7 +14,7 @@ val ok = "OK" fun withClosure(s: String? = null): String { if (s != null) return s - return ok + run { + return ok + myRun { withClosure(ok) } } diff --git a/js/js.translator/testData/closure/cases/closureInNestedFunctions.kt b/js/js.translator/testData/closure/cases/closureInNestedFunctions.kt index 2e08626540e..6d3719362ef 100644 --- a/js/js.translator/testData/closure/cases/closureInNestedFunctions.kt +++ b/js/js.translator/testData/closure/cases/closureInNestedFunctions.kt @@ -14,8 +14,8 @@ fun funfun(): Boolean { fun litlit(): Boolean { val result = true - return run { - run { result } + return myRun { + myRun { result } } } @@ -23,7 +23,7 @@ fun funlit(): Boolean { val result = true fun foo(): Boolean { - return run { result } + return myRun { result } } return foo() @@ -32,7 +32,7 @@ fun funlit(): Boolean { fun litfun(): Boolean { val result = true - return run { + return myRun { fun bar() = result bar() } @@ -45,4 +45,4 @@ fun box(): String { if (!litfun()) return "litfun failed" return "OK" -} \ No newline at end of file +} diff --git a/js/js.translator/testData/closure/cases/closureInNestedFunctionsInMethod.kt b/js/js.translator/testData/closure/cases/closureInNestedFunctionsInMethod.kt index c3f4476274d..97170260baf 100644 --- a/js/js.translator/testData/closure/cases/closureInNestedFunctionsInMethod.kt +++ b/js/js.translator/testData/closure/cases/closureInNestedFunctionsInMethod.kt @@ -8,8 +8,8 @@ class A { fun litlit() { val testName = "litlit" - run { - run { + myRun { + myRun { assertEquals(12, a, testName) assertEquals(1, b, testName) @@ -40,7 +40,7 @@ class A { fun litfun() { val testName = "litfun" - run { + myRun { fun bar() { assertEquals(12, a, testName) @@ -57,7 +57,7 @@ class A { fun funlit() { val testName = "funlit" fun foo() { - run { + myRun { assertEquals(12, a, testName) assertEquals(1, b, testName) @@ -78,4 +78,4 @@ fun box(): String { A().funlit() return "OK" -} \ No newline at end of file +} diff --git a/js/js.translator/testData/closure/cases/closureInNestedFunctionsWhichMixedWithObject.kt b/js/js.translator/testData/closure/cases/closureInNestedFunctionsWhichMixedWithObject.kt index 6ecb93199cd..d880435f48b 100644 --- a/js/js.translator/testData/closure/cases/closureInNestedFunctionsWhichMixedWithObject.kt +++ b/js/js.translator/testData/closure/cases/closureInNestedFunctionsWhichMixedWithObject.kt @@ -1,10 +1,10 @@ package foo fun box(): Boolean { - val t = run { + val t = myRun { object { fun boo(param: String): String { - return run { param } + return myRun { param } } } } diff --git a/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunction.kt b/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunction.kt index fe6ec55e599..9c1ada396bf 100644 --- a/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunction.kt +++ b/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunction.kt @@ -4,7 +4,7 @@ fun box(): String { fun simple(s: String? = null): String { if (s != null) return s - return run { + return myRun { simple("OK") } } @@ -15,7 +15,7 @@ fun box(): String { fun withClosure(s: String? = null): String { if (s != null) return s - return ok + run { + return ok + myRun { withClosure(ok) } } diff --git a/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunctionInConstructor.kt b/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunctionInConstructor.kt index c631443b260..366444942dc 100644 --- a/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunctionInConstructor.kt +++ b/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunctionInConstructor.kt @@ -10,7 +10,7 @@ class Foo { return } - run { + myRun { bar(OK) } } diff --git a/js/js.translator/testData/closure/cases/closureThisInExtLambdaInsideMethod.kt b/js/js.translator/testData/closure/cases/closureThisInExtLambdaInsideMethod.kt index 70e6393dfcf..2ba6e4d7593 100644 --- a/js/js.translator/testData/closure/cases/closureThisInExtLambdaInsideMethod.kt +++ b/js/js.translator/testData/closure/cases/closureThisInExtLambdaInsideMethod.kt @@ -3,7 +3,7 @@ package foo public class Foo(val trigger: () -> Any) { - fun test() = run {trigger()}; + fun test() = myRun { trigger() }; } fun box() = Foo({ "OK" }).test() diff --git a/js/js.translator/testData/closure/cases/withManyClosuresInNestedFunctionsAndObjects.kt b/js/js.translator/testData/closure/cases/withManyClosuresInNestedFunctionsAndObjects.kt index 48da444fd55..a9b7ad46cb7 100644 --- a/js/js.translator/testData/closure/cases/withManyClosuresInNestedFunctionsAndObjects.kt +++ b/js/js.translator/testData/closure/cases/withManyClosuresInNestedFunctionsAndObjects.kt @@ -1,14 +1,14 @@ package foo fun box(): String { - val t = run { + val t = myRun { object { fun foo() = "3" fun boo(param: String): String { val a = object { fun bar() = "57" - fun b(): String = run { param + bar() + foo() } + fun b(): String = myRun { param + bar() + foo() } } return a.b()