diff options
| author | Heather Miller <heather.miller@epfl.ch> | 2012-08-04 21:55:35 +0200 |
|---|---|---|
| committer | Heather Miller <heather.miller@epfl.ch> | 2012-08-04 21:55:35 +0200 |
| commit | 3cb0e784a05db7d0b542cec9bf4c5fbf3772a6cf (patch) | |
| tree | 36c1a6040e0f0aa6e64c0eef6fb55bea61bf4141 /test/files/jvm/future-spec/main.scala | |
| parent | ab63cca87f68d80aff0ff6cd83ecd85b9e1d0c7a (diff) | |
| download | scala-3cb0e784a05db7d0b542cec9bf4c5fbf3772a6cf.tar.gz scala-3cb0e784a05db7d0b542cec9bf4c5fbf3772a6cf.tar.bz2 scala-3cb0e784a05db7d0b542cec9bf4c5fbf3772a6cf.zip | |
Basing Futures on Try instead of Either
Diffstat (limited to 'test/files/jvm/future-spec/main.scala')
| -rw-r--r-- | test/files/jvm/future-spec/main.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/files/jvm/future-spec/main.scala b/test/files/jvm/future-spec/main.scala index 45b59d5d20..57183d8cea 100644 --- a/test/files/jvm/future-spec/main.scala +++ b/test/files/jvm/future-spec/main.scala @@ -12,6 +12,7 @@ object Test { def main(args: Array[String]) { FutureTests.check() PromiseTests.check() + TryTests.check() } } @@ -47,7 +48,7 @@ trait MinimalScalaTest extends Output { snippet bufferPrintln("[OK] Test passed.") } catch { - case e => + case e: Throwable => bufferPrintln("[FAILED] " + e) bufferPrintln(e.getStackTrace().mkString("\n")) throwables += e @@ -59,6 +60,7 @@ trait MinimalScalaTest extends Output { implicit def objectops(obj: Any) = new { def mustBe(other: Any) = assert(obj == other, obj + " is not " + other) + def mustEqual(other: Any) = mustBe(other) } |