DIRTYFIX:subscribe

[demos/kafka/chat] / src / test / java / de / juplo / kafka / chat / backend / AbstractHandoverIT.java

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 4df4c1e..b55a4c0 100644 (file)
--- a/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
@@ -4,31 +4,25 @@ import de.juplo.kafka.chat.backend.api.ChatRoomInfoTo;
 import lombok.extern.slf4j.Slf4j;
 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 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.util.concurrent.CompletableFuture;
 
 
 @Testcontainers
 @Slf4j
 public abstract class AbstractHandoverIT
 {
-  static final ParameterizedTypeReference<ServerSentEvent<String>> SSE_TYPE = new ParameterizedTypeReference<>() {};
   static final int NUM_CHATROOMS = 23;
   static final int NUM_CLIENTS = 17;
 
 
   private final AbstractHandoverITContainers containers;
-  private final ExecutorService executorService = Executors.newFixedThreadPool(NUM_CLIENTS + 1);
 
 
   AbstractHandoverIT(AbstractHandoverITContainers containers)
@@ -48,25 +42,36 @@ 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);
-
-    Arrays
-        .stream(testWriters)
-        .forEach(testClient -> testClient.running = false);
-    testListener.running = false;
+    testListener
+        .run()
+        .subscribe(message -> log.info(
+            "Received message: {}",
+            message));
+
+    log.info("Sleeping for 3 seconds...");
+    Thread.sleep(3000);
+
+    for (int i = 0; i < NUM_CLIENTS; i++)
+    {
+      testWriters[i].running = false;
+      testWriterFutures[i].join();
+      log.info("Joined TestWriter {}", testWriters[i].user);
+    }
   }
 
   Mono<ChatRoomInfoTo> createChatRoom(String name)