X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FAbstractHandoverIT.java;h=d86ae9a95dc125b9c8281bc2c9ee3a9e3772b872;hb=0e5178b7a3b8c8f3167f99c2d36452a2a68c80fa;hp=24dd335d68c29d8c9d7fa09fe073fea5421cc073;hpb=5219fdeb4a8b50058ea01a0667965229e6c2cab8;p=demos%2Fkafka%2Fchat

diff --git a/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java b/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
index 24dd335d..d86ae9a9 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
@@ -3,6 +3,7 @@ package de.juplo.kafka.chat.backend;
 import de.juplo.kafka.chat.backend.api.ChatRoomInfoTo;
 import de.juplo.kafka.chat.backend.api.MessageTo;
 import lombok.extern.slf4j.Slf4j;
+import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
@@ -13,6 +14,7 @@ import pl.rzrz.assertj.reactor.Assertions;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
@@ -70,8 +72,9 @@ public abstract class AbstractHandoverIT
             "Received message: {}",
             message));
 
-    log.info("Sleeping for 3 seconds...");
-    Thread.sleep(3000);
+    log.info("Starting backend-2...");
+    containers.startBackend(containers.backend2, testWriters);
+    log.info("backend-2 started!");
 
     for (int i = 0; i < NUM_CLIENTS; i++)
     {
@@ -80,9 +83,16 @@ public abstract class AbstractHandoverIT
       log.info("Joined TestWriter {}", testWriters[i].user);
     }
 
-    // Yield the work, so that the last messages can be received
-    Thread.sleep(500);
+    Awaitility
+        .await()
+        .atMost(Duration.ofSeconds(30))
+        .untilAsserted(() -> assertAllSentMessagesReceived(testWriters, testListener));
+  }
 
+  private void assertAllSentMessagesReceived(
+      TestWriter[] testWriters,
+      TestListener testListener)
+  {
     for (int i = 0; i < NUM_CLIENTS; i++)
     {
       TestWriter testWriter = testWriters[i];