raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merging with master

Browse source
This commit is contained in:
Viktor Klang 2011-09-27 18:02:57 +02:00
parent db8a20ea37
commit 24d9a4d143
16 changed files with 187 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-testkit/src/main/scala/akka/testkit/TestKit.scala
View file

@ -42,11 +42,11 @@ class TestActor(queue: BlockingDeque[TestActor.Message]) extends Actor with FSM[
case Ev(SetIgnore(ign)) ⇒ stay using ign
case Ev(StateTimeout) ⇒
stop
case Event(x: AnyRef, ign) ⇒
val ignore = ign map (z ⇒ if (z isDefinedAt x) z(x) else false) getOrElse false
if (!ignore) {
case Event(x: AnyRef, data) ⇒
val observe = data map (ignoreFunc ⇒ if (ignoreFunc isDefinedAt x) !ignoreFunc(x) else true) getOrElse true
if (observe)
queue.offerLast(RealMessage(x, channel))
}
stay
}
initialize
@ -269,10 +269,10 @@ trait TestKitLight {
*
* @return the received object as transformed by the partial function
*/
def expectMsgPF[T](max: Duration = Duration.MinusInf)(f: PartialFunction[Any, T]): T = {
def expectMsgPF[T](max: Duration = Duration.MinusInf, hint: String = "")(f: PartialFunction[Any, T]): T = {
val _max = if (max eq Duration.MinusInf) remaining else max.dilated
val o = receiveOne(_max)
assert(o ne null, "timeout during expectMsg")
assert(o ne null, "timeout during expectMsg: " + hint)
assert(f.isDefinedAt(o), "does not match: " + o)
f(o)
}