Stop client actors at the end of tests; do not wait for graceful shut…

…down in client actor tests. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Sep 28, 2022 · 3258254 · 3258254
1 parent 4fa0a91
commit 3258254
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/...st/java/org/eclipse/ditto/connectivity/service/messaging/AbstractBaseClientActorTest.java b/...st/java/org/eclipse/ditto/connectivity/service/messaging/AbstractBaseClientActorTest.java
@@ -111,6 +111,7 @@ public void retrieveConnectionStatus() {
             clientActor.tell(RetrieveConnectionStatus.of(getConnectionId(), DittoHeaders.empty()), getRef());
 
             expectMsgClass(ResourceStatus.class);
+            getActorSystem().stop(clientActor);
         }};
     }
 
@@ -131,6 +132,7 @@ public void resetConnectionMetrics() {
             clientActor.tell(ResetConnectionMetrics.of(getConnectionId(), DittoHeaders.empty()), getRef());
 
             expectNoMessage();
+            getActorSystem().stop(clientActor);
         }};
     }
 
@@ -206,6 +208,7 @@ public void enableConnectionLogs() {
             clientActor.tell(EnableConnectionLogs.of(getConnectionId(), DittoHeaders.empty()), getRef());
 
             expectNoMessage();
+            getActorSystem().stop(clientActor);
         }};
     }
 
@@ -216,6 +219,7 @@ public void resetConnectionLogs() {
             clientActor.tell(ResetConnectionLogs.of(getConnectionId(), DittoHeaders.empty()), getRef());
 
             expectNoMessage();
+            getActorSystem().stop(clientActor);
         }};
     }
 

diff --git a/...e/src/test/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActorTest.java b/...e/src/test/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActorTest.java
@@ -117,8 +117,7 @@ public static void beforeClass() {
     @AfterClass
     public static void tearDown() {
         if (null != actorSystem) {
-            TestKit.shutdownActorSystem(actorSystem, scala.concurrent.duration.Duration.apply(5, TimeUnit.SECONDS),
-                    false);
+            actorSystem.terminate();
         }
     }
 

diff --git a/.../test/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpClientActorTest.java b/.../test/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpClientActorTest.java
@@ -173,8 +173,9 @@ public void setUp() {
 
     @After
     public void tearDown() {
-        TestKit.shutdownActorSystem(actorSystem, scala.concurrent.duration.Duration.apply(5, TimeUnit.SECONDS),
-                false);
+        if (actorSystem != null) {
+            actorSystem.terminate();
+        }
     }
 
     @AfterClass
@@ -255,6 +256,7 @@ public void testExceptionDuringJMSConnectionCreation() {
             assertThat(failure.cause()).isInstanceOf(ConnectionFailedException.class)
                     .hasMessage("Failed to %s:%s", "create JMS connection", JMS_EXCEPTION.getMessage())
                     .hasCause(JMS_EXCEPTION);
+            getActorSystem().stop(connectionActor);
         }};
     }
 
@@ -280,6 +282,7 @@ public void testConnectionHandling() {
 
             amqpClientActor.tell(RetrieveConnectionStatus.of(CONNECTION_ID, DittoHeaders.empty()), aggregator.ref());
             aggregator.expectMsgClass(ResourceStatus.class);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -306,6 +309,7 @@ public void testReconnect() {
 
             amqpClientActor.tell(CloseConnection.of(CONNECTION_ID, DittoHeaders.empty()), getRef());
             expectMsg(DISCONNECTED_SUCCESS);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -336,6 +340,7 @@ public void testReconnectAndVerifyConnectionStatus() {
 
             amqpClientActor.tell(CloseConnection.of(CONNECTION_ID, DittoHeaders.empty()), getRef());
             expectMsg(DISCONNECTED_SUCCESS);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -398,6 +403,7 @@ public void sendDisconnectWhenAlreadyDisconnected() {
             amqpClientActor.tell(CloseConnection.of(CONNECTION_ID, DittoHeaders.empty()), getRef());
             expectMsg(DISCONNECTED_SUCCESS);
             Mockito.verifyNoInteractions(mockConnection);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -417,6 +423,7 @@ public void testStartConnectionFails() throws JMSException {
             assertThat(failure.cause()).isInstanceOf(ConnectionFailedException.class)
                     .hasMessage("Failed to %s:%s", "connect JMS client", JMS_EXCEPTION.getMessage())
                     .hasCause(JMS_EXCEPTION);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -436,6 +443,7 @@ public void testCreateSessionFails() throws JMSException {
             assertThat(failure.cause()).isInstanceOf(ConnectionFailedException.class)
                     .hasMessage("Failed to %s:%s", "create session", JMS_EXCEPTION.getMessage())
                     .hasCause(JMS_EXCEPTION);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -451,6 +459,7 @@ public void testCreateConsumerFails() throws JMSException {
 
             amqpClientActor.tell(OpenConnection.of(CONNECTION_ID, DittoHeaders.empty()), getRef());
             expectMsgClass(Status.Failure.class);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -489,6 +498,8 @@ public void testSetMessageListenerOnConsumerFails() throws JMSException {
                             return false;
                         });
                     });
+
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -506,6 +517,7 @@ public void testCloseConnectionFails() throws JMSException {
 
             amqpClientActor.tell(CloseConnection.of(CONNECTION_ID, DittoHeaders.empty()), getRef());
             expectMsg(DISCONNECTED_SUCCESS);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -640,6 +652,7 @@ private void testConsumeMessageAndExpectForwardToProxyActor(final Connection con
             if (postStep != null) {
                 postStep.accept(amqpClientActor);
             }
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -811,6 +824,7 @@ public void testConsumerRecreationFailureWhenConnected() throws JMSException {
             // THEN: recreated connection is working
             messageListener.onMessage(mockMessage());
             expectMsgClass(Command.class);
+            getActorSystem().stop(amqpClientActorRef);
         }};
     }
 
@@ -899,6 +913,7 @@ public void testTestConnection() {
 
             amqpClientActor.tell(TestConnection.of(connection, DittoHeaders.empty()), getRef());
             expectMsgClass(Status.Success.class);
+            getActorSystem().stop(amqpClientActor);
         }};
     }
 
@@ -917,6 +932,7 @@ public void testTestConnectionFailsOnTimeout() throws JMSException {
                 amqpClientActor.tell(TestConnection.of(connection, DittoHeaders.empty()), getRef());
                 amqpClientActor.tell(FSM.StateTimeout$.MODULE$, amqpClientActor);
                 expectMsgClass(Status.Failure.class);
+                getActorSystem().stop(amqpClientActor);
             }};
         } finally {
             latch.countDown();

diff --git a/...va/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushClientActorTest.java b/...va/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushClientActorTest.java
@@ -114,7 +114,7 @@ public void createActorSystem() {
     @After
     public void stopActorSystem() {
         if (actorSystem != null) {
-            TestKit.shutdownActorSystem(actorSystem);
+            actorSystem.terminate();
         }
     }
 

diff --git a/...est/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaClientActorTest.java b/...est/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaClientActorTest.java
@@ -102,8 +102,7 @@ private static void startMockServer() {
 
     @AfterClass
     public static void tearDown() {
-        TestKit.shutdownActorSystem(actorSystem, scala.concurrent.duration.Duration.apply(5, TimeUnit.SECONDS),
-                false);
+        actorSystem.terminate();
         stopMockServer();
     }
 

diff --git a/...va/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQClientActorTest.java b/...va/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQClientActorTest.java
@@ -24,7 +24,6 @@
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Stream;
 
@@ -106,7 +105,7 @@ public void setUp() {
 
     @After
     public void tearDown() {
-        TestKit.shutdownActorSystem(actorSystem, scala.concurrent.duration.Duration.apply(5, TimeUnit.SECONDS), false);
+        actorSystem.terminate();
     }
 
     @Before
@@ -122,7 +121,7 @@ public void init() throws IOException, TimeoutException {
     @Test
     public void invalidTargetFormatThrowsConnectionConfigurationInvalidException() {
         final Connection connection = ConnectivityModelFactory.newConnectionBuilder(CONNECTION_ID,
-                ConnectionType.AMQP_091, ConnectivityStatus.OPEN, TestConstants.getUriOfNewMockServer())
+                        ConnectionType.AMQP_091, ConnectivityStatus.OPEN, TestConstants.getUriOfNewMockServer())
                 .targets(Collections.singletonList(ConnectivityModelFactory.newTargetBuilder()
                         .address("exchangeOnly")
                         .authorizationContext(TestConstants.Authorization.AUTHORIZATION_CONTEXT)
@@ -150,7 +149,7 @@ public void testExceptionDuringConnectionFactoryCreation() {
         new TestKit(actorSystem) {{
             final Props props =
                     RabbitMQClientActor.propsForTests(connection, getRef(),
-                            getRef(), (con, exHandler, connectionLogger) -> { throw CUSTOM_EXCEPTION; })
+                                    getRef(), (con, exHandler, connectionLogger) -> {throw CUSTOM_EXCEPTION;})
                             .withDispatcher(CallingThreadDispatcher.Id());
             final ActorRef connectionActor = actorSystem.actorOf(props);
 
@@ -250,7 +249,7 @@ public void testConnectionWithoutPublisherHandling() {
                     TestConstants.createConnection(randomConnectionId, new Target[0]);
             final Props props =
                     RabbitMQClientActor.propsForTests(connectionWithoutTargets, getRef(), getRef(),
-                            (con, exHandler, connectionLogger) -> mockConnectionFactory)
+                                    (con, exHandler, connectionLogger) -> mockConnectionFactory)
                             .withDispatcher(CallingThreadDispatcher.Id());
             final ActorRef rabbitClientActor = actorSystem.actorOf(props);
             watch(rabbitClientActor);

diff --git a/...l/utils/akka/src/test/java/org/eclipse/ditto/internal/utils/akka/ActorSystemResource.java b/...l/utils/akka/src/test/java/org/eclipse/ditto/internal/utils/akka/ActorSystemResource.java
@@ -153,7 +153,7 @@ public void stopActor(final ActorRef actorRef) {
 
     @Override
     protected void after() {
-        TestKit.shutdownActorSystem(actorSystem, Duration.apply(5, TimeUnit.SECONDS), false);
+        actorSystem.terminate();
         actorSystemName = null;
         super.after();
     }