diff options
author | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-09-24 14:58:55 +0200 |
---|---|---|
committer | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-09-25 11:14:46 +0200 |
commit | d69483662a596beb13cf6e128450a1c51881a6f6 (patch) | |
tree | 00322ad5e21483a83501fc0b7ecabee6e3a16fc8 /test | |
parent | db8dea0055739ec39c8765565c5f479ab360acf9 (diff) | |
download | scala-d69483662a596beb13cf6e128450a1c51881a6f6.tar.gz scala-d69483662a596beb13cf6e128450a1c51881a6f6.tar.bz2 scala-d69483662a596beb13cf6e128450a1c51881a6f6.zip |
SI-6305 fix.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm/actmig-PinS_1.scala | 1 | ||||
-rw-r--r-- | test/files/jvm/actmig-PinS_2.scala | 3 | ||||
-rw-r--r-- | test/files/jvm/actmig-PinS_3.scala | 5 | ||||
-rw-r--r-- | test/files/jvm/actmig-public-methods_1.scala | 5 | ||||
-rw-r--r-- | test/files/jvm/actmig-react-receive.scala | 5 | ||||
-rw-r--r-- | test/osgi/src/BasicLibrary.scala | 2 |
6 files changed, 13 insertions, 8 deletions
diff --git a/test/files/jvm/actmig-PinS_1.scala b/test/files/jvm/actmig-PinS_1.scala index 640684f728..db3ced3f0e 100644 --- a/test/files/jvm/actmig-PinS_1.scala +++ b/test/files/jvm/actmig-PinS_1.scala @@ -1,4 +1,5 @@ import scala.actors._ +import scala.actors.migration._ import scala.concurrent.duration._ import scala.concurrent.{ Promise, Await } diff --git a/test/files/jvm/actmig-PinS_2.scala b/test/files/jvm/actmig-PinS_2.scala index 761df6b5a7..b2627b4628 100644 --- a/test/files/jvm/actmig-PinS_2.scala +++ b/test/files/jvm/actmig-PinS_2.scala @@ -1,4 +1,5 @@ -import scala.actors.{ MigrationSystem, StashingActor, ActorRef, Props, Exit } +import scala.actors._ +import scala.actors.migration._ import scala.concurrent.duration._ import scala.concurrent.{ Promise, Await } diff --git a/test/files/jvm/actmig-PinS_3.scala b/test/files/jvm/actmig-PinS_3.scala index de9788724d..8a5eded443 100644 --- a/test/files/jvm/actmig-PinS_3.scala +++ b/test/files/jvm/actmig-PinS_3.scala @@ -1,4 +1,5 @@ -import scala.actors.{ MigrationSystem, StashingActor, ActorRef, Terminated, Props } +import scala.actors._ +import scala.actors.migration._ import scala.concurrent.duration._ import scala.concurrent.{ Promise, Await } @@ -158,4 +159,4 @@ object Test extends App { stash(m) } }, "default-stash-dispatcher")) -}
\ No newline at end of file +} diff --git a/test/files/jvm/actmig-public-methods_1.scala b/test/files/jvm/actmig-public-methods_1.scala index 4bbdc9a71f..74fdee947b 100644 --- a/test/files/jvm/actmig-public-methods_1.scala +++ b/test/files/jvm/actmig-public-methods_1.scala @@ -1,10 +1,11 @@ import scala.collection.mutable.ArrayBuffer import scala.actors.Actor._ import scala.actors._ +import scala.actors.migration._ import scala.util._ import java.util.concurrent.{ TimeUnit, CountDownLatch } -import scala.concurrent.duration.Duration -import scala.actors.pattern._ +import scala.concurrent.duration._ +import scala.actors.migration.pattern._ object Test { val NUMBER_OF_TESTS = 6 diff --git a/test/files/jvm/actmig-react-receive.scala b/test/files/jvm/actmig-react-receive.scala index 280582511f..af36c2ac70 100644 --- a/test/files/jvm/actmig-react-receive.scala +++ b/test/files/jvm/actmig-react-receive.scala @@ -1,6 +1,7 @@ -import scala.actors.MigrationSystem._ +import scala.actors.migration.MigrationSystem._ import scala.actors.Actor._ -import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill } +import scala.actors._ +import scala.actors.migration._ import java.util.concurrent.{ TimeUnit, CountDownLatch } import scala.collection.mutable.ArrayBuffer import scala.concurrent.duration._ diff --git a/test/osgi/src/BasicLibrary.scala b/test/osgi/src/BasicLibrary.scala index 38dea69e99..6618f02102 100644 --- a/test/osgi/src/BasicLibrary.scala +++ b/test/osgi/src/BasicLibrary.scala @@ -29,7 +29,7 @@ class BasicLibraryTest extends ScalaOsgiHelper { def everythingLoads(): Unit = { // Note - This tests sun.misc usage. import scala.concurrent._ - import scala.concurrent.util.Duration.Inf + import scala.concurrent.duration.Duration.Inf import ExecutionContext.Implicits._ val x = Future(2) map (_ + 1) assertEquals(3, Await.result(x, Inf)) |