From e045c537a3757d988aedb71c81f53dcbe33ce488 Mon Sep 17 00:00:00 2001
From: Dario Rexin <dario.rexin@r3-tech.de>
Date: Fri, 17 Jan 2014 23:08:32 +0100
Subject: [PATCH] !tes #3544 Added 'system' as default parameter to the
 shutdown method on TestKit

---
 akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala  | 2 +-
 .../test/scala/akka/camel/internal/ActivationTrackerTest.scala  | 2 +-
 .../scala/akka/camel/internal/component/ActorProducerTest.scala | 2 +-
 .../scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala   | 2 +-
 akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala    | 2 +-
 akka-testkit/src/main/scala/akka/testkit/TestKit.scala          | 2 +-
 akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
index 57177404d8..086d9581eb 100644
--- a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
@@ -31,7 +31,7 @@ class ProducerFeatureTest extends TestKit(ActorSystem("test", AkkaSpec.testConf)
 
   override protected def afterAll() {
     super.afterAll()
-    shutdown(system)
+    shutdown()
   }
 
   val camelContext = camel.context
diff --git a/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala
index c9196e7789..3ee04bcff2 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala
@@ -11,7 +11,7 @@ import akka.camel.internal.ActivationProtocol._
 
 class ActivationTrackerTest extends TestKit(ActorSystem("test")) with WordSpecLike with Matchers with BeforeAndAfterAll with BeforeAndAfterEach with GivenWhenThen {
 
-  override protected def afterAll() { shutdown(system) }
+  override protected def afterAll() { shutdown() }
 
   var actor: TestProbe = _
   var awaiting: Awaiting = _
diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
index b4b4bd9f49..851e61f673 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
@@ -379,7 +379,7 @@ private[camel] trait ActorProducerFixture extends MockitoSugar with BeforeAndAft
   }
 
   override protected def afterAll() {
-    shutdown(system)
+    shutdown()
   }
 
   def msg(s: String) = CamelMessage(s, Map.empty)
diff --git a/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala b/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala
index 88bc396e93..cc4958f240 100644
--- a/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala
+++ b/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala
@@ -46,7 +46,7 @@ class TimerBasedThrottlerSpec extends TestKit(ActorSystem("TimerBasedThrottlerSp
   import TimerBasedThrottlerSpec._
 
   override def afterAll {
-    shutdown(system)
+    shutdown()
   }
 
   "A throttler" must {
diff --git a/akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala b/akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala
index bcc61707a8..92675bb46c 100644
--- a/akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala
+++ b/akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala
@@ -45,7 +45,7 @@ class TestKitUsageSpec
     system.actorOf(Props(classOf[SequencingActor], testActor, headList, tailList))
 
   override def afterAll {
-    shutdown(system)
+    shutdown()
   }
 
   "An EchoActor" should {
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
index 586eb226f4..44c8bdb97e 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
@@ -656,7 +656,7 @@ trait TestKitBase {
    *
    * If verifySystemShutdown is true, then an exception will be thrown on failure.
    */
-  def shutdown(actorSystem: ActorSystem,
+  def shutdown(actorSystem: ActorSystem = system,
                duration: Duration = 5.seconds.dilated.min(10.seconds),
                verifySystemShutdown: Boolean = false) {
     TestKit.shutdownActorSystem(actorSystem, duration, verifySystemShutdown)
diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
index a1b8dbef2b..6379f0c769 100644
--- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
@@ -72,7 +72,7 @@ abstract class AkkaSpec(_system: ActorSystem)
 
   final override def afterAll {
     beforeTermination()
-    shutdown(system)
+    shutdown()
     afterTermination()
     stopCoroner()
   }