From 94ad3f9ff20a8da83495f3c4ece88bb568d7c5fe Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Fri, 10 Sep 2010 18:25:24 +0200
Subject: [PATCH] Added more safeguards to the WorkStealers tests

---
 ...asedEventDrivenWorkStealingDispatcher.scala |  1 -
 ...EventDrivenWorkStealingDispatcherSpec.scala | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala b/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
index c97c16c238..10afb1bfb6 100644
--- a/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
+++ b/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
@@ -200,7 +200,6 @@ class ExecutorBasedEventDrivenWorkStealingDispatcher(
     else {
       new LinkedBlockingDeque[MessageInvocation](mailboxCapacity) with MessageQueue with Runnable {
         def enqueue(handle: MessageInvocation): Unit = this.add(handle)
-
         def dequeue: MessageInvocation = this.poll()
 
         def run = {
diff --git a/akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala b/akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
index cde57a0544..3285e450c6 100644
--- a/akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
+++ b/akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
@@ -5,11 +5,10 @@ import org.scalatest.junit.JUnitSuite
 
 import org.junit.Test
 
-import se.scalablesolutions.akka.dispatch.Dispatchers
-
 import java.util.concurrent.{TimeUnit, CountDownLatch}
 import se.scalablesolutions.akka.actor.{IllegalActorStateException, Actor}
 import Actor._
+import se.scalablesolutions.akka.dispatch.{MessageQueue, Dispatchers}
 
 object ExecutorBasedEventDrivenWorkStealingDispatcherSpec {
   val delayableActorDispatcher = Dispatchers.newExecutorBasedEventDrivenWorkStealingDispatcher("pooled-dispatcher")
@@ -18,7 +17,7 @@ object ExecutorBasedEventDrivenWorkStealingDispatcherSpec {
 
   class DelayableActor(name: String, delay: Int, finishedCounter: CountDownLatch) extends Actor {
     self.dispatcher = delayableActorDispatcher
-    var invocationCount = 0
+    @volatile var invocationCount = 0
     self.id = name
 
     def receive = {
@@ -61,10 +60,14 @@ class ExecutorBasedEventDrivenWorkStealingDispatcherSpec extends JUnitSuite with
     val slow = actorOf(new DelayableActor("slow", 50, finishedCounter)).start
     val fast = actorOf(new DelayableActor("fast", 10, finishedCounter)).start
 
+    var sentToFast = 0
+
     for (i <- 1 to 100) {
       // send most work to slow actor
-      if (i % 20 == 0)
+      if (i % 20 == 0) {
         fast ! i
+        sentToFast += 1
+      }
       else
         slow ! i
     }
@@ -72,13 +75,18 @@ class ExecutorBasedEventDrivenWorkStealingDispatcherSpec extends JUnitSuite with
     // now send some messages to actors to keep the dispatcher dispatching messages
     for (i <- 1 to 10) {
       Thread.sleep(150)
-      if (i % 2 == 0)
+      if (i % 2 == 0) {
         fast ! i
+        sentToFast += 1
+      }
       else
         slow ! i
     }
 
     finishedCounter.await(5, TimeUnit.SECONDS)
+    fast.mailbox.asInstanceOf[MessageQueue].isEmpty must be(true)
+    slow.mailbox.asInstanceOf[MessageQueue].isEmpty must be(true)
+    fast.actor.asInstanceOf[DelayableActor].invocationCount must be > sentToFast
     fast.actor.asInstanceOf[DelayableActor].invocationCount must be >
     (slow.actor.asInstanceOf[DelayableActor].invocationCount)
     slow.stop