Undeploy verticle before stopping Kafka in StorageTestSuite

Author: julianladisch

src/test/java/org/folio/rest/api/StorageTestSuite.java

@@ -92,6 +92,7 @@ public class StorageTestSuite {
   public static final String TENANT_ID = "test_tenant";
 
   private static Vertx vertx;
+  private static String restVerticleId;
   public static final int PROXY_PORT = NetworkUtils.nextFreePort();
   public static final int OKAPI_MOCK_PORT = NetworkUtils.nextFreePort();
   private static boolean initialised = false;
@@ -196,6 +197,12 @@ public static void after()
       log.warn("after:: removeTenant failed (ignored): {}", e.getMessage());
     }
 
+    try {
+      stopVerticle();
+    } catch (Throwable e) {
+      log.warn("after:: stopVerticle failed (ignored): {}", e.getMessage());
+    }
+
     try {
       kafkaContainer.stop();
     } catch (Throwable e) {
@@ -309,7 +316,12 @@ private static void startVerticle(DeploymentOptions options)
       .onSuccess(deploymentComplete::complete)
       .onFailure(deploymentComplete::completeExceptionally);
 
-    deploymentComplete.get(30, TimeUnit.SECONDS);
+    restVerticleId = deploymentComplete.get(30, TimeUnit.SECONDS);
+  }
+
+  private static void stopVerticle() throws InterruptedException, ExecutionException, TimeoutException {
+    vertx.undeploy(restVerticleId)
+    .toCompletionStage().toCompletableFuture().get(5, TimeUnit.SECONDS);
   }
 
   static protected void prepareTenant(String tenantId, boolean loadSample) {