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

Merge remote branch 'origin/master' into logging

Browse source 
BalancingDispatcherModelSpec is currently broken, leaves count==1 in
wavesOfActors test, committed anyway in order to check out where it
broke before this merge
This commit is contained in:
Roland 2011-11-09 14:56:05 +01:00
commit a747ef7856
190 changed files with 3076 additions and 9153 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,12 +20,12 @@ object TestActor {
trait Message {
def msg: AnyRef
def channel: UntypedChannel
def sender: ActorRef
}
case class RealMessage(msg: AnyRef, channel: UntypedChannel) extends Message
case class RealMessage(msg: AnyRef, sender: ActorRef) extends Message
case object NullMessage extends Message {
override def msg: AnyRef = throw new IllegalActorStateException("last receive did not dequeue a message")
override def channel: UntypedChannel = throw new IllegalActorStateException("last receive did not dequeue a message")
override def sender: ActorRef = throw new IllegalActorStateException("last receive did not dequeue a message")
}
}
@ -44,7 +44,7 @@ class TestActor(queue: BlockingDeque[TestActor.Message]) extends Actor with FSM[
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))
queue.offerLast(RealMessage(x, sender))
stay
}
@ -609,13 +609,13 @@ class TestProbe(_application: AkkaApplication) extends TestKit(_application) {
* Forward this message as if in the TestActor's receive method with self.forward.
*/
def forward(actor: ActorRef, msg: AnyRef = lastMessage.msg) {
actor.!(msg)(lastMessage.channel)
actor.!(msg)(lastMessage.sender)
}
/**
* Get channel of last received message.
* Get sender of last received message.
*/
def channel = lastMessage.channel
def sender = lastMessage.sender
}