diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2012-11-05 16:20:48 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2012-11-05 16:32:01 +0100 |
commit | 57a5012514cf691fddf184cc85967e39cdc540b6 (patch) | |
tree | d4d2226c54179947f028bbfb1cc4bb9f2abb07d7 /test/files/run/if-else1/if-else1.scala | |
parent | 3f36c1ea4b95ba046fa378ade19ca368e6e5c21b (diff) | |
download | scala-async-57a5012514cf691fddf184cc85967e39cdc540b6.tar.gz scala-async-57a5012514cf691fddf184cc85967e39cdc540b6.tar.bz2 scala-async-57a5012514cf691fddf184cc85967e39cdc540b6.zip |
Improve test infrastructure
- Convert tests to use JUnit
- For the 'run' tests, just use plain-old-test-cases
- Add a sample 'neg' test to use ToolBoxes to compile code snippets on the fly.
Diffstat (limited to 'test/files/run/if-else1/if-else1.scala')
-rw-r--r-- | test/files/run/if-else1/if-else1.scala | 132 |
1 files changed, 0 insertions, 132 deletions
diff --git a/test/files/run/if-else1/if-else1.scala b/test/files/run/if-else1/if-else1.scala deleted file mode 100644 index 296a077..0000000 --- a/test/files/run/if-else1/if-else1.scala +++ /dev/null @@ -1,132 +0,0 @@ -/** - * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com> - */ - -import language.{ reflectiveCalls, postfixOps } -import scala.concurrent.{ Future, ExecutionContext, future, Await } -import scala.concurrent.duration._ -import scala.async.Async.{ async, await } - -object Test extends App { - - IfElse1Spec.check() - -} - -class TestIfElse1Class { - import ExecutionContext.Implicits.global - - def base(x: Int): Future[Int] = future { - Thread.sleep(1000) - x + 2 - } - - def m1(y: Int): Future[Int] = async { - val f = base(y) - var z = 0 - if (y > 0) { - if (y > 100) - 5 - else { - val x1 = await(f) - z = x1 + 2 - } - } else { - val x2 = await(f) - z = x2 - 2 - } - z - } - - def m2(y: Int): Future[Int] = async { - val f = base(y) - var z = 0 - if (y > 0) { - if (y < 100) { - val x1 = await(f) - z = x1 + 2 - } - else - 5 - } else { - val x2 = await(f) - z = x2 - 2 - } - z - } - - def m3(y: Int): Future[Int] = async { - val f = base(y) - var z = 0 - if (y < 0) { - val x2 = await(f) - z = x2 - 2 - } else { - if (y > 100) - 5 - else { - val x1 = await(f) - z = x1 + 2 - } - } - z - } - - def m4(y: Int): Future[Int] = async { - val f = base(y) - var z = 0 - if (y < 0) { - val x2 = await(f) - z = x2 - 2 - } else { - if (y < 100) { - val x1 = await(f) - z = x1 + 2 - } else - 5 - } - z - } - -} - - -object IfElse1Spec extends MinimalScalaTest { - - "An async method" should { - "support await in a nested if-else expression" in { - val o = new TestIfElse1Class - val fut = o.m1(10) - val res = Await.result(fut, 2 seconds) - res mustBe(14) - } - } - - "An async method" should { - "support await in a nested if-else expression" in { - val o = new TestIfElse1Class - val fut = o.m2(10) - val res = Await.result(fut, 2 seconds) - res mustBe(14) - } - } - - "An async method" should { - "support await in a nested if-else expression" in { - val o = new TestIfElse1Class - val fut = o.m3(10) - val res = Await.result(fut, 2 seconds) - res mustBe(14) - } - } - - "An async method" should { - "support await in a nested if-else expression" in { - val o = new TestIfElse1Class - val fut = o.m4(10) - val res = Await.result(fut, 2 seconds) - res mustBe(14) - } - } - -} |