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

Merge branch 'wip-expect-primitives-∂π'

Browse source
This commit is contained in:
Roland 2012-05-16 09:10:58 +02:00
commit 3757fbd24b
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import atomic.AtomicInteger
import scala.annotation.tailrec
import akka.actor.ActorSystem
import akka.util.Timeout
import akka.util.BoxedType
object TestActor {
type Ignore = Option[PartialFunction[AnyRef, Boolean]]
@ -347,7 +348,7 @@ class TestKit(_system: ActorSystem) {
private def expectMsgClass_internal[C](max: Duration, c: Class[C]): C = {
val o = receiveOne(max)
assert(o ne null, "timeout (" + max + ") during expectMsgClass waiting for " + c)
assert(c isInstance o, "expected " + c + ", found " + o.getClass)
assert(BoxedType(c) isInstance o, "expected " + c + ", found " + o.getClass)
o.asInstanceOf[C]
}
@ -389,7 +390,7 @@ class TestKit(_system: ActorSystem) {
private def expectMsgAnyClassOf_internal[C](max: Duration, obj: Class[_ <: C]*): C = {
val o = receiveOne(max)
assert(o ne null, "timeout (" + max + ") during expectMsgAnyClassOf waiting for " + obj.mkString("(", ", ", ")"))
assert(obj exists (_ isInstance o), "found unexpected " + o)
assert(obj exists (c ⇒ BoxedType(c) isInstance o), "found unexpected " + o)
o.asInstanceOf[C]
}
@ -437,8 +438,8 @@ class TestKit(_system: ActorSystem) {
private def expectMsgAllClassOf_internal[T](max: Duration, obj: Class[_ <: T]*): Seq[T] = {
val recv = receiveN_internal(obj.size, max)
obj foreach (x ⇒ assert(recv exists (_.getClass eq x), "not found " + x))
recv foreach (x ⇒ assert(obj exists (_ eq x.getClass), "found non-matching object " + x))
obj foreach (x ⇒ assert(recv exists (_.getClass eq BoxedType(x)), "not found " + x))
recv foreach (x ⇒ assert(obj exists (c ⇒ BoxedType(c) eq x.getClass), "found non-matching object " + x))
recv.asInstanceOf[Seq[T]]
}
@ -462,8 +463,8 @@ class TestKit(_system: ActorSystem) {
private def expectMsgAllConformingOf_internal[T](max: Duration, obj: Class[_ <: T]*): Seq[T] = {
val recv = receiveN_internal(obj.size, max)
obj foreach (x ⇒ assert(recv exists (x isInstance _), "not found " + x))
recv foreach (x ⇒ assert(obj exists (_ isInstance x), "found non-matching object " + x))
obj foreach (x ⇒ assert(recv exists (BoxedType(x) isInstance _), "not found " + x))
recv foreach (x ⇒ assert(obj exists (c ⇒ BoxedType(c) isInstance x), "found non-matching object " + x))
recv.asInstanceOf[Seq[T]]
}

8
akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala
View file

@ -65,6 +65,14 @@ class TestProbeSpec extends AkkaSpec with DefaultTimeout {
expectMsg("end") // verify that "hallo" did not get through
}
"be able to expect primitive types" in {
for (_ ← 1 to 4) testActor ! 42
expectMsgType[Int] must be(42)
expectMsgAnyClassOf(classOf[Int]) must be(42)
expectMsgAllClassOf(classOf[Int]) must be(Seq(42))
expectMsgAllConformingOf(classOf[Int]) must be(Seq(42))
}
}
}