From 57a5012514cf691fddf184cc85967e39cdc540b6 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 5 Nov 2012 16:20:48 +0100 Subject: 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. --- test/files/run/await0/MinimalScalaTest.scala | 102 ----------------- test/files/run/await0/await0.scala | 76 ------------- test/files/run/block0/AsyncSpec.scala | 62 ---------- test/files/run/block0/MinimalScalaTest.scala | 102 ----------------- test/files/run/block1.check | 1 - test/files/run/block1/MinimalScalaTest.scala | 102 ----------------- test/files/run/block1/block1.scala | 48 -------- test/files/run/if-else0/MinimalScalaTest.scala | 102 ----------------- test/files/run/if-else0/if-else0.scala | 50 -------- test/files/run/if-else1/MinimalScalaTest.scala | 102 ----------------- test/files/run/if-else1/if-else1.scala | 132 ---------------------- test/files/run/if-else2/MinimalScalaTest.scala | 102 ----------------- test/files/run/if-else2/if-else2.scala | 50 -------- test/files/run/if-else3/MinimalScalaTest.scala | 102 ----------------- test/files/run/if-else3/if-else3.scala | 52 --------- test/pending/run/fallback0/MinimalScalaTest.scala | 102 ----------------- 16 files changed, 1287 deletions(-) delete mode 100644 test/files/run/await0/MinimalScalaTest.scala delete mode 100644 test/files/run/await0/await0.scala delete mode 100644 test/files/run/block0/AsyncSpec.scala delete mode 100644 test/files/run/block0/MinimalScalaTest.scala delete mode 100644 test/files/run/block1.check delete mode 100644 test/files/run/block1/MinimalScalaTest.scala delete mode 100644 test/files/run/block1/block1.scala delete mode 100644 test/files/run/if-else0/MinimalScalaTest.scala delete mode 100644 test/files/run/if-else0/if-else0.scala delete mode 100644 test/files/run/if-else1/MinimalScalaTest.scala delete mode 100644 test/files/run/if-else1/if-else1.scala delete mode 100644 test/files/run/if-else2/MinimalScalaTest.scala delete mode 100644 test/files/run/if-else2/if-else2.scala delete mode 100644 test/files/run/if-else3/MinimalScalaTest.scala delete mode 100644 test/files/run/if-else3/if-else3.scala (limited to 'test') diff --git a/test/files/run/await0/MinimalScalaTest.scala b/test/files/run/await0/MinimalScalaTest.scala deleted file mode 100644 index 91de1fc..0000000 --- a/test/files/run/await0/MinimalScalaTest.scala +++ /dev/null @@ -1,102 +0,0 @@ -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/files/run/await0/await0.scala b/test/files/run/await0/await0.scala deleted file mode 100644 index dfa3370..0000000 --- a/test/files/run/await0/await0.scala +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright (C) 2012 Typesafe Inc. - */ - -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 { - - Await0Spec.check() - -} - -class Await0Class { - import ExecutionContext.Implicits.global - - def m1(x: Double): Future[Double] = future { - Thread.sleep(200) - x + 2.0 - } - - def m2(x: Float): Future[Float] = future { - Thread.sleep(200) - x + 2.0f - } - - def m3(x: Char): Future[Char] = future { - Thread.sleep(200) - (x.toInt + 2).toChar - } - - def m4(x: Short): Future[Short] = future { - Thread.sleep(200) - (x + 2).toShort - } - - def m5(x: Byte): Future[Byte] = future { - Thread.sleep(200) - (x + 2).toByte - } - - def m0(y: Int): Future[Double] = async { - val f1 = m1(y.toDouble) - val x1: Double = await(f1) - - val f2 = m2(y.toFloat) - val x2: Float = await(f2) - - val f3 = m3(y.toChar) - val x3: Char = await(f3) - - val f4 = m4(y.toShort) - val x4: Short = await(f4) - - val f5 = m5(y.toByte) - val x5: Byte = await(f5) - - x1 + x2 + 2.0 - } -} - -object Await0Spec extends MinimalScalaTest { - - "An async method" should { - "support a simple await" in { - val o = new Await0Class - val fut = o.m0(10) - val res = Await.result(fut, 10 seconds) - res mustBe(26.0) - } - } - -} diff --git a/test/files/run/block0/AsyncSpec.scala b/test/files/run/block0/AsyncSpec.scala deleted file mode 100644 index 446f8ad..0000000 --- a/test/files/run/block0/AsyncSpec.scala +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Copyright (C) 2012 Typesafe Inc. - */ - -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 { - - AsyncSpec.check() - -} - - -class Test1Class { - 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) - val x = await(f) - x + 2 - } - - def m3(y: Int): Future[Int] = async { - val f1 = m1(y) - val x1 = await(f1) - val f2 = m1(y + 2) - val x2 = await(f2) - x1 + x2 - } -} - - -object AsyncSpec extends MinimalScalaTest { - - "An async method" should { - "support a simple await" in { - val o = new Test1Class - val fut = o.m2(10) - val res = Await.result(fut, 2 seconds) - res mustBe(14) - } - } - - "An async method" should { - "support several awaits in sequence" in { - val o = new Test1Class - val fut = o.m3(10) - val res = Await.result(fut, 4 seconds) - res mustBe(26) - } - } - -} diff --git a/test/files/run/block0/MinimalScalaTest.scala b/test/files/run/block0/MinimalScalaTest.scala deleted file mode 100644 index 91de1fc..0000000 --- a/test/files/run/block0/MinimalScalaTest.scala +++ /dev/null @@ -1,102 +0,0 @@ -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/files/run/block1.check b/test/files/run/block1.check deleted file mode 100644 index a82948b..0000000 --- a/test/files/run/block1.check +++ /dev/null @@ -1 +0,0 @@ -between two awaits diff --git a/test/files/run/block1/MinimalScalaTest.scala b/test/files/run/block1/MinimalScalaTest.scala deleted file mode 100644 index 91de1fc..0000000 --- a/test/files/run/block1/MinimalScalaTest.scala +++ /dev/null @@ -1,102 +0,0 @@ -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/files/run/block1/block1.scala b/test/files/run/block1/block1.scala deleted file mode 100644 index d6ea67e..0000000 --- a/test/files/run/block1/block1.scala +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright (C) 2012 Typesafe Inc. - */ - -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 { - - Block1Spec.check() - -} - - -class Test1Class { - import ExecutionContext.Implicits.global - - def m1(x: Int): Future[Int] = future { - Thread.sleep(1000) - x + 2 - } - - def m4(y: Int): Future[Int] = async { - val f1 = m1(y) - val f2 = m1(y + 2) - val x1 = await(f1) - println("between two awaits") - val x2 = await(f2) - x1 + x2 - } -} - - -object Block1Spec extends MinimalScalaTest { - - "An async method" should { - "support a simple await" in { - val o = new Test1Class - val fut = o.m4(10) - val res = Await.result(fut, 2 seconds) - res mustBe(26) - } - } - -} diff --git a/test/files/run/if-else0/MinimalScalaTest.scala b/test/files/run/if-else0/MinimalScalaTest.scala deleted file mode 100644 index 91de1fc..0000000 --- a/test/files/run/if-else0/MinimalScalaTest.scala +++ /dev/null @@ -1,102 +0,0 @@ -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/files/run/if-else0/if-else0.scala b/test/files/run/if-else0/if-else0.scala deleted file mode 100644 index 1ee5084..0000000 --- a/test/files/run/if-else0/if-else0.scala +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright (C) 2012 Typesafe Inc. - */ - -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) - } - } - -} diff --git a/test/files/run/if-else1/MinimalScalaTest.scala b/test/files/run/if-else1/MinimalScalaTest.scala deleted file mode 100644 index 91de1fc..0000000 --- a/test/files/run/if-else1/MinimalScalaTest.scala +++ /dev/null @@ -1,102 +0,0 @@ -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/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. - */ - -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) - } - } - -} diff --git a/test/files/run/if-else2/MinimalScalaTest.scala b/test/files/run/if-else2/MinimalScalaTest.scala deleted file mode 100644 index 91de1fc..0000000 --- a/test/files/run/if-else2/MinimalScalaTest.scala +++ /dev/null @@ -1,102 +0,0 @@ -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/files/run/if-else2/if-else2.scala b/test/files/run/if-else2/if-else2.scala deleted file mode 100644 index 262308c..0000000 --- a/test/files/run/if-else2/if-else2.scala +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright (C) 2012 Typesafe Inc. - */ - -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 { - - IfElse2Spec.check() - -} - -class TestIfElse2Class { - import ExecutionContext.Implicits.global - - def base(x: Int): Future[Int] = future { - Thread.sleep(1000) - x + 2 - } - - def m(y: Int): Future[Int] = async { - val f = base(y) - var z = 0 - if (y > 0) { - val x = await(f) - z = x + 2 - } else { - val x = await(f) - z = x - 2 - } - z - } -} - - -object IfElse2Spec extends MinimalScalaTest { - - "An async method" should { - "allow variables of the same name in different blocks" in { - val o = new TestIfElse2Class - val fut = o.m(10) - val res = Await.result(fut, 2 seconds) - res mustBe(14) - } - } - -} diff --git a/test/files/run/if-else3/MinimalScalaTest.scala b/test/files/run/if-else3/MinimalScalaTest.scala deleted file mode 100644 index 91de1fc..0000000 --- a/test/files/run/if-else3/MinimalScalaTest.scala +++ /dev/null @@ -1,102 +0,0 @@ -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/files/run/if-else3/if-else3.scala b/test/files/run/if-else3/if-else3.scala deleted file mode 100644 index ad95cea..0000000 --- a/test/files/run/if-else3/if-else3.scala +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright (C) 2012 Typesafe Inc. - */ - -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 { - - IfElse3Spec.check() - -} - -class TestIfElse3Class { - import ExecutionContext.Implicits.global - - def base(x: Int): Future[Int] = future { - Thread.sleep(1000) - x + 2 - } - - def m(y: Int): Future[Int] = async { - val f = base(y) - var z = 0 - if (y > 0) { - val x1 = await(f) - var w = x1 + 2 - z = w + 2 - } else { - val x2 = await(f) - var w = x2 + 2 - z = w - 2 - } - z - } -} - - -object IfElse3Spec extends MinimalScalaTest { - - "An async method" should { - "allow variables of the same name in different blocks" in { - val o = new TestIfElse3Class - val fut = o.m(10) - val res = Await.result(fut, 2 seconds) - res mustBe(16) - } - } - -} diff --git a/test/pending/run/fallback0/MinimalScalaTest.scala b/test/pending/run/fallback0/MinimalScalaTest.scala index 91de1fc..e69de29 100644 --- a/test/pending/run/fallback0/MinimalScalaTest.scala +++ b/test/pending/run/fallback0/MinimalScalaTest.scala @@ -1,102 +0,0 @@ -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) - } - -} -- cgit v1.2.3