1 files changed, 53 insertions, 0 deletions
diff --git a/src/async/test/files/run/async-spec/if-else0.scala b/src/async/test/files/run/async-spec/if-else0.scala
new file mode 100644
index 0000000..de20a65
--- /dev/null
+++ b/src/async/test/files/run/async-spec/if-else0.scala
@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ */
+package scala.async
+
+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 {
+
+  IfElseSpec.check()
+
+}
+*/
+
+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
+  }
+}
+
+
+object IfElseSpec extends MinimalScalaTest {
+
+  "An async method" should {
+    "support await in a simple if-else expression" in {
+      val o = new TestIfElseClass
+      val fut = o.m2(10)
+      val res = Await.result(fut, 2 seconds)
+      res mustBe(14)
+    }
+  }
+
+}