fix tests

Signed-off-by: Yannic Klem <Yannic.Klem@bosch.io>
eclipse-ditto · Jun 22, 2022 · 47ca32b · 47ca32b
1 parent f261696
commit 47ca32b
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 135 deletions.
diff --git a/...clipse/ditto/connectivity/service/messaging/AbstractMessageMappingProcessorActorTest.java b/...clipse/ditto/connectivity/service/messaging/AbstractMessageMappingProcessorActorTest.java
@@ -132,7 +132,7 @@ public void setUp() {
         actorSystem = ActorSystem.create("AkkaTestSystem", TestConstants.CONFIG);
         protocolAdapterProvider = ProtocolAdapterProvider.load(TestConstants.PROTOCOL_CONFIG, actorSystem);
         connectionActorProbe = TestProbe.apply("connectionActor", actorSystem);
-        MockProxyActor.create(actorSystem, connectionActorProbe.ref());
+        MockCommandForwarder.create(actorSystem, connectionActorProbe.ref());
         proxyActor = connectionActorProbe.expectMsgClass(ActorRef.class);
     }
 
@@ -173,7 +173,7 @@ void resetActorSystemWithCachingSignalEnrichmentProvider() {
                         )
         );
         final TestProbe probe = TestProbe.apply(actorSystem);
-        MockProxyActor.create(actorSystem, probe.ref());
+        MockCommandForwarder.create(actorSystem, probe.ref());
         proxyActor = probe.expectMsgClass(ActorRef.class);
     }
 

diff --git a/...ity/service/messaging/MockProxyActor.java → ...rvice/messaging/MockCommandForwarder.java b/...ity/service/messaging/MockProxyActor.java → ...rvice/messaging/MockCommandForwarder.java
@@ -12,6 +12,8 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging;
 
+import org.eclipse.ditto.edge.service.dispatching.EdgeCommandForwarderActor;
+
 import akka.actor.AbstractActor;
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
@@ -21,11 +23,11 @@
 /**
  * Mock actor that forwards all messages to the final ActorRef message.
  */
-final class MockProxyActor extends AbstractActor {
+final class MockCommandForwarder extends AbstractActor {
 
     private final ActorRef notificationRecipient;
 
-    private MockProxyActor(final ActorRef notificationRecipient) {
+    private MockCommandForwarder(final ActorRef notificationRecipient) {
         this.notificationRecipient = notificationRecipient;
     }
 
@@ -36,12 +38,13 @@ private MockProxyActor(final ActorRef notificationRecipient) {
      * @param actorSystem the actor system where the mock concierge forwarder is to be created.
      */
     public static ActorRef create(final ActorSystem actorSystem, final ActorRef notificationRecipient) {
-        return actorSystem.actorOf(Props.create(MockProxyActor.class, notificationRecipient), "connectivityRoot");
+        return actorSystem.actorOf(Props.create(MockCommandForwarder.class, notificationRecipient), "connectivityRoot");
     }
 
     @Override
     public void preStart() {
-        getContext().actorOf(Props.create(MockInnerActor.class, notificationRecipient), "connectivityProxyActor");
+        getContext().actorOf(Props.create(MockInnerActor.class, notificationRecipient),
+                EdgeCommandForwarderActor.ACTOR_NAME);
     }
 
     @Override

diff --git a/...a/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java b/...a/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java
@@ -81,7 +81,7 @@ public void setUp() {
         protocolAdapterProvider = ProtocolAdapterProvider.load(TestConstants.PROTOCOL_CONFIG, actorSystem);
         clientActorProbe = TestProbe.apply("clientActor", actorSystem);
         proxyActorProbe = TestProbe.apply("proxyActor", actorSystem);
-        MockProxyActor.create(actorSystem, proxyActorProbe.ref());
+        MockCommandForwarder.create(actorSystem, proxyActorProbe.ref());
         proxyActorProbe.expectMsgClass(ActorRef.class).tell(proxyActorProbe.ref(), proxyActorProbe.ref());
         proxyActorProbe.expectMsgClass(ActorRef.class);
     }

diff --git a/...service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java b/...service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java
@@ -915,11 +915,11 @@ public static ActorRef createConnectionSupervisorActor(final ConnectionId connec
 
     public static ActorRef createConnectionSupervisorActor(final ConnectionId connectionId,
             final ActorSystem actorSystem,
-            final ActorRef proxyActor,
+            final ActorRef commandForwarderActor,
             final ActorRef pubSubMediator) {
 
         final var enforcerActorPropsFactory = ConnectionEnforcerActorPropsFactory.get(actorSystem);
-        final Props props = ConnectionSupervisorActor.props(proxyActor, pubSubMediator, enforcerActorPropsFactory);
+        final Props props = ConnectionSupervisorActor.props(commandForwarderActor, pubSubMediator, enforcerActorPropsFactory);
 
         final Props shardRegionMockProps = Props.create(ShardRegionMockActor.class, props, connectionId.toString());