X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FAbstractHandoverIT.java;h=4d245fd309e78bf641468f0d16a07d2535be49b2;hb=ab1eee218b7944a848148ed4ba0272fea9f23780;hp=dff9b563ace15c6942c616c7cc503aab92aa4aad;hpb=abf2e3be18f2744022ae9e4a1165808028859437;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 dff9b563..4d245fd3 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
@@ -1,16 +1,21 @@
 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;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.testcontainers.junit.jupiter.Testcontainers;
+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;
 
 
@@ -34,6 +39,10 @@ public abstract class AbstractHandoverIT
   @Test
   void test() throws InterruptedException
   {
+    log.info("Starting backend-1...");
+    containers.startBackend(containers.backend1, new TestWriter[0]);
+    log.info("backend-1 started!");
+
     ChatRoomInfoTo[] chatRooms = Flux
         .range(0, NUM_CHATROOMS)
         .flatMap(i -> createChatRoom("room-" + i))
@@ -73,8 +82,27 @@ 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];
+      ChatRoomInfoTo chatRoom = testWriter.chatRoom;
+      List<MessageTo> receivedMessages = testListener.receivedMessages.get(chatRoom.getId());
+
+      Assertions.assertThat(receivedMessages
+          .stream()
+          .filter(message -> message.getUser().equals(testWriter.user.getName()))
+          ).containsExactlyElementsOf(testWriter.sentMessages);
+    }
   }
 
   Mono<ChatRoomInfoTo> createChatRoom(String name)