X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FAbstractHandoverIT.java;h=6445755ef28071c6c947d484adc8b707e6cbe1ac;hb=e8487211cb00abe3afa6a61c58305816ae63fa91;hp=743b9bb4f7fb81573b86dbd61a6389f6759b1131;hpb=f62fc04de07b8088b90defebdb8fdf1319b9e66a;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 743b9bb4..6445755e 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
@@ -16,20 +16,18 @@ import reactor.core.publisher.Mono;
 import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.stream.IntStream;
 
 
 @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);
+  private final ExecutorService executorService = Executors.newFixedThreadPool(NUM_CLIENTS + 1);
 
 
   AbstractHandoverIT(AbstractHandoverITContainers containers)
@@ -43,31 +41,31 @@ public abstract class AbstractHandoverIT
   {
     ChatRoomInfoTo[] chatRooms = Flux
         .range(0, NUM_CHATROOMS)
-        .flatMap(i -> createChatRoom("#" + i))
+        .flatMap(i -> createChatRoom("room-" + i))
         .toStream()
         .toArray(size -> new ChatRoomInfoTo[size]);
 
-    TestClient[] testClients = Flux
-        .fromStream(IntStream.range(0, NUM_CLIENTS).mapToObj(i -> Integer.toString(i)))
-        .map(i -> new TestClient(
-            containers.haproxy.getMappedPort(8400),
-            chatRooms,
-            i))
+    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 TestClient[size]);
+        .toArray(size -> new TestWriter[size]);
+
+    TestListener testListener = new TestListener(port, chatRooms);
+    executorService.execute(testListener);
 
     Thread.sleep(10000);
+
     Arrays
-        .stream(testClients)
+        .stream(testWriters)
         .forEach(testClient -> testClient.running = false);
-
-    Flux
-        .fromArray(chatRooms)
-        .flatMap(chatRoom ->receiveMessages(chatRoom).take(100))
-        .doOnNext(message -> log.info("message: {}", message))
-        .then()
-        .block();
+    testListener.running = false;
   }
 
   Mono<ChatRoomInfoTo> createChatRoom(String name)
@@ -91,18 +89,6 @@ public abstract class AbstractHandoverIT
         });
   }
 
-  Flux<ServerSentEvent<String>> receiveMessages(ChatRoomInfoTo chatRoom)
-  {
-    return webClient
-        .get()
-        .uri(
-            "/{chatRoomId}/listen",
-            chatRoom.getId())
-        .accept(MediaType.TEXT_EVENT_STREAM)
-        .retrieve()
-        .bodyToFlux(SSE_TYPE);
-  }
-
 
   WebClient webClient;