diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-07-21 12:40:37 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-07-21 15:45:52 +0200 |
commit | de102789917e4b9aeae2836bde70c2a8c29a7e0e (patch) | |
tree | 88338e5ada77918fc9cb251e626aec406722779f /src/test/scala/scala/async/run/ifelse1/IfElse1.scala | |
parent | a08a822df9987bf34ec804f0e5a537da75fd3294 (diff) | |
parent | 154a2d7d7fab1b6db940a01c212c8de0138ae930 (diff) | |
download | scala-async-de102789917e4b9aeae2836bde70c2a8c29a7e0e.tar.gz scala-async-de102789917e4b9aeae2836bde70c2a8c29a7e0e.tar.bz2 scala-async-de102789917e4b9aeae2836bde70c2a8c29a7e0e.zip |
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master-20140721
Conflicts:
src/main/scala/scala/async/internal/AsyncTransform.scala
src/main/scala/scala/async/internal/Lifter.scala
Diffstat (limited to 'src/test/scala/scala/async/run/ifelse1/IfElse1.scala')
-rw-r--r-- | src/test/scala/scala/async/run/ifelse1/IfElse1.scala | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala index 587aaac..6cbe910 100644 --- a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala +++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala @@ -87,6 +87,75 @@ class TestIfElse1Class { } z } + + def pred: Future[Boolean] = async(true) + + def m5: Future[Boolean] = async { + if(if(if(if(if(if(if(if(if(if(if(if(if(if(if(if(if(if(if(if(if(await(pred)) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false) + await(pred) + else + false + } } class IfElse1Spec { @@ -124,4 +193,12 @@ class IfElse1Spec { val res = Await.result(fut, 2 seconds) res mustBe (14) } + + @Test + def `await in deeply-nested if-else conditions`() { + val o = new TestIfElse1Class + val fut = o.m5 + val res = Await.result(fut, 2 seconds) + res mustBe true + } } |