X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=92074fffbbe12df59266f038af1be8424e27c645;hb=1206d7938f995eed3353d2bd3e26241f30b88e44;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..92074ff 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -6,10 +6,8 @@ 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.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.errors.RecordDeserializationException;
+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;
@@ -35,6 +33,8 @@ 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.awaitility.Awaitility.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 
 @SpringJUnitConfig(initializers = ConfigDataApplicationContextInitializer.class)
@@ -52,8 +52,9 @@ class ApplicationTests
 
 
 	StringSerializer stringSerializer = new StringSerializer();
-	LongSerializer longSerializer = new LongSerializer();
 
+	@Autowired
+	Serializer valueSerializer;
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
@@ -69,6 +70,7 @@ class ApplicationTests
 	EndlessConsumer<String, Long> endlessConsumer;
 	Map<TopicPartition, Long> oldOffsets;
 	Map<TopicPartition, Long> newOffsets;
+	Set<ConsumerRecord<String, Long>> receivedRecords;
 
 
 	/** Tests methods */
@@ -77,14 +79,11 @@ class ApplicationTests
 	@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)));
-
-		Set<ConsumerRecord<String, Long>> received = new HashSet<>();
-		testHandler = record -> received.add(record);
+		send100Messages(i ->  new Bytes(valueSerializer.serialize(TOPIC, i)));
 
 		await("100 records received")
 				.atMost(Duration.ofSeconds(30))
-				.until(() -> received.size() >= 100);
+				.until(() -> receivedRecords.size() >= 100);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
@@ -93,23 +92,46 @@ class ApplicationTests
 					checkSeenOffsetsForProgress();
 					compareToCommitedOffsets(newOffsets);
 				});
+
+		assertThrows(
+				IllegalStateException.class,
+				() -> endlessConsumer.exitStatus(),
+				"Consumer should still be running");
 	}
 
 	@Test
 	@Order(2)
-	void commitsNoOffsetsOnError()
+	void commitsOffsetOfErrorForReprocessingOnError()
 	{
 		send100Messages(counter ->
 				counter == 77
 						? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
-						: new Bytes(longSerializer.serialize(TOPIC, counter)));
+						: 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(oldOffsets);
+		compareToCommitedOffsets(newOffsets);
+		assertThat(receivedRecords.size())
+				.describedAs("Received not all sent events")
+				.isLessThan(100);
+
+		assertDoesNotThrow(
+				() -> endlessConsumer.exitStatus(),
+				"Consumer should not be running");
+		assertThat(endlessConsumer.exitStatus())
+				.describedAs("Consumer should have exited abnormally")
+				.containsInstanceOf(RecordDeserializationException.class);
 	}
 
 
@@ -121,7 +143,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 +163,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 +237,7 @@ class ApplicationTests
 
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
+		receivedRecords = new HashSet<>();
 
 		doForCurrentOffsets((tp, offset) ->
 		{
@@ -224,6 +251,7 @@ class ApplicationTests
 					newOffsets.put(
 							new TopicPartition(record.topic(), record.partition()),
 							record.offset());
+					receivedRecords.add(record);
 					testHandler.accept(record);
 				};
 
@@ -256,6 +284,12 @@ class ApplicationTests
 	@Import(ApplicationConfiguration.class)
 	public static class Configuration
 	{
+		@Bean
+		Serializer<Long> serializer()
+		{
+			return new LongSerializer();
+		}
+
 		@Bean
 		KafkaProducer<String, Bytes> kafkaProducer(ApplicationProperties properties)
 		{