From a57583fe11cad272ef550a42077319776df35f97 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Fri, 15 Apr 2022 12:22:57 +0200
Subject: [PATCH] =?utf8?q?Tests:=20Refaktorisiert=20-=20Nachrichten=20werd?=
 =?utf8?q?en=20f=C3=BCr=20alle=20Tests=20aufgezeichnet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../java/de/juplo/kafka/ApplicationTests.java | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/test/java/de/juplo/kafka/ApplicationTests.java b/src/test/java/de/juplo/kafka/ApplicationTests.java
index 61e0a8d..4cc4f91 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -69,6 +69,7 @@ class ApplicationTests
 	EndlessConsumer<String, Long> endlessConsumer;
 	Map<TopicPartition, Long> oldOffsets;
 	Map<TopicPartition, Long> newOffsets;
+	Set<ConsumerRecord<String, Long>> receivedRecords;
 
 
 	/** Tests methods */
@@ -79,14 +80,9 @@ class ApplicationTests
 	{
 		send100Messages(i ->  new Bytes(longSerializer.serialize(TOPIC, i)));
 
-		Set<ConsumerRecord<String, Long>> received = new HashSet<>();
-		testHandler = record -> received.add(record);
-
-		endlessConsumer.start();
-
 		await("100 records received")
 				.atMost(Duration.ofSeconds(30))
-				.until(() -> received.size() >= 100);
+				.until(() -> receivedRecords.size() >= 100);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
@@ -106,11 +102,6 @@ class ApplicationTests
 						? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
 						: new Bytes(longSerializer.serialize(TOPIC, counter)));
 
-		Set<ConsumerRecord<String, Long>> received = new HashSet<>();
-		testHandler = record -> received.add(record);
-
-		endlessConsumer.start();
-
 		await("Consumer failed")
 				.atMost(Duration.ofSeconds(30))
 				.until(() -> !endlessConsumer.running());
@@ -125,7 +116,7 @@ class ApplicationTests
 
 		checkSeenOffsetsForProgress();
 		compareToCommitedOffsets(newOffsets);
-		assertThat(received.size())
+		assertThat(receivedRecords.size())
 				.describedAs("Received not all sent events")
 				.isLessThan(100);
 	}
@@ -233,6 +224,7 @@ class ApplicationTests
 
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
+		receivedRecords = new HashSet<>();
 
 		doForCurrentOffsets((tp, offset) ->
 		{
@@ -246,6 +238,7 @@ class ApplicationTests
 					newOffsets.put(
 							new TopicPartition(record.topic(), record.partition()),
 							record.offset());
+					receivedRecords.add(record);
 					testHandler.accept(record);
 				};
 
@@ -256,6 +249,8 @@ class ApplicationTests
 						properties.getTopic(),
 						kafkaConsumer,
 						captureOffsetAndExecuteTestHandler);
+
+		endlessConsumer.start();
 	}
 
 	@AfterEach
-- 
2.20.1