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 | |
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.
24 files changed, 406 insertions, 1095 deletions
@@ -6,4 +6,15 @@ name := "scala-async" version := "0.1-SNAPSHOT" -libraryDependencies <+= (scalaVersion)("org.scala-lang" % "scala-reflect" % _) +libraryDependencies <++= (scalaVersion){ sv => Seq( + "org.scala-lang" % "scala-reflect" % sv, + "org.scala-lang" % "scala-compiler" % sv % "test" + ) +} + +libraryDependencies += "junit" % "junit-dep" % "4.10" % "test" + +libraryDependencies += "com.novocode" % "junit-interface" % "0.10-M2" % "test" + +// TODO scalac / javac options +// TODO metadata diff --git a/test/files/run/await0/MinimalScalaTest.scala b/src/test/scala/scala/async/MinimalScalaTest.scala index 91de1fc..af5b04e 100644 --- a/test/files/run/await0/MinimalScalaTest.scala +++ b/src/test/scala/scala/async/MinimalScalaTest.scala @@ -1,74 +1,48 @@ +package scala.async + import language.reflectiveCalls import language.postfixOps import language.implicitConversions -import scala.reflect.{ ClassTag, classTag } +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.{Future, Awaitable, CanAwait} +import java.util.concurrent.{TimeoutException, CountDownLatch, TimeUnit} import scala.concurrent.duration.Duration - +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 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 { - + implicit class objectops(obj: Any) { 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 = { + + implicit class stringops(text: String) { + def mustContain(substring: String) = assert(text contains substring, text) + } + + def intercept[T <: Throwable : ClassTag](body: => Any): T = { try { body - throw new Exception("Exception of type %s was not thrown".format(classTag[T])) + throw new Exception(s"Exception of type ${classTag[T]} was not thrown") } 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 } @@ -81,22 +55,25 @@ object TestLatch { 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)) + if (!opened) throw new TimeoutException(s"Timeout of ${(atMost.toString)}.") this } - + @throws(classOf[Exception]) def result(atMost: Duration)(implicit permit: CanAwait): Unit = { ready(atMost) } - + } diff --git a/src/test/scala/scala/async/neg/SampleNegSpec.scala b/src/test/scala/scala/async/neg/SampleNegSpec.scala new file mode 100644 index 0000000..8825f11 --- /dev/null +++ b/src/test/scala/scala/async/neg/SampleNegSpec.scala @@ -0,0 +1,25 @@ +package scala.async +package neg + +import java.io.File +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.junit.Test +import tools.reflect.ToolBoxError + +@RunWith(classOf[JUnit4]) +class SampleNegSpec extends MinimalScalaTest { + val f = new File("/Users/jason/code/scala-async/test/files/run/await0") + + @Test + def `missing symbol` { + intercept[ToolBoxError] { + eval { + """ + | kaboom + """.stripMargin + } + }.getMessage mustContain "not found: value kaboom" + + } +} diff --git a/src/test/scala/scala/async/neg/package.scala b/src/test/scala/scala/async/neg/package.scala new file mode 100644 index 0000000..1326394 --- /dev/null +++ b/src/test/scala/scala/async/neg/package.scala @@ -0,0 +1,11 @@ +package scala.async + +package object neg { + def eval(code: String): Any = { + val m = scala.reflect.runtime.currentMirror + import scala.tools.reflect.ToolBox + val tb = m.mkToolBox() + val result = tb.eval(tb.parse(code)) + result + } +} diff --git a/test/files/run/await0/await0.scala b/src/test/scala/scala/async/run/await0/await0.scala index dfa3370..77867aa 100644 --- a/test/files/run/await0/await0.scala +++ b/src/test/scala/scala/async/run/await0/await0.scala @@ -1,47 +1,49 @@ +package scala.async +package run +package await0 + /** * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com> */ -import language.{ reflectiveCalls, postfixOps } +import language.{reflectiveCalls, postfixOps} -import scala.concurrent.{ Future, ExecutionContext, future, Await } +import scala.concurrent.{Future, ExecutionContext, future, Await} import scala.concurrent.duration._ -import scala.async.Async.{ async, await } - -object Test extends App { - - Await0Spec.check() - -} +import scala.async.Async.{async, await} +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.junit.Test 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) @@ -62,15 +64,15 @@ class Await0Class { } } -object Await0Spec extends MinimalScalaTest { +@RunWith(classOf[JUnit4]) +class 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) - } + @Test + def `An async method support a simple await` { + val o = new Await0Class + val fut = o.m0(10) + val res = Await.result(fut, 10 seconds) + res mustBe (26.0) } - } + diff --git a/src/test/scala/scala/async/run/block0/AsyncSpec.scala b/src/test/scala/scala/async/run/block0/AsyncSpec.scala new file mode 100644 index 0000000..de58bb1 --- /dev/null +++ b/src/test/scala/scala/async/run/block0/AsyncSpec.scala @@ -0,0 +1,61 @@ +/** + * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com> + */ + +package scala.async +package run +package block0 + +import language.{reflectiveCalls, postfixOps} +import scala.concurrent.{Future, ExecutionContext, future, Await} +import scala.concurrent.duration._ +import scala.async.Async.{async, await} +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + + +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 + } +} + + +@RunWith(classOf[JUnit4]) +class AsyncSpec extends MinimalScalaTest { + + @Test + def `simple await` { + val o = new Test1Class + val fut = o.m2(10) + val res = Await.result(fut, 2 seconds) + res mustBe (14) + } + + @Test + def `several awaits in sequence` { + val o = new Test1Class + val fut = o.m3(10) + val res = Await.result(fut, 4 seconds) + res mustBe (26) + } +} diff --git a/src/test/scala/scala/async/run/block1/block1.scala b/src/test/scala/scala/async/run/block1/block1.scala new file mode 100644 index 0000000..29890bb --- /dev/null +++ b/src/test/scala/scala/async/run/block1/block1.scala @@ -0,0 +1,46 @@ +/** + * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com> + */ + +package scala.async +package run +package block1 + +import language.{reflectiveCalls, postfixOps} +import scala.concurrent.{Future, ExecutionContext, future, Await} +import scala.concurrent.duration._ +import scala.async.Async.{async, await} +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + + +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 + } +} + +@RunWith(classOf[JUnit4]) +class Block1Spec extends MinimalScalaTest { + + @Test def `support a simple await` { + val o = new Test1Class + val fut = o.m4(10) + val res = Await.result(fut, 2 seconds) + res mustBe (26) + } +} 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) + } +} diff --git a/test/files/run/if-else1/if-else1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala index 296a077..df528da 100644 --- a/test/files/run/if-else1/if-else1.scala +++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala @@ -2,25 +2,28 @@ * 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 } +package scala.async +package run +package ifelse1 -object Test extends App { +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 - 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 @@ -37,7 +40,7 @@ class TestIfElse1Class { } z } - + def m2(y: Int): Future[Int] = async { val f = base(y) var z = 0 @@ -54,7 +57,7 @@ class TestIfElse1Class { } z } - + def m3(y: Int): Future[Int] = async { val f = base(y) var z = 0 @@ -71,7 +74,7 @@ class TestIfElse1Class { } z } - + def m4(y: Int): Future[Int] = async { val f = base(y) var z = 0 @@ -87,46 +90,42 @@ class TestIfElse1Class { } z } - } +@RunWith(classOf[JUnit4]) +class IfElse1Spec extends MinimalScalaTest { -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) - } + @Test + def `await in a nested if-else expression` { + 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) - } + @Test + def `await in a nested if-else expression 2` { + 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) - } + @Test + def `await in a nested if-else expression 3` { + val o = new TestIfElse1Class + val fut = o.m3(10) + val res = Await.result(fut, 2 seconds) + res mustBe (14) } + + @Test + def `await in a nested if-else expression 4` { + val o = new TestIfElse1Class + val fut = o.m4(10) + val res = Await.result(fut, 2 seconds) + res mustBe (14) + } } diff --git a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala new file mode 100644 index 0000000..d702d72 --- /dev/null +++ b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala @@ -0,0 +1,51 @@ +/** + * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com> + */ + +package scala.async +package run +package ifelse2 + +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 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 + } +} + +@RunWith(classOf[JUnit4]) +class IfElse2Spec extends MinimalScalaTest { + + @Test + def `variables of the same name in different blocks` { + val o = new TestIfElse2Class + val fut = o.m(10) + val res = Await.result(fut, 2 seconds) + res mustBe (14) + } +} diff --git a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala new file mode 100644 index 0000000..cac646a --- /dev/null +++ b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala @@ -0,0 +1,54 @@ +/** + * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com> + */ + +package scala.async +package run +package ifelse3 + +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 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 + } +} + + +@RunWith(classOf[JUnit4]) +class IfElse3Spec extends MinimalScalaTest { + + @Test + def `variables of the same name in different blocks` { + val o = new TestIfElse3Class + val fut = o.m(10) + val res = Await.result(fut, 2 seconds) + res mustBe (16) + } +} 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. <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 { - - 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. <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 { - - 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. <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 { - - 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-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. <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 { - - 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. <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 { - - 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) - } - -} |