summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoraleksandar <aleksandar@lampmac14.epfl.ch>2012-01-13 19:32:48 +0100
committeraleksandar <aleksandar@lampmac14.epfl.ch>2012-01-13 19:32:48 +0100
commit7993ec04baf28cd12009d15979c2c904afad89d3 (patch)
tree1b35adc699d75cbd585917ad347f24232db491ea /test
parentf8c3f31f2fbf1544723e4cc3fe4af602dab62372 (diff)
downloadscala-7993ec04baf28cd12009d15979c2c904afad89d3.tar.gz
scala-7993ec04baf28cd12009d15979c2c904afad89d3.tar.bz2
scala-7993ec04baf28cd12009d15979c2c904afad89d3.zip
Migrate akka promises. Changes to some of the interfaces.
Diffstat (limited to 'test')
-rw-r--r--test/files/jvm/scala-concurrent-tck.scala12
1 files changed, 5 insertions, 7 deletions
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
index abd363cedf..a951c09da2 100644
--- a/test/files/jvm/scala-concurrent-tck.scala
+++ b/test/files/jvm/scala-concurrent-tck.scala
@@ -10,9 +10,7 @@ import scala.concurrent.{
}
import scala.concurrent.future
import scala.concurrent.promise
-import scala.concurrent.await
-import scala.concurrent.result
-import scala.concurrent.ready
+import scala.concurrent.blocking
import scala.util.Duration
@@ -314,7 +312,7 @@ trait FutureProjections extends TestBase {
val f = future {
throw cause
}
- assert(result(f.failed, Duration(500, "ms")) == cause)
+ assert(blocking(f.failed, Duration(500, "ms")) == cause)
done()
}
@@ -322,7 +320,7 @@ trait FutureProjections extends TestBase {
done =>
val f = future { 0 }
try {
- ready(f.failed, Duration(0, "ms"))
+ blocking(f.failed, Duration(0, "ms"))
assert(false)
} catch {
case nsee: NoSuchElementException => done()
@@ -344,7 +342,7 @@ trait Blocking extends TestBase {
def testAwaitSuccess(): Unit = once {
done =>
val f = future { 0 }
- ready(f, Duration(500, "ms"))
+ blocking(f, Duration(500, "ms"))
done()
}
@@ -355,7 +353,7 @@ trait Blocking extends TestBase {
throw cause
}
try {
- ready(f, Duration(500, "ms"))
+ blocking(f, Duration(500, "ms"))
assert(false)
} catch {
case t =>