From 7993ec04baf28cd12009d15979c2c904afad89d3 Mon Sep 17 00:00:00 2001
From: aleksandar <aleksandar@lampmac14.epfl.ch>
Date: Fri, 13 Jan 2012 19:32:48 +0100
Subject: Migrate akka promises. Changes to some of the interfaces.

---
 test/files/jvm/scala-concurrent-tck.scala | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'test')

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 =>
-- 
cgit v1.2.3