X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=26a34e406639f652c53878dcd8db12d7174598fd;hb=c446512ec3bfa29e5e8482074cb6daf7e2ee1b2f;hp=35d13cdda9ecb9749edbaeb6be8fc905fbe30c45;hpb=9d3fa83eb656617162d54a14e1bfcb330fa4ee3a;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 35d13cd..26a34e4 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -7,10 +7,7 @@ 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.BytesDeserializer;
-import org.apache.kafka.common.serialization.BytesSerializer;
-import org.apache.kafka.common.serialization.LongSerializer;
-import org.apache.kafka.common.serialization.StringSerializer;
+import org.apache.kafka.common.serialization.*;
 import org.apache.kafka.common.utils.Bytes;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,16 +25,13 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static de.juplo.kafka.ApplicationTests.PARTITIONS;
 import static de.juplo.kafka.ApplicationTests.TOPIC;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 import static org.awaitility.Awaitility.*;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 
 @SpringJUnitConfig(initializers = ConfigDataApplicationContextInitializer.class)
@@ -45,7 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 @TestPropertySource(
 		properties = {
 				"consumer.bootstrap-server=${spring.embedded.kafka.brokers}",
-				"consumer.topic=" + TOPIC })
+				"consumer.topic=" + TOPIC,
+				"consumer.commit-interval=100ms" })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
 @Slf4j
 class ApplicationTests
@@ -55,8 +50,9 @@ class ApplicationTests
 
 
 	StringSerializer stringSerializer = new StringSerializer();
-	LongSerializer longSerializer = new LongSerializer();
 
+	@Autowired
+	Serializer valueSerializer;
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
@@ -78,10 +74,13 @@ class ApplicationTests
 	/** 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(longSerializer.serialize(TOPIC, i)));
+		send100Messages((partition, key, counter) ->
+		{
+			Bytes value = new Bytes(valueSerializer.serialize(TOPIC, counter));
+			return new ProducerRecord<>(TOPIC, partition, key, value);
+		});
 
 		await("100 records received")
 				.atMost(Duration.ofSeconds(30))
@@ -95,20 +94,21 @@ class ApplicationTests
 					compareToCommitedOffsets(newOffsets);
 				});
 
-		assertThrows(
-				IllegalStateException.class,
-				() -> endlessConsumer.exitStatus(),
-				"Consumer should still be running");
+		assertThatExceptionOfType(IllegalStateException.class)
+				.isThrownBy(() -> endlessConsumer.exitStatus())
+				.describedAs("Consumer should still be running");
 	}
 
 	@Test
-	@Order(2)
-	void commitsOffsetOfErrorForReprocessingOnError()
+	void commitsOffsetOfErrorForReprocessingOnDeserializationError()
 	{
-		send100Messages(counter ->
-				counter == 77
-						? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
-						: new Bytes(longSerializer.serialize(TOPIC, counter)));
+		send100Messages((partition, key, counter) ->
+		{
+			Bytes value = counter == 77
+					? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
+					: new Bytes(valueSerializer.serialize(TOPIC, counter));
+			return new ProducerRecord<>(TOPIC, partition, key, value);
+		});
 
 		await("Consumer failed")
 				.atMost(Duration.ofSeconds(30))
@@ -128,9 +128,9 @@ class ApplicationTests
 				.describedAs("Received not all sent events")
 				.isLessThan(100);
 
-		assertDoesNotThrow(
-				() -> endlessConsumer.exitStatus(),
-				"Consumer should not be running");
+		assertThatNoException()
+				.describedAs("Consumer should not be running")
+				.isThrownBy(() -> endlessConsumer.exitStatus());
 		assertThat(endlessConsumer.exitStatus())
 				.describedAs("Consumer should have exited abnormally")
 				.containsInstanceOf(RecordDeserializationException.class);
@@ -157,8 +157,8 @@ class ApplicationTests
 		Set<TopicPartition> withProgress = new HashSet<>();
 		partitions().forEach(tp ->
 		{
-			Long oldOffset = oldOffsets.get(tp);
-			Long newOffset = newOffsets.get(tp);
+			Long oldOffset = oldOffsets.get(tp) + 1;
+			Long newOffset = newOffsets.get(tp) + 1;
 			if (!oldOffset.equals(newOffset))
 			{
 				log.debug("Progress for {}: {} -> {}", tp, oldOffset, newOffset);
@@ -173,6 +173,21 @@ class ApplicationTests
 
 	/** Helper methods for setting up and running the tests */
 
+	void seekToEnd()
+	{
+		offsetConsumer.assign(partitions());
+		offsetConsumer.seekToEnd(partitions());
+		partitions().forEach(tp ->
+		{
+			// seekToEnd() works lazily: it only takes effect on poll()/position()
+			Long offset = offsetConsumer.position(tp);
+			log.info("New position for {}: {}", tp, offset);
+		});
+		// The new positions must be commited!
+		offsetConsumer.commitSync();
+		offsetConsumer.unsubscribe();
+	}
+
 	void doForCurrentOffsets(BiConsumer<TopicPartition, Long> consumer)
 	{
 		offsetConsumer.assign(partitions());
@@ -190,7 +205,12 @@ class ApplicationTests
 	}
 
 
-	void send100Messages(Function<Long, Bytes> messageGenerator)
+	public interface RecordGenerator<K, V>
+	{
+		public ProducerRecord<String, Bytes> generate(int partition, String key, long counter);
+	}
+
+	void send100Messages(RecordGenerator recordGenerator)
 	{
 		long i = 0;
 
@@ -198,14 +218,8 @@ class ApplicationTests
 		{
 			for (int key = 0; key < 10; key++)
 			{
-				Bytes value = messageGenerator.apply(++i);
-
 				ProducerRecord<String, Bytes> record =
-						new ProducerRecord<>(
-								TOPIC,
-								partition,
-								Integer.toString(key%2),
-								value);
+						recordGenerator.generate(partition, Integer.toString(partition*10+key%2), ++i);
 
 				kafkaProducer.send(record, (metadata, e) ->
 				{
@@ -237,6 +251,8 @@ class ApplicationTests
 	{
 		testHandler = record -> {} ;
 
+		seekToEnd();
+
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
 		receivedRecords = new HashSet<>();
@@ -286,6 +302,12 @@ class ApplicationTests
 	@Import(ApplicationConfiguration.class)
 	public static class Configuration
 	{
+		@Bean
+		Serializer<Long> serializer()
+		{
+			return new LongSerializer();
+		}
+
 		@Bean
 		KafkaProducer<String, Bytes> kafkaProducer(ApplicationProperties properties)
 		{