Merge branch 'master' into wip-camel-java-docs

2012-07-23 12:20:36 +02:00 · 2012-07-23 12:20:36 +02:00 · 4dbb507793
commit 4dbb507793
parent 6c43fb4235 3856ec9357
2 changed files with 11 additions and 2 deletions
--- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
@ -153,6 +153,15 @@ class RoutingSpec extends AkkaSpec(RoutingSpec.config) with DefaultTimeout with
        expectMsgType[RouterRoutees].routees.head ! Kill
      }
      expectMsgType[ActorKilledException]
+
+      //#supervision
+
+      val router2 = system.actorOf(Props.empty.withRouter(RoundRobinRouter(1).withSupervisorStrategy(escalator)))
+      router2 ! CurrentRoutees
+      EventFilter[ActorKilledException](occurrences = 2) intercept {
+        expectMsgType[RouterRoutees].routees.head ! Kill
+      }
+      expectMsgType[ActorKilledException]
    }

    "default to all-for-one-always-escalate strategy" in {