summaryrefslogtreecommitdiff
path: root/test/files/jvm/actor-getstate.scala
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2010-03-09 10:35:13 +0000
committerPhilipp Haller <hallerp@gmail.com>2010-03-09 10:35:13 +0000
commit0708b61d19f1d69f4017d0f4a5778ed805c0922b (patch)
treedf5cc8b2fc7aa43dbf4518ae70c9c47ccecafcb0 /test/files/jvm/actor-getstate.scala
parentbde2b7880d74af7878267558b26a1d1262fd6131 (diff)
downloadscala-0708b61d19f1d69f4017d0f4a5778ed805c0922b.tar.gz
scala-0708b61d19f1d69f4017d0f4a5778ed805c0922b.tar.bz2
scala-0708b61d19f1d69f4017d0f4a5778ed805c0922b.zip
Made actor-getstate test more robust. No review.
Diffstat (limited to 'test/files/jvm/actor-getstate.scala')
-rw-r--r--test/files/jvm/actor-getstate.scala40
1 files changed, 20 insertions, 20 deletions
diff --git a/test/files/jvm/actor-getstate.scala b/test/files/jvm/actor-getstate.scala
index 9de3247653..8d2ee0ae3c 100644
--- a/test/files/jvm/actor-getstate.scala
+++ b/test/files/jvm/actor-getstate.scala
@@ -2,34 +2,34 @@ import scala.actors.{Reactor, Actor, TIMEOUT}
object Test {
- def assert(cond: => Boolean) {
+ def assert(cond: => Boolean, hint: String) {
if (!cond)
- println("FAIL")
+ println("FAIL ["+hint+"]")
}
def main(args: Array[String]) {
val a = new Reactor[Any] {
def act() {
- assert(getState == Actor.State.Runnable)
+ assert(getState == Actor.State.Runnable, "runnable1")
react {
case 'go =>
println("OK")
}
}
}
- assert(a.getState == Actor.State.New)
+ assert(a.getState == Actor.State.New, "new1")
a.start()
- Thread.sleep(100)
- assert(a.getState == Actor.State.Suspended)
+ Thread.sleep(200)
+ assert(a.getState == Actor.State.Suspended, "suspend1")
a ! 'go
- Thread.sleep(100)
- assert(a.getState == Actor.State.Terminated)
+ Thread.sleep(200)
+ assert(a.getState == Actor.State.Terminated, "terminated1")
val b = new Actor {
def act() {
- assert(getState == Actor.State.Runnable)
+ assert(getState == Actor.State.Runnable, "runnable2")
react {
case 'go =>
reactWithin(100000) {
@@ -47,27 +47,27 @@ object Test {
}
}
}
- assert(b.getState == Actor.State.New)
+ assert(b.getState == Actor.State.New, "new2")
b.start()
- Thread.sleep(100)
- assert(b.getState == Actor.State.Suspended)
+ Thread.sleep(200)
+ assert(b.getState == Actor.State.Suspended, "suspend2")
b ! 'go
- Thread.sleep(100)
- assert(b.getState == Actor.State.TimedSuspended)
+ Thread.sleep(200)
+ assert(b.getState == Actor.State.TimedSuspended, "timedsuspend2")
b ! 'go
- Thread.sleep(100)
- assert(b.getState == Actor.State.Blocked)
+ Thread.sleep(200)
+ assert(b.getState == Actor.State.Blocked, "blocked2")
b ! 'go
- Thread.sleep(100)
- assert(b.getState == Actor.State.TimedBlocked)
+ Thread.sleep(200)
+ assert(b.getState == Actor.State.TimedBlocked, "timedblocked2")
b ! 'go
- Thread.sleep(100)
- assert(b.getState == Actor.State.Terminated)
+ Thread.sleep(200)
+ assert(b.getState == Actor.State.Terminated, "terminated2")
}
}