From 2acfb8cfac34a2f0a003f35c2b284cf6a9bd9f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= Date: Fri, 16 Sep 2016 11:47:29 +0200 Subject: [PATCH] #21466 Wrong protocol name expected in tests when using Artery --- .../ddata/protobuf/ReplicatedDataSerializerSpec.scala | 9 ++++++--- .../ddata/protobuf/ReplicatorMessageSerializerSpec.scala | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala index e96cca39e1..0869b20b1f 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala @@ -23,6 +23,7 @@ import akka.cluster.ddata.Replicator.Internal._ import akka.cluster.ddata.VersionVector import akka.testkit.TestKit import akka.cluster.UniqueAddress +import akka.remote.RARP import com.typesafe.config.ConfigFactory class ReplicatedDataSerializerSpec extends TestKit(ActorSystem( @@ -34,9 +35,11 @@ class ReplicatedDataSerializerSpec extends TestKit(ActorSystem( val serializer = new ReplicatedDataSerializer(system.asInstanceOf[ExtendedActorSystem]) - val address1 = UniqueAddress(Address("akka.tcp", system.name, "some.host.org", 4711), 1) - val address2 = UniqueAddress(Address("akka.tcp", system.name, "other.host.org", 4711), 2) - val address3 = UniqueAddress(Address("akka.tcp", system.name, "some.host.org", 4712), 3) + val Protocol = if (RARP(system).provider.remoteSettings.Artery.Enabled) "akka" else "akka.tcp" + + val address1 = UniqueAddress(Address(Protocol, system.name, "some.host.org", 4711), 1) + val address2 = UniqueAddress(Address(Protocol, system.name, "other.host.org", 4711), 2) + val address3 = UniqueAddress(Address(Protocol, system.name, "some.host.org", 4712), 3) override def afterAll { shutdown() diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala index 314e1f34b9..70c314315f 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala @@ -21,6 +21,7 @@ import akka.cluster.ddata.Replicator.Internal._ import akka.testkit.TestKit import akka.util.ByteString import akka.cluster.UniqueAddress +import akka.remote.RARP import com.typesafe.config.ConfigFactory class ReplicatorMessageSerializerSpec extends TestKit(ActorSystem( @@ -32,9 +33,11 @@ class ReplicatorMessageSerializerSpec extends TestKit(ActorSystem( val serializer = new ReplicatorMessageSerializer(system.asInstanceOf[ExtendedActorSystem]) - val address1 = UniqueAddress(Address("akka.tcp", system.name, "some.host.org", 4711), 1) - val address2 = UniqueAddress(Address("akka.tcp", system.name, "other.host.org", 4711), 2) - val address3 = UniqueAddress(Address("akka.tcp", system.name, "some.host.org", 4712), 3) + val Protocol = if (RARP(system).provider.remoteSettings.Artery.Enabled) "akka" else "akka.tcp" + + val address1 = UniqueAddress(Address(Protocol, system.name, "some.host.org", 4711), 1) + val address2 = UniqueAddress(Address(Protocol, system.name, "other.host.org", 4711), 2) + val address3 = UniqueAddress(Address(Protocol, system.name, "some.host.org", 4712), 3) val keyA = GSetKey[String]("A")