X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=aa6dd4d21afd5f17ebf3aaf5640062318f4f2c44;hb=a6a0a22a5fa34a01b0e8b2bc1e0e2b82d7b60f33;hp=4b7ef36f502fdc1946be4c028543b057329adc03;hpb=e53004f3133b737699e995a3b18fff28203a0e8c;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 4b7ef36..aa6dd4d 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -6,7 +6,6 @@ import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.errors.RecordDeserializationException;
 import org.apache.kafka.common.serialization.*;
 import org.apache.kafka.common.utils.Bytes;
 import org.junit.jupiter.api.*;
@@ -21,6 +20,7 @@ import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import java.time.Clock;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
@@ -43,6 +43,7 @@ import static org.awaitility.Awaitility.*;
 		properties = {
 				"consumer.bootstrap-server=${spring.embedded.kafka.brokers}",
 				"consumer.topic=" + TOPIC,
+				"consumer.commit-interval=1s",
 				"spring.mongodb.embedded.version=4.4.13" })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
 @EnableAutoConfiguration
@@ -61,7 +62,7 @@ class ApplicationTests
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
-	KafkaConsumer<String, Long> kafkaConsumer;
+	KafkaConsumer<String, String> kafkaConsumer;
 	@Autowired
 	PartitionStatisticsRepository partitionStatisticsRepository;
 	@Autowired
@@ -71,17 +72,16 @@ class ApplicationTests
 	@Autowired
 	PartitionStatisticsRepository repository;
 
-	Consumer<ConsumerRecord<String, Long>> testHandler;
-	EndlessConsumer<String, Long> endlessConsumer;
+	Consumer<ConsumerRecord<String, String>> testHandler;
+	EndlessConsumer endlessConsumer;
 	Map<TopicPartition, Long> oldOffsets;
 	Map<TopicPartition, Long> newOffsets;
-	Set<ConsumerRecord<String, Long>> receivedRecords;
+	Set<ConsumerRecord<String, String>> receivedRecords;
 
 
 	/** Tests methods */
 
 	@Test
-	@Order(1) // << The poistion pill is not skipped. Hence, this test must run first
 	void commitsCurrentOffsetsOnSuccess() throws ExecutionException, InterruptedException
 	{
 		send100Messages(i ->  new Bytes(valueSerializer.serialize(TOPIC, i)));
@@ -103,41 +103,6 @@ class ApplicationTests
 				.describedAs("Consumer should still be running");
 	}
 
-	@Test
-	@Order(2)
-	void commitsOffsetOfErrorForReprocessingOnError()
-	{
-		send100Messages(counter ->
-				counter == 77
-						? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
-						: new Bytes(valueSerializer.serialize(TOPIC, counter)));
-
-		await("Consumer failed")
-				.atMost(Duration.ofSeconds(30))
-				.until(() -> !endlessConsumer.running());
-
-		checkSeenOffsetsForProgress();
-		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);
-
-		assertThatNoException()
-				.describedAs("Consumer should not be running")
-				.isThrownBy(() -> endlessConsumer.exitStatus());
-		assertThat(endlessConsumer.exitStatus())
-				.describedAs("Consumer should have exited abnormally")
-				.containsInstanceOf(RecordDeserializationException.class);
-	}
-
 
 	/** Helper methods for the verification of expectations */
 
@@ -252,7 +217,7 @@ class ApplicationTests
 			newOffsets.put(tp, offset - 1);
 		});
 
-		Consumer<ConsumerRecord<String, Long>> captureOffsetAndExecuteTestHandler =
+		Consumer<ConsumerRecord<String, String>> captureOffsetAndExecuteTestHandler =
 				record ->
 				{
 					newOffsets.put(
@@ -263,13 +228,14 @@ class ApplicationTests
 				};
 
 		endlessConsumer =
-				new EndlessConsumer<>(
+				new EndlessConsumer(
 						executor,
 						repository,
 						properties.getClientId(),
 						properties.getTopic(),
-						kafkaConsumer,
-						captureOffsetAndExecuteTestHandler);
+						Clock.systemDefaultZone(),
+						properties.getCommitInterval(),
+						kafkaConsumer);
 
 		endlessConsumer.start();
 	}