X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FAbstractHandoverIT.java;h=6e7b9129895b3f1a2ceca5fae641620eac2d6ec9;hb=42448259d41e4658753590f6f1b6a0cd7dc9e8f9;hp=bbb2fbb54c38edd24ec6aa1e6789cac31b5b9de0;hpb=099e03f7805f3c05b94be4e5d074bfb2c47943ce;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 bbb2fbb5..6e7b9129 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,20 @@
 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.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 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.util.List;
 import java.util.concurrent.CompletableFuture;
 
 
@@ -31,6 +35,7 @@ public abstract class AbstractHandoverIT
   }
 
 
+  @Disabled
   @Test
   void test() throws InterruptedException
   {
@@ -57,27 +62,52 @@ public abstract class AbstractHandoverIT
     }
 
     TestListener testListener = new TestListener(port, chatRooms);
-    CompletableFuture<Void> testListenerFuture = testListener
+    testListener
         .run()
-        .toFuture();
+        .subscribe(message -> log.info(
+            "Received message: {}",
+            message));
 
     log.info("Sleeping for 3 seconds...");
     Thread.sleep(3000);
 
+    log.info("Starting Backend 2...");
+    containers.backend2.start();
+    log.info("Backend 2 started");
+
+    log.info("Sleeping for 3 seconds...");
+    Thread.sleep(3000);
+
+    log.info("Starting Backend 3...");
+    containers.backend3.start();
+    log.info("Backend 3 started");
+
+    log.info("Sleeping for 3 seconds...");
+    Thread.sleep(3000);
+
+    log.info("Shutting down writers...");
     for (int i = 0; i < NUM_CLIENTS; i++)
     {
+      log.info("Shutting down writer {}", i);
       testWriters[i].running = false;
       testWriterFutures[i].join();
       log.info("Joined TestWriter {}", testWriters[i].user);
     }
 
+    // Yield the work, so that the last messages can be received
+    Thread.sleep(500);
 
-    log.info("Sleeping for 3 seconds...");
-    Thread.sleep(3000);
-    log.info("Joining TestListener...");
-    testListener.running = false;
-    testListenerFuture.join();
-    log.info("Joined 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)