From 69a8a77949e02bcbf84f8f5f9b429bd90642048d Mon Sep 17 00:00:00 2001
From: Christopher Batey <christopher.batey@gmail.com>
Date: Tue, 8 May 2018 10:33:36 +0100
Subject: [PATCH] Remove test reliance on application.conf (#25027)

---
 .../src/test/resources/application.conf       | 26 -------------------
 .../akka/actor/typed/ExtensionsSpec.scala     | 13 ++++++++--
 2 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 akka-actor-typed-tests/src/test/resources/application.conf

diff --git a/akka-actor-typed-tests/src/test/resources/application.conf b/akka-actor-typed-tests/src/test/resources/application.conf
deleted file mode 100644
index 02ef9c204b..0000000000
--- a/akka-actor-typed-tests/src/test/resources/application.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-akka.loglevel = DEBUG
-akka.actor.debug.lifecycle = off
-
-dispatcher-1 {
-  fork-join-executor {
-    parallelism-min=1
-    parallelism-max=1
-  }
-}
-dispatcher-2 {
-  fork-join-executor {
-    parallelism-min=2
-    parallelism-max=2
-  }
-}
-dispatcher-8 {
-  fork-join-executor {
-    parallelism-min=8
-    parallelism-max=8
-  }
-}
-
-akka.typed {
-  # for the akka.actor.ExtensionSpec
-  library-extensions += "akka.actor.typed.InstanceCountingExtension"
-}
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala
index 8874f850c9..cbcd4c15ee 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala
@@ -50,6 +50,15 @@ object InstanceCountingExtension extends ExtensionId[DummyExtension1] {
   }
 }
 
+object ExtensionsSpec {
+  val config = ConfigFactory.parseString(
+    """
+akka.typed {
+  library-extensions += "akka.actor.typed.InstanceCountingExtension"
+}
+   """).resolve()
+}
+
 class ExtensionsSpec extends TypedAkkaSpec {
 
   "The extensions subsystem" must {
@@ -161,7 +170,7 @@ class ExtensionsSpec extends TypedAkkaSpec {
     "load registered typed extensions eagerly even for untyped system" in {
       import akka.actor.typed.scaladsl.adapter._
       val beforeCreation = InstanceCountingExtension.createCount.get()
-      val untypedSystem = akka.actor.ActorSystem()
+      val untypedSystem = akka.actor.ActorSystem("as", ExtensionsSpec.config)
       try {
         val before = InstanceCountingExtension.createCount.get()
         InstanceCountingExtension(untypedSystem.toTyped)
@@ -212,7 +221,7 @@ class ExtensionsSpec extends TypedAkkaSpec {
 
     val bootstrap = config match {
       case Some(c) ⇒ BootstrapSetup(c)
-      case None    ⇒ BootstrapSetup()
+      case None    ⇒ BootstrapSetup(ExtensionsSpec.config)
     }
     val system = setup match {
       case None    ⇒ ActorSystem[Any](Behavior.EmptyBehavior, name, bootstrap)