X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FGenericApplicationTests.java;h=49ddb47e1f2db54dc9cf3e570c54a14cbfe5591a;hb=0c9a0c1cf9a0065012743efcd940d8721bc33c20;hp=753debe2b00344766c2c9a4f90286e0b6e075337;hpb=f095f71a104fcde025a63f87ba75eb5cb3136656;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 753debe..49ddb47 100644
--- a/src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@ -2,7 +2,6 @@ package de.juplo.kafka;
 
 import com.mongodb.client.MongoClient;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -69,9 +68,9 @@ abstract class GenericApplicationTests<K, V>
 	@Autowired
 	KafkaListenerEndpointRegistry kafkaListenerEndpointRegistry;
 	@Autowired
-	TestRecordHandler<K, V> recordHandler;
+	TestRecordHandler recordHandler;
 	@Autowired
-	EndlessConsumer<K, V> endlessConsumer;
+	EndlessConsumer endlessConsumer;
 
 	KafkaProducer<Bytes, Bytes> testRecordProducer;
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
@@ -99,7 +98,7 @@ abstract class GenericApplicationTests<K, V>
 		await(numberOfGeneratedMessages + " records received")
 				.atMost(Duration.ofSeconds(30))
 				.pollInterval(Duration.ofSeconds(1))
-				.until(() -> recordHandler.receivedRecords.size() >= numberOfGeneratedMessages);
+				.until(() -> recordHandler.receivedMessages >= numberOfGeneratedMessages);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
@@ -141,7 +140,7 @@ abstract class GenericApplicationTests<K, V>
 
 		checkSeenOffsetsForProgress();
 		assertSeenOffsetsEqualCommittedOffsets(recordHandler.seenOffsets);
-		assertThat(recordHandler.receivedRecords.size())
+		assertThat(recordHandler.receivedMessages)
 				.describedAs("Received not all sent events")
 				.isLessThan(numberOfGeneratedMessages);
 
@@ -157,7 +156,7 @@ abstract class GenericApplicationTests<K, V>
 
 	@Test
 	@SkipWhenErrorCannotBeGenerated(logicError = true)
-	void doesNotCommitOffsetsOnLogicError()
+	void commitsOffsetsOfUnseenRecordsOnLogicError()
 	{
 		int numberOfGeneratedMessages =
 				recordGenerator.generate(false, true, messageSender);
@@ -168,7 +167,7 @@ abstract class GenericApplicationTests<K, V>
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
-		assertSeenOffsetsAreBehindCommittedOffsets(recordHandler.seenOffsets);
+		assertSeenOffsetsEqualCommittedOffsets(recordHandler.seenOffsets);
 
 		endlessConsumer.start();
 		await("Consumer failed")
@@ -176,7 +175,7 @@ abstract class GenericApplicationTests<K, V>
 				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> !endlessConsumer.running());
 
-		assertSeenOffsetsAreBehindCommittedOffsets(recordHandler.seenOffsets);
+		assertSeenOffsetsEqualCommittedOffsets(recordHandler.seenOffsets);
 
 		assertThatNoException()
 				.describedAs("Consumer should not be running")
@@ -348,7 +347,7 @@ abstract class GenericApplicationTests<K, V>
 
 		oldOffsets = new HashMap<>();
 		recordHandler.seenOffsets = new HashMap<>();
-		recordHandler.receivedRecords = new HashSet<>();
+		recordHandler.receivedMessages = 0;
 
 		doForCurrentOffsets((tp, offset) ->
 		{