X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FGenericApplicationTests.java;fp=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FGenericApplicationTests.java;h=649cdba9ffc1de59d4a7b2db2316f37f9a303f06;hb=9ae781a6e047a7b857aaf7fd79d134eb7b48b267;hp=b0abf37bfb73a75a92114bfca1f80f5188d6a8be;hpb=4bff99449827596fd62a16165da42225d5956804;p=demos%2Fkafka%2Ftraining

diff --git a/src/test/java/de/juplo/kafka/GenericApplicationTests.java b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
index b0abf37..649cdba 100644
--- a/src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@ -59,7 +59,7 @@ abstract class GenericApplicationTests<K, V>
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	EndlessConsumer<K, V> endlessConsumer;
 	Map<TopicPartition, Long> oldOffsets;
-	Map<TopicPartition, Long> newOffsets;
+	Map<TopicPartition, Long> seenOffsets;
 	Set<ConsumerRecord<K, V>> receivedRecords;
 
 
@@ -92,7 +92,7 @@ abstract class GenericApplicationTests<K, V>
 				.untilAsserted(() ->
 				{
 					checkSeenOffsetsForProgress();
-					compareToCommitedOffsets(newOffsets);
+					assertSeenOffsetsEqualCommittedOffsets(seenOffsets);
 				});
 
 		assertThatExceptionOfType(IllegalStateException.class)
@@ -115,7 +115,7 @@ abstract class GenericApplicationTests<K, V>
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
-		compareToCommitedOffsets(newOffsets);
+		assertSeenOffsetsEqualCommittedOffsets(seenOffsets);
 
 		endlessConsumer.start();
 		await("Consumer failed")
@@ -124,7 +124,7 @@ abstract class GenericApplicationTests<K, V>
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
-		compareToCommitedOffsets(newOffsets);
+		assertSeenOffsetsEqualCommittedOffsets(seenOffsets);
 		assertThat(receivedRecords.size())
 				.describedAs("Received not all sent events")
 				.isLessThan(numberOfGeneratedMessages);
@@ -152,7 +152,7 @@ abstract class GenericApplicationTests<K, V>
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
-		compareToCommitedOffsets(oldOffsets);
+		assertSeenOffsetsAreBehindCommittedOffsets(seenOffsets);
 
 		endlessConsumer.start();
 		await("Consumer failed")
@@ -160,11 +160,7 @@ abstract class GenericApplicationTests<K, V>
 				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> !endlessConsumer.running());
 
-		checkSeenOffsetsForProgress();
-		compareToCommitedOffsets(oldOffsets);
-		assertThat(receivedRecords.size())
-				.describedAs("Received not all sent events")
-				.isLessThan(numberOfGeneratedMessages);
+		assertSeenOffsetsAreBehindCommittedOffsets(seenOffsets);
 
 		assertThatNoException()
 				.describedAs("Consumer should not be running")
@@ -179,18 +175,37 @@ abstract class GenericApplicationTests<K, V>
 
 	/** Helper methods for the verification of expectations */
 
-	void compareToCommitedOffsets(Map<TopicPartition, Long> offsetsToCheck)
+	void assertSeenOffsetsEqualCommittedOffsets(Map<TopicPartition, Long> offsetsToCheck)
 	{
 		doForCurrentOffsets((tp, offset) ->
 		{
 			Long expected = offsetsToCheck.get(tp) + 1;
-			log.debug("Checking, if the offset for {} is {}", tp, expected);
+			log.debug("Checking, if the offset {} for {} is exactly {}", offset, tp, expected);
 			assertThat(offset)
 					.describedAs("Committed offset corresponds to the offset of the consumer")
 					.isEqualTo(expected);
 		});
 	}
 
+	void assertSeenOffsetsAreBehindCommittedOffsets(Map<TopicPartition, Long> offsetsToCheck)
+	{
+		List<Boolean> isOffsetBehindSeen = new LinkedList<>();
+
+		doForCurrentOffsets((tp, offset) ->
+		{
+			Long expected = offsetsToCheck.get(tp) + 1;
+			log.debug("Checking, if the offset {} for {} is at most {}", offset, tp, expected);
+			assertThat(offset)
+					.describedAs("Committed offset corresponds to the offset of the consumer")
+					.isLessThanOrEqualTo(expected);
+			isOffsetBehindSeen.add(offset < expected);
+		});
+
+		assertThat(isOffsetBehindSeen.stream().reduce(false, (result, next) -> result | next))
+				.describedAs("Committed offsets are behind seen offsets")
+				.isTrue();
+	}
+
 	void checkSeenOffsetsForProgress()
 	{
 		// Be sure, that some messages were consumed...!
@@ -198,7 +213,7 @@ abstract class GenericApplicationTests<K, V>
 		partitions().forEach(tp ->
 		{
 			Long oldOffset = oldOffsets.get(tp) + 1;
-			Long newOffset = newOffsets.get(tp) + 1;
+			Long newOffset = seenOffsets.get(tp) + 1;
 			if (!oldOffset.equals(newOffset))
 			{
 				log.debug("Progress for {}: {} -> {}", tp, oldOffset, newOffset);
@@ -315,19 +330,19 @@ abstract class GenericApplicationTests<K, V>
 		seekToEnd();
 
 		oldOffsets = new HashMap<>();
-		newOffsets = new HashMap<>();
+		seenOffsets = new HashMap<>();
 		receivedRecords = new HashSet<>();
 
 		doForCurrentOffsets((tp, offset) ->
 		{
 			oldOffsets.put(tp, offset - 1);
-			newOffsets.put(tp, offset - 1);
+			seenOffsets.put(tp, offset - 1);
 		});
 
 		Consumer<ConsumerRecord<K, V>> captureOffsetAndExecuteTestHandler =
 				record ->
 				{
-					newOffsets.put(
+					seenOffsets.put(
 							new TopicPartition(record.topic(), record.partition()),
 							record.offset());
 					receivedRecords.add(record);