From a18c1bbafb0a64b55eae4993820ccba4cbbbb608 Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Tue, 27 Jan 2015 16:25:13 +0100 Subject: [PATCH] fix up wrong includecode comments in FaultHandlingDocSpec --- .../rst/scala/code/docs/actor/FaultHandlingDocSpec.scala | 6 +----- akka-docs/rst/scala/fault-tolerance.rst | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala index cdd4371854..f8025e9854 100644 --- a/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala @@ -18,8 +18,6 @@ object FaultHandlingDocSpec { import akka.actor.Actor //#child - //#supervisor - //#supervisor class Supervisor extends Actor { //#strategy import akka.actor.OneForOneStrategy @@ -81,7 +79,6 @@ object FaultHandlingDocSpec { def receive = Actor.emptyBehavior } - //#supervisor //#child class Child extends Actor { @@ -109,10 +106,9 @@ class FaultHandlingDocSpec extends TestKit(ActorSystem("FaultHandlingDocSpec", t override def afterAll() { system.terminate() } - //#testkit "A supervisor" must "apply the chosen strategy for its child" in { - //#testkit + //#testkit //#create val supervisor = system.actorOf(Props[Supervisor], "supervisor") diff --git a/akka-docs/rst/scala/fault-tolerance.rst b/akka-docs/rst/scala/fault-tolerance.rst index 85d6156010..42462b33dc 100644 --- a/akka-docs/rst/scala/fault-tolerance.rst +++ b/akka-docs/rst/scala/fault-tolerance.rst @@ -127,8 +127,8 @@ This supervisor will be used to create a child, with which we can experiment: :include: child The test is easier by using the utilities described in :ref:`akka-testkit`, -where ``AkkaSpec`` is a convenient mixture of ``TestKit with WordSpec with -MustMatchers`` +where ``AkkaSpec`` is a convenient mixture of +``TestKit with WordSpec with MustMatchers`` .. includecode:: code/docs/actor/FaultHandlingDocSpec.scala :include: testkit