diff options
author | phaller <hallerp@gmail.com> | 2012-10-31 16:45:42 +0100 |
---|---|---|
committer | phaller <hallerp@gmail.com> | 2012-11-02 11:09:44 +0100 |
commit | f22998d343c01951254fc2020731986fb3219ff0 (patch) | |
tree | b5ae469b65156d3f4d3453dac213bfe6499cb985 /test | |
parent | c15af267fc7ed5dc7ef40428d738dd5679606f66 (diff) | |
download | scala-async-f22998d343c01951254fc2020731986fb3219ff0.tar.gz scala-async-f22998d343c01951254fc2020731986fb3219ff0.tar.bz2 scala-async-f22998d343c01951254fc2020731986fb3219ff0.zip |
Fix for #1861: Add fall-back to CPS for all unsupported uses of await
Diffstat (limited to 'test')
-rw-r--r-- | test/pending/run/fallback0/MinimalScalaTest.scala | 102 | ||||
-rw-r--r-- | test/pending/run/fallback0/fallback0-manual.scala | 72 | ||||
-rw-r--r-- | test/pending/run/fallback0/fallback0.scala | 49 |
3 files changed, 223 insertions, 0 deletions
diff --git a/test/pending/run/fallback0/MinimalScalaTest.scala b/test/pending/run/fallback0/MinimalScalaTest.scala new file mode 100644 index 0000000..91de1fc --- /dev/null +++ b/test/pending/run/fallback0/MinimalScalaTest.scala @@ -0,0 +1,102 @@ +import language.reflectiveCalls +import language.postfixOps +import language.implicitConversions + +import scala.reflect.{ ClassTag, classTag } + +import scala.collection.mutable +import scala.concurrent.{ Future, Awaitable, CanAwait } +import java.util.concurrent.{ TimeoutException, CountDownLatch, TimeUnit } +import scala.concurrent.duration.Duration + + + +trait Output { + val buffer = new StringBuilder + + def bufferPrintln(a: Any): Unit = buffer.synchronized { + buffer.append(a.toString + "\n") + } +} + + +trait MinimalScalaTest extends Output { + + val throwables = mutable.ArrayBuffer[Throwable]() + + def check() { + if (throwables.nonEmpty) println(buffer.toString) + } + + implicit def stringops(s: String) = new { + + def should[U](snippets: =>U): U = { + bufferPrintln(s + " should:") + snippets + } + + def in[U](snippet: =>U): Unit = { + try { + bufferPrintln("- " + s) + snippet + bufferPrintln("[OK] Test passed.") + } catch { + case e: Throwable => + bufferPrintln("[FAILED] " + e) + bufferPrintln(e.getStackTrace().mkString("\n")) + throwables += e + } + } + + } + + implicit def objectops(obj: Any) = new { + + def mustBe(other: Any) = assert(obj == other, obj + " is not " + other) + def mustEqual(other: Any) = mustBe(other) + + } + + def intercept[T <: Throwable: ClassTag](body: =>Any): T = { + try { + body + throw new Exception("Exception of type %s was not thrown".format(classTag[T])) + } catch { + case t: Throwable => + if (classTag[T].runtimeClass != t.getClass) throw t + else t.asInstanceOf[T] + } + } + + def checkType[T: ClassTag, S](in: Future[T], refclasstag: ClassTag[S]): Boolean = classTag[T] == refclasstag +} + + +object TestLatch { + val DefaultTimeout = Duration(5, TimeUnit.SECONDS) + + def apply(count: Int = 1) = new TestLatch(count) +} + + +class TestLatch(count: Int = 1) extends Awaitable[Unit] { + private var latch = new CountDownLatch(count) + + def countDown() = latch.countDown() + def isOpen: Boolean = latch.getCount == 0 + def open() = while (!isOpen) countDown() + def reset() = latch = new CountDownLatch(count) + + @throws(classOf[TimeoutException]) + def ready(atMost: Duration)(implicit permit: CanAwait) = { + val opened = latch.await(atMost.toNanos, TimeUnit.NANOSECONDS) + if (!opened) throw new TimeoutException("Timeout of %s." format (atMost.toString)) + this + } + + @throws(classOf[Exception]) + def result(atMost: Duration)(implicit permit: CanAwait): Unit = { + ready(atMost) + } + +} diff --git a/test/pending/run/fallback0/fallback0-manual.scala b/test/pending/run/fallback0/fallback0-manual.scala new file mode 100644 index 0000000..611d09d --- /dev/null +++ b/test/pending/run/fallback0/fallback0-manual.scala @@ -0,0 +1,72 @@ +/** + * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com> + */ + +import language.{ reflectiveCalls, postfixOps } +import scala.concurrent.{ Future, ExecutionContext, future, Await, Promise } +import scala.concurrent.duration._ +import scala.async.EndTaskException +import scala.async.Async.{ async, await, awaitCps } +import scala.util.continuations.reset + +object TestManual extends App { + + Fallback0ManualSpec.check() + +} + +class TestFallback0ManualClass { + import ExecutionContext.Implicits.global + + def m1(x: Int): Future[Int] = future { + Thread.sleep(1000) + x + 2 + } + + def m2(y: Int): Future[Int] = { + val p = Promise[Int]() + future { reset { + val f = m1(y) + var z = 0 + val res = awaitCps(f, p) + 5 + if (res > 0) { + z = 2 + } else { + z = 4 + } + z + } } + p.future + } + + /* that isn't even supported by current CPS plugin + def m3(y: Int): Future[Int] = { + val p = Promise[Int]() + future { reset { + val f = m1(y) + var z = 0 + val res: Option[Int] = Some(5) + res match { + case None => z = 4 + case Some(a) => z = awaitCps(f, p) - 10 + } + z + } } + p.future + } + */ +} + + +object Fallback0ManualSpec extends MinimalScalaTest { + + "An async method" should { + "support await in a simple if-else expression" in { + val o = new TestFallback0ManualClass + val fut = o.m2(10) + val res = Await.result(fut, 2 seconds) + res mustBe(2) + } + } + +} diff --git a/test/pending/run/fallback0/fallback0.scala b/test/pending/run/fallback0/fallback0.scala new file mode 100644 index 0000000..75b0739 --- /dev/null +++ b/test/pending/run/fallback0/fallback0.scala @@ -0,0 +1,49 @@ +/** + * 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, awaitCps } + +object Test extends App { + + Fallback0Spec.check() + +} + +class TestFallback0Class { + 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 + val res = await(f) + 5 + if (res > 0) { + z = 2 + } else { + z = 4 + } + z + } +} + + +object Fallback0Spec extends MinimalScalaTest { + + "An async method" should { + "support await in a simple if-else expression" in { + val o = new TestFallback0Class + val fut = o.m2(10) + val res = Await.result(fut, 2 seconds) + res mustBe(2) + } + } + +} |