aboutsummaryrefslogtreecommitdiff
path: root/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-11-05 16:20:48 +0100
committerJason Zaugg <jzaugg@gmail.com>2012-11-05 16:32:01 +0100
commit57a5012514cf691fddf184cc85967e39cdc540b6 (patch)
treed4d2226c54179947f028bbfb1cc4bb9f2abb07d7 /src/test/scala/scala/async/run/ifelse0/IfElse0.scala
parent3f36c1ea4b95ba046fa378ade19ca368e6e5c21b (diff)
downloadscala-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 'src/test/scala/scala/async/run/ifelse0/IfElse0.scala')
-rw-r--r--src/test/scala/scala/async/run/ifelse0/IfElse0.scala51
1 files changed, 51 insertions, 0 deletions
diff --git a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
new file mode 100644
index 0000000..2088609
--- /dev/null
+++ b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
@@ -0,0 +1,51 @@
+/**
+ * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package scala.async
+package run
+package ifelse0
+
+import language.{reflectiveCalls, postfixOps}
+import scala.concurrent.{Future, ExecutionContext, future, Await}
+import scala.concurrent.duration._
+import scala.async.Async.{async, await}
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.Test
+
+
+class TestIfElseClass {
+
+ import ExecutionContext.Implicits.global
+
+ def m1(x: Int): Future[Int] = future {
+ Thread.sleep(1000)
+ x + 2
+ }
+
+ def m2(y: Int): Future[Int] = async {
+ val f = m1(y)
+ var z = 0
+ if (y > 0) {
+ val x1 = await(f)
+ z = x1 + 2
+ } else {
+ val x2 = await(f)
+ z = x2 - 2
+ }
+ z
+ }
+}
+
+
+@RunWith(classOf[JUnit4])
+class IfElseSpec extends MinimalScalaTest {
+
+ @Test def `support await in a simple if-else expression` {
+ val o = new TestIfElseClass
+ val fut = o.m2(10)
+ val res = Await.result(fut, 2 seconds)
+ res mustBe (14)
+ }
+}