X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FGenericApplicationTests.java;h=8849317a013ebe731893f4fd7dbefa6fa85c88fd;hb=5805651c16e07a0710b88c2822894941f67c313e;hp=54137b44d5a3a66f9557a7e4d3123b3e9e061d0b;hpb=1c6d263c619010d23bf502c14dda45db11a2baf6;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 54137b4..8849317 100644
--- a/src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@ -2,6 +2,7 @@ package de.juplo.kafka;
 
 import com.mongodb.client.MongoClient;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;
@@ -66,7 +67,7 @@ abstract class GenericApplicationTests<K, V>
 	@Autowired
 	MongoProperties mongoProperties;
 	@Autowired
-	PollIntervalAwareConsumerRebalanceListener rebalanceListener;
+	ConsumerRebalanceListener rebalanceListener;
 	@Autowired
 	RecordHandler<K, V> recordHandler;
 
@@ -91,7 +92,7 @@ abstract class GenericApplicationTests<K, V>
 	/** Tests methods */
 
 	@Test
-	void commitsCurrentOffsetsOnSuccess()
+	void commitsCurrentOffsetsOnSuccess() throws Exception
 	{
 		int numberOfGeneratedMessages =
 				recordGenerator.generate(false, false, messageSender);
@@ -114,6 +115,7 @@ abstract class GenericApplicationTests<K, V>
 				.isThrownBy(() -> endlessConsumer.exitStatus())
 				.describedAs("Consumer should still be running");
 
+		endlessConsumer.stop();
 		recordGenerator.assertBusinessLogic();
 	}
 
@@ -211,7 +213,7 @@ abstract class GenericApplicationTests<K, V>
 			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")
+					.describedAs("Committed offset must be at most equal to the offset of the consumer")
 					.isLessThanOrEqualTo(expected);
 			isOffsetBehindSeen.add(offset < expected);
 		});
@@ -385,7 +387,6 @@ abstract class GenericApplicationTests<K, V>
 	{
 		try
 		{
-			endlessConsumer.stop();
 			testRecordProducer.close();
 			offsetConsumer.close();
 		}