Merge branch 'tmp'

akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala

@@ -6,8 +6,10 @@ package docs.actor
 import language.postfixOps
 
 //#testkit
-import akka.testkit.{ AkkaSpec, ImplicitSender, EventFilter }
-import akka.actor.{ ActorRef, Props, Terminated }
+import akka.testkit.{ TestKit, ImplicitSender, EventFilter }
+import akka.actor.{ ActorRef, Props, ActorSystem, Terminated }
+import org.scalatest._
+import com.typesafe.config.{ Config, ConfigFactory }
 
 //#testkit
 object FaultHandlingDocSpec {
@@ -16,8 +18,6 @@ object FaultHandlingDocSpec {
   import akka.actor.Actor
 
   //#child
-  //#supervisor
-  //#supervisor
   class Supervisor extends Actor {
     //#strategy
     import akka.actor.OneForOneStrategy
@@ -79,7 +79,6 @@ object FaultHandlingDocSpec {
 
     def receive = Actor.emptyBehavior
   }
-  //#supervisor
 
   //#child
   class Child extends Actor {
@@ -91,18 +90,24 @@ object FaultHandlingDocSpec {
     }
   }
   //#child
-}
 
-//#testkit
-class FaultHandlingDocSpec extends AkkaSpec with ImplicitSender {
-  //#testkit
+  val testConf: Config = ConfigFactory.parseString("""
+      akka {
+        loggers = ["akka.testkit.TestEventListener"]
+      }
+  """)
+}
 
 import FaultHandlingDocSpec._
 //#testkit
+class FaultHandlingDocSpec extends TestKit(ActorSystem("FaultHandlingDocSpec", testConf))
+  with FlatSpecLike with BeforeAndAfterAll with ImplicitSender {
 
-  "A supervisor" must {
+  override def afterAll() {
+    system.terminate()
+  }
 
-    "apply the chosen strategy for its child" in {
+  "A supervisor" must "apply the chosen strategy for its child" in {
 	  //#testkit
 
     //#create
@@ -140,7 +145,6 @@ class FaultHandlingDocSpec extends AkkaSpec with ImplicitSender {
       //#escalate-kill
       supervisor ! Props[Child] // create new child
       val child2 = expectMsgType[ActorRef]
-
       watch(child2)
       child2 ! "get" // verify it is alive
       expectMsg(0)
@@ -169,5 +173,4 @@ class FaultHandlingDocSpec extends AkkaSpec with ImplicitSender {
     // code here
   }
 }
-}
 //#testkit

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