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=6445755ef28071c6c947d484adc8b707e6cbe1ac;hpb=764392103f804972ca81072bd2a9470a9b575d4f;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 6445755e..d86ae9a9 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
@@ -1,21 +1,22 @@
 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.core.ParameterizedTypeReference;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.codec.ServerSentEvent;
 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.Arrays;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 
 @Testcontainers
@@ -27,7 +28,6 @@ public abstract class AbstractHandoverIT
 
 
   private final AbstractHandoverITContainers containers;
-  private final ExecutorService executorService = Executors.newFixedThreadPool(NUM_CLIENTS + 1);
 
 
   AbstractHandoverIT(AbstractHandoverITContainers containers)
@@ -39,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))
@@ -47,25 +51,59 @@ public abstract class AbstractHandoverIT
 
     int port = containers.haproxy.getMappedPort(8400);
 
-    TestWriter[] testWriters = Flux
-        .range(0, NUM_CLIENTS)
-        .map(i -> new TestWriter(
-            port,
-            chatRooms[i % NUM_CHATROOMS],
-            "user-" + Integer.toString(i)))
-        .doOnNext(testClient -> executorService.execute(testClient))
-        .toStream()
-        .toArray(size -> new TestWriter[size]);
+    CompletableFuture<Void>[] testWriterFutures = new CompletableFuture[NUM_CLIENTS];
+    TestWriter[] testWriters = new TestWriter[NUM_CLIENTS];
+    for (int i = 0; i < NUM_CLIENTS; i++)
+    {
+      TestWriter testWriter = new TestWriter(
+          port,
+          chatRooms[i % NUM_CHATROOMS],
+          "user-" + i);
+      testWriters[i] = testWriter;
+      testWriterFutures[i] = testWriter
+          .run()
+          .toFuture();
+    }
 
     TestListener testListener = new TestListener(port, chatRooms);
-    executorService.execute(testListener);
-
-    Thread.sleep(10000);
+    testListener
+        .run()
+        .subscribe(message -> log.info(
+            "Received message: {}",
+            message));
+
+    log.info("Starting backend-2...");
+    containers.startBackend(containers.backend2, testWriters);
+    log.info("backend-2 started!");
+
+    for (int i = 0; i < NUM_CLIENTS; i++)
+    {
+      testWriters[i].running = false;
+      testWriterFutures[i].join();
+      log.info("Joined TestWriter {}", testWriters[i].user);
+    }
+
+    Awaitility
+        .await()
+        .atMost(Duration.ofSeconds(30))
+        .untilAsserted(() -> assertAllSentMessagesReceived(testWriters, testListener));
+  }
 
-    Arrays
-        .stream(testWriters)
-        .forEach(testClient -> testClient.running = false);
-    testListener.running = false;
+  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)