diff options
author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2011-12-13 15:26:12 +0100 |
---|---|---|
committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2011-12-13 15:26:12 +0100 |
commit | c3477895c08397234a4a103911a4b55517a440b6 (patch) | |
tree | 7179e8ffc916937180711c155b51cb5ec29b63b8 /test/files | |
parent | 65b27aa3ab58b39a3b68999f4c6b9d3af7a81f85 (diff) | |
download | scala-c3477895c08397234a4a103911a4b55517a440b6.tar.gz scala-c3477895c08397234a4a103911a4b55517a440b6.tar.bz2 scala-c3477895c08397234a4a103911a4b55517a440b6.zip |
Add test cases for blocking. Fix in the failed projection.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala index 774d4236b7..ffe23de756 100644 --- a/test/files/jvm/scala-concurrent-tck.scala +++ b/test/files/jvm/scala-concurrent-tck.scala @@ -268,7 +268,7 @@ trait FutureProjections extends TestBase { done => val f = future { 0 } try { - println(await(0, f.failed)) + await(0, f.failed) assert(false) } catch { case nsee: NoSuchElementException => done() @@ -280,14 +280,38 @@ trait FutureProjections extends TestBase { testFailedSuccessOnComplete() testFailedSuccessOnFailure() testFailedFailureAwait() - //testFailedSuccessAwait() + testFailedSuccessAwait() } trait Blocking extends TestBase { - // TODO + def testAwaitSuccess(): Unit = once { + done => + val f = future { 0 } + await(0, f) + done() + } + + def testAwaitFailure(): Unit = once { + done => + val cause = new RuntimeException + val f = future { + throw cause + } + try { + await(0, f) + assert(false) + } catch { + case t => + assert(t == cause) + done() + } + } + + testAwaitSuccess() + testAwaitFailure() } |