From 9e155f4956ad608342eb760c6939ebd9aa1a51a8 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Mon, 12 Apr 2010 21:45:17 +0000 Subject: Disabling what I think are the last two failing... Disabling what I think are the last two failing tests, one each of the two leading bugs among those we've seen here today on testing theater: "could not find toMap: (x$1: scala.collection.TraversableOnce,x$2: Predef$<:<)" and "scala.tools.nsc.symtab.Types$TypeError: method react cannot be accessed in java.lang.Object with scala.actors.Reactor[Any] No review but hey lets' see if we can re-enable these tests soonish. --- test/disabled/jvm/actor-getstate.check | 2 + test/disabled/jvm/actor-getstate.scala | 85 ++++++++++++++++++++++++++++++++++ test/disabled/run/infiniteloop.check | 1 + test/disabled/run/infiniteloop.scala | 13 ++++++ test/files/jvm/actor-getstate.check | 2 - test/files/jvm/actor-getstate.scala | 85 ---------------------------------- test/files/run/infiniteloop.check | 1 - test/files/run/infiniteloop.scala | 13 ------ 8 files changed, 101 insertions(+), 101 deletions(-) create mode 100644 test/disabled/jvm/actor-getstate.check create mode 100644 test/disabled/jvm/actor-getstate.scala create mode 100644 test/disabled/run/infiniteloop.check create mode 100644 test/disabled/run/infiniteloop.scala delete mode 100644 test/files/jvm/actor-getstate.check delete mode 100644 test/files/jvm/actor-getstate.scala delete mode 100644 test/files/run/infiniteloop.check delete mode 100644 test/files/run/infiniteloop.scala diff --git a/test/disabled/jvm/actor-getstate.check b/test/disabled/jvm/actor-getstate.check new file mode 100644 index 0000000000..2c94e48371 --- /dev/null +++ b/test/disabled/jvm/actor-getstate.check @@ -0,0 +1,2 @@ +OK +OK diff --git a/test/disabled/jvm/actor-getstate.scala b/test/disabled/jvm/actor-getstate.scala new file mode 100644 index 0000000000..a6e15a8721 --- /dev/null +++ b/test/disabled/jvm/actor-getstate.scala @@ -0,0 +1,85 @@ +import scala.actors.{Reactor, Actor, TIMEOUT} +import Actor._ + +object Test { + + def assert(cond: => Boolean, hint: String) { + if (!cond) + println("FAIL ["+hint+"]") + } + + def expectActorState(a: Reactor[T] forSome { type T }, s: Actor.State.Value) { + var done = false + var i = 0 + while (!done) { + i = i + 1 + if (i == 10) { // only wait for 2 seconds total + println("FAIL ["+a+": expected "+s+"]") + done = true + } + + Thread.sleep(200) + if (a.getState == s) // success + done = true + } + } + + def main(args: Array[String]) { + actor { + val a = new Reactor[Any] { + def act() { + assert(getState == Actor.State.Runnable, "runnable1") + react { + case 'go => + println("OK") + } + } + } + expectActorState(a, Actor.State.New) + + a.start() + expectActorState(a, Actor.State.Suspended) + + a ! 'go + expectActorState(a, Actor.State.Terminated) + + val b = new Actor { + def act() { + assert(getState == Actor.State.Runnable, "runnable2: "+getState) + react { + case 'go => + reactWithin(100000) { + case TIMEOUT => + case 'go => + receive { + case 'go => + } + receiveWithin(100000) { + case TIMEOUT => + case 'go => + println("OK") + } + } + } + } + } + expectActorState(b, Actor.State.New) + + b.start() + expectActorState(b, Actor.State.Suspended) + + b ! 'go + expectActorState(b, Actor.State.TimedSuspended) + + b ! 'go + expectActorState(b, Actor.State.Blocked) + + b ! 'go + expectActorState(b, Actor.State.TimedBlocked) + + b ! 'go + expectActorState(b, Actor.State.Terminated) + } + } + +} diff --git a/test/disabled/run/infiniteloop.check b/test/disabled/run/infiniteloop.check new file mode 100644 index 0000000000..6f8cf6e4d9 --- /dev/null +++ b/test/disabled/run/infiniteloop.check @@ -0,0 +1 @@ +Stream(512, 256, 128, 64, 32, 16, 8, 4, 2, 1) diff --git a/test/disabled/run/infiniteloop.scala b/test/disabled/run/infiniteloop.scala new file mode 100644 index 0000000000..f15674a676 --- /dev/null +++ b/test/disabled/run/infiniteloop.scala @@ -0,0 +1,13 @@ +/** Tests the optimiser (not to loop on 'reverse'). */ + +object Test extends Application { + def foo { + val s3 = Stream.range(1, 1000) //100000 (ticket #153: Stackoverflow) + + // ticket #153 + def powers(x: Int) = if ((x&(x-1)) == 0) Some(x) else None + println(s3.flatMap(powers).reverse) + } + + foo +} diff --git a/test/files/jvm/actor-getstate.check b/test/files/jvm/actor-getstate.check deleted file mode 100644 index 2c94e48371..0000000000 --- a/test/files/jvm/actor-getstate.check +++ /dev/null @@ -1,2 +0,0 @@ -OK -OK diff --git a/test/files/jvm/actor-getstate.scala b/test/files/jvm/actor-getstate.scala deleted file mode 100644 index a6e15a8721..0000000000 --- a/test/files/jvm/actor-getstate.scala +++ /dev/null @@ -1,85 +0,0 @@ -import scala.actors.{Reactor, Actor, TIMEOUT} -import Actor._ - -object Test { - - def assert(cond: => Boolean, hint: String) { - if (!cond) - println("FAIL ["+hint+"]") - } - - def expectActorState(a: Reactor[T] forSome { type T }, s: Actor.State.Value) { - var done = false - var i = 0 - while (!done) { - i = i + 1 - if (i == 10) { // only wait for 2 seconds total - println("FAIL ["+a+": expected "+s+"]") - done = true - } - - Thread.sleep(200) - if (a.getState == s) // success - done = true - } - } - - def main(args: Array[String]) { - actor { - val a = new Reactor[Any] { - def act() { - assert(getState == Actor.State.Runnable, "runnable1") - react { - case 'go => - println("OK") - } - } - } - expectActorState(a, Actor.State.New) - - a.start() - expectActorState(a, Actor.State.Suspended) - - a ! 'go - expectActorState(a, Actor.State.Terminated) - - val b = new Actor { - def act() { - assert(getState == Actor.State.Runnable, "runnable2: "+getState) - react { - case 'go => - reactWithin(100000) { - case TIMEOUT => - case 'go => - receive { - case 'go => - } - receiveWithin(100000) { - case TIMEOUT => - case 'go => - println("OK") - } - } - } - } - } - expectActorState(b, Actor.State.New) - - b.start() - expectActorState(b, Actor.State.Suspended) - - b ! 'go - expectActorState(b, Actor.State.TimedSuspended) - - b ! 'go - expectActorState(b, Actor.State.Blocked) - - b ! 'go - expectActorState(b, Actor.State.TimedBlocked) - - b ! 'go - expectActorState(b, Actor.State.Terminated) - } - } - -} diff --git a/test/files/run/infiniteloop.check b/test/files/run/infiniteloop.check deleted file mode 100644 index 6f8cf6e4d9..0000000000 --- a/test/files/run/infiniteloop.check +++ /dev/null @@ -1 +0,0 @@ -Stream(512, 256, 128, 64, 32, 16, 8, 4, 2, 1) diff --git a/test/files/run/infiniteloop.scala b/test/files/run/infiniteloop.scala deleted file mode 100644 index f15674a676..0000000000 --- a/test/files/run/infiniteloop.scala +++ /dev/null @@ -1,13 +0,0 @@ -/** Tests the optimiser (not to loop on 'reverse'). */ - -object Test extends Application { - def foo { - val s3 = Stream.range(1, 1000) //100000 (ticket #153: Stackoverflow) - - // ticket #153 - def powers(x: Int) = if ((x&(x-1)) == 0) Some(x) else None - println(s3.flatMap(powers).reverse) - } - - foo -} -- cgit v1.2.3