X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=4cc4f91dd2ac0375eb0ab674dfb121d8a097f998;hb=a57583fe11cad272ef550a42077319776df35f97;hp=e35b223666e6b1519292f513f5cd9280b1f5278c;hpb=2939f4b7bae23df34968ce3d87be1b83cf0fba90;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 e35b223..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,12 +80,9 @@ class ApplicationTests
 	{
 		send100Messages(i ->  new Bytes(longSerializer.serialize(TOPIC, i)));
 
-		Set<ConsumerRecord<String, Long>> received = new HashSet<>();
-		testHandler = record -> received.add(record);
-
 		await("100 records received")
 				.atMost(Duration.ofSeconds(30))
-				.until(() -> received.size() >= 100);
+				.until(() -> receivedRecords.size() >= 100);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
@@ -97,7 +95,7 @@ class ApplicationTests
 
 	@Test
 	@Order(2)
-	void commitsNoOffsetsOnError()
+	void commitsOffsetOfErrorForReprocessingOnError()
 	{
 		send100Messages(counter ->
 				counter == 77
@@ -109,7 +107,18 @@ class ApplicationTests
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
-		compareToCommitedOffsets(oldOffsets);
+		compareToCommitedOffsets(newOffsets);
+
+		endlessConsumer.start();
+		await("Consumer failed")
+				.atMost(Duration.ofSeconds(30))
+				.until(() -> !endlessConsumer.running());
+
+		checkSeenOffsetsForProgress();
+		compareToCommitedOffsets(newOffsets);
+		assertThat(receivedRecords.size())
+				.describedAs("Received not all sent events")
+				.isLessThan(100);
 	}
 
 
@@ -121,7 +130,9 @@ class ApplicationTests
 		{
 			Long expected = offsetsToCheck.get(tp) + 1;
 			log.debug("Checking, if the offset for {} is {}", tp, expected);
-			assertThat(offset).isEqualTo(expected);
+			assertThat(offset)
+					.describedAs("Committed offset corresponds to the offset of the consumer")
+					.isEqualTo(expected);
 		});
 	}
 
@@ -139,7 +150,9 @@ class ApplicationTests
 				withProgress.add(tp);
 			}
 		});
-		assertThat(withProgress).isNotEmpty().describedAs("Found no partitions with any offset-progress");
+		assertThat(withProgress)
+				.describedAs("Some offsets must have changed, compared to the old offset-positions")
+				.isNotEmpty();
 	}
 
 
@@ -211,6 +224,7 @@ class ApplicationTests
 
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
+		receivedRecords = new HashSet<>();
 
 		doForCurrentOffsets((tp, offset) ->
 		{
@@ -224,6 +238,7 @@ class ApplicationTests
 					newOffsets.put(
 							new TopicPartition(record.topic(), record.partition()),
 							record.offset());
+					receivedRecords.add(record);
 					testHandler.accept(record);
 				};