From 4c4b1a1d2732eb01c0b519cf55ef877a76d3035a Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Wed, 6 Aug 2014 10:12:12 +0200 Subject: [PATCH] =con #15613 Rename one of the DistributedPubSubMediatorSpec classes --- ...ala => DistributedPubSubMediatorRouterSpec.scala} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename akka-contrib/src/test/scala/akka/contrib/pattern/{DistributedPubSubMediatorSpec.scala => DistributedPubSubMediatorRouterSpec.scala} (88%) diff --git a/akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala b/akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorRouterSpec.scala similarity index 88% rename from akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala rename to akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorRouterSpec.scala index 7cef15e7ed..dcce407657 100644 --- a/akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorRouterSpec.scala @@ -11,7 +11,7 @@ case class WrappedMessage(msg: String) extends RouterEnvelope { case class UnwrappedMessage(msg: String) -object DistributedPubSubMediatorSpec { +object DistributedPubSubMediatorRouterSpec { def config(routingLogic: String) = s""" akka.loglevel = INFO akka.actor.provider = "akka.cluster.ClusterActorRefProvider" @@ -20,7 +20,7 @@ object DistributedPubSubMediatorSpec { """ } -trait DistributedPubSubMediatorSpec { this: WordSpecLike with TestKit with ImplicitSender ⇒ +trait DistributedPubSubMediatorRouterSpec { this: WordSpecLike with TestKit with ImplicitSender ⇒ def nonUnwrappingPubSub(mediator: ActorRef, testActor: ActorRef, msg: Any) { val path = testActor.path.toStringWithoutAddress @@ -82,8 +82,8 @@ trait DistributedPubSubMediatorSpec { this: WordSpecLike with TestKit with Impli } class DistributedPubSubMediatorWithRandomRouterSpec - extends AkkaSpec(DistributedPubSubMediatorSpec.config("random")) - with DistributedPubSubMediatorSpec with DefaultTimeout with ImplicitSender { + extends AkkaSpec(DistributedPubSubMediatorRouterSpec.config("random")) + with DistributedPubSubMediatorRouterSpec with DefaultTimeout with ImplicitSender { val mediator = DistributedPubSubExtension(system).mediator @@ -99,8 +99,8 @@ class DistributedPubSubMediatorWithRandomRouterSpec } class DistributedPubSubMediatorWithHashRouterSpec - extends AkkaSpec(DistributedPubSubMediatorSpec.config("consistent-hashing")) - with DistributedPubSubMediatorSpec with DefaultTimeout with ImplicitSender { + extends AkkaSpec(DistributedPubSubMediatorRouterSpec.config("consistent-hashing")) + with DistributedPubSubMediatorRouterSpec with DefaultTimeout with ImplicitSender { "DistributedPubSubMediator with Consistent Hash router" must { "not be allowed" when {