From: Kai Moritz <kai@juplo.de>
Date: Sun, 3 Mar 2024 09:20:11 +0000 (+0100)
Subject: test: HandoverIT-POC - fix for the blocking wait for `TestListener`
X-Git-Tag: rebase--2024-03-05--09-07~18
X-Git-Url: https://juplo.de/gitweb/?a=commitdiff_plain;h=e9418896b7b1c89e2299f33822cd314bc22f9b00;p=demos%2Fkafka%2Fchat

test: HandoverIT-POC - fix for the blocking wait for `TestListener`

* Droped the waiting for `TestListener` alltogehter.
* The waiting can be droped, because waiting for the `TestWriter`-instances
  ensures, that all messages are send (and therefore very likely received)
---

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..dff9b563 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/AbstractHandoverIT.java
@@ -57,9 +57,11 @@ 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);
@@ -71,13 +73,8 @@ public abstract class AbstractHandoverIT
       log.info("Joined TestWriter {}", testWriters[i].user);
     }
 
-
-    log.info("Sleeping for 3 seconds...");
-    Thread.sleep(3000);
-    log.info("Joining TestListener...");
-    testListener.running = false;
-    testListenerFuture.join();
-    log.info("Joined TestListener");
+    // Yield the work, so that the last messages can be received
+    Thread.sleep(500);
   }
 
   Mono<ChatRoomInfoTo> createChatRoom(String name)
diff --git a/src/test/java/de/juplo/kafka/chat/backend/TestListener.java b/src/test/java/de/juplo/kafka/chat/backend/TestListener.java
index 35f65acd..78d4c82f 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/TestListener.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/TestListener.java
@@ -12,7 +12,6 @@ import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 
 import java.util.*;
 
@@ -23,7 +22,7 @@ public class TestListener
   static final ParameterizedTypeReference<ServerSentEvent<String>> SSE_TYPE = new ParameterizedTypeReference<>() {};
 
 
-  public Mono<Void> run()
+  public Flux<MessageTo> run()
   {
     return Flux
         .fromArray(chatRooms)
@@ -44,21 +43,8 @@ public class TestListener
                   return Mono.error(e);
                 }
               })
-              .doOnNext(message ->
-              {
-                list.add(message);
-                log.info(
-                    "Received a message from chat-room {}: {}",
-                    chatRoom.getName(),
-                    message);
-              });
-        })
-        .limitRate(10)
-        .takeUntil(message -> !running)
-        .doOnComplete(() -> log.info("TestListener is done"))
-        .parallel(chatRooms.length)
-        .runOn(Schedulers.parallel())
-        .then();
+              .doOnNext(message -> list.add(message));
+        });
   }
 
   Flux<ServerSentEvent<String>> receiveMessages(ChatRoomInfoTo chatRoom)
@@ -80,8 +66,6 @@ public class TestListener
 
   final Map<UUID, List<MessageTo>> receivedMessages = new HashMap<>();
 
-  volatile boolean running = true;
-
 
   TestListener(Integer port, ChatRoomInfoTo[] chatRooms)
   {