X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=6aaff523c7071232bd2264fb0f6bca1b1c44cd0f;hb=475d3b4149a49568680ee1f6d6f4a1b7a45845df;hp=5e439d6947bddf94c80bb3fdf6b034d0e709b888;hpb=786482f3457e9ef966b7847c605d176fc6915884;p=demos%2Fkafka%2Ftraining

diff --git a/src/test/java/de/juplo/kafka/ApplicationTests.java b/src/test/java/de/juplo/kafka/ApplicationTests.java
index 5e439d6..6aaff52 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -63,6 +63,9 @@ class ApplicationTests
 	@Autowired
 	ExecutorService executor;
 
+	Map<TopicPartition, Long> oldOffsets;
+	Map<TopicPartition, Long> newOffsets;
+
 
 	@Test
 	@Order(1) // << The poistion pill is not skipped. Hence, this test must run first
@@ -71,14 +74,15 @@ class ApplicationTests
 		send100Messages(i ->  new Bytes(longSerializer.serialize(TOPIC, i)));
 
 		Set<ConsumerRecord<String, Long>> received = new HashSet<>();
-		Map<Integer, Long> offsets = runEndlessConsumer(record ->
+		runEndlessConsumer(record ->
 		{
 			received.add(record);
 			if (received.size() == 100)
 				throw new WakeupException();
 		});
 
-		check(offsets);
+		checkSeenOffsetsForProgress();
+		compareToCommitedOffsets(newOffsets);
 	}
 
 	@Test
@@ -90,11 +94,10 @@ class ApplicationTests
 						? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
 						: new Bytes(longSerializer.serialize(TOPIC, counter)));
 
-		Map<Integer, Long> oldOffsets = new HashMap<>();
-		doForCurrentOffsets((tp, offset) -> oldOffsets.put(tp.partition(), offset -1));
-		Map<Integer, Long> newOffsets = runEndlessConsumer((record) -> {});
+		runEndlessConsumer((record) -> {});
 
-		check(oldOffsets);
+		checkSeenOffsetsForProgress();
+		compareToCommitedOffsets(oldOffsets);
 	}
 
 
@@ -139,11 +142,23 @@ class ApplicationTests
 		}
 	}
 
-	Map<Integer, Long> runEndlessConsumer(Consumer<ConsumerRecord<String, Long>> consumer)
+	EndlessConsumer<String, Long> runEndlessConsumer(Consumer<ConsumerRecord<String, Long>> consumer)
 	{
-		Map<Integer, Long> offsets = new HashMap<>();
-		doForCurrentOffsets((tp, offset) -> offsets.put(tp.partition(), offset -1));
-		Consumer<ConsumerRecord<String, Long>> captureOffset = record -> offsets.put(record.partition(), record.offset());
+		oldOffsets = new HashMap<>();
+		newOffsets = new HashMap<>();
+
+		doForCurrentOffsets((tp, offset) ->
+		{
+			oldOffsets.put(tp, offset - 1);
+			newOffsets.put(tp, offset - 1);
+		});
+
+		Consumer<ConsumerRecord<String, Long>> captureOffset =
+				record ->
+						newOffsets.put(
+								new TopicPartition(record.topic(), record.partition()),
+								record.offset());
+
 		EndlessConsumer<String, Long> endlessConsumer =
 				new EndlessConsumer<>(
 						executor,
@@ -154,7 +169,7 @@ class ApplicationTests
 
 		endlessConsumer.run();
 
-		return offsets;
+		return endlessConsumer;
 	}
 
 	List<TopicPartition> partitions()
@@ -173,11 +188,28 @@ class ApplicationTests
 		kafkaConsumer.unsubscribe();
 	}
 
-	void check(Map<Integer, Long> offsets)
+	void checkSeenOffsetsForProgress()
+	{
+		// Be sure, that some messages were consumed...!
+		Set<TopicPartition> withProgress = new HashSet<>();
+		partitions().forEach(tp ->
+		{
+			Long oldOffset = oldOffsets.get(tp);
+			Long newOffset = newOffsets.get(tp);
+			if (!oldOffset.equals(newOffset))
+			{
+				log.debug("Progress for {}: {} -> {}", tp, oldOffset, newOffset);
+				withProgress.add(tp);
+			}
+		});
+		assertThat(withProgress).isNotEmpty().describedAs("Found no partitions with any offset-progress");
+	}
+
+	void compareToCommitedOffsets(Map<TopicPartition, Long> offsetsToCheck)
 	{
 		doForCurrentOffsets((tp, offset) ->
 		{
-			Long expected = offsets.get(tp.partition()) + 1;
+			Long expected = offsetsToCheck.get(tp) + 1;
 			log.debug("Checking, if the offset for {} is {}", tp, expected);
 			assertThat(offset).isEqualTo(expected);
 		});