X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=1d3546c1fb55f3e6e8f24f09348f1482be3c5294;hb=95ada5445e5db63f53f9c36d55ba862459ea923e;hp=4cc4f91dd2ac0375eb0ab674dfb121d8a097f998;hpb=a57583fe11cad272ef550a42077319776df35f97;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 4cc4f91..1d3546c 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -6,17 +6,18 @@ 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.assertj.core.api.OptionalAssert;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
 import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -24,7 +25,6 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import java.time.Duration;
 import java.util.*;
 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;
@@ -33,11 +33,16 @@ 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.*;
 
 
-@SpringJUnitConfig(initializers = ConfigDataApplicationContextInitializer.class)
+@SpringJUnitConfig(
+		initializers = ConfigDataApplicationContextInitializer.class,
+    classes = {
+				EndlessConsumer.class,
+				KafkaAutoConfiguration.class,
+				ApplicationTests.Configuration.class })
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestPropertySource(
 		properties = {
@@ -52,21 +57,20 @@ class ApplicationTests
 
 
 	StringSerializer stringSerializer = new StringSerializer();
-	LongSerializer longSerializer = new LongSerializer();
 
 	@Autowired
-	KafkaProducer<String, Bytes> kafkaProducer;
+	Serializer valueSerializer;
 	@Autowired
-	KafkaConsumer<String, Long> kafkaConsumer;
+	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	@Autowired
 	ApplicationProperties properties;
 	@Autowired
-	ExecutorService executor;
+	EndlessConsumer endlessConsumer;
+	@Autowired
+	RecordHandler recordHandler;
 
-	Consumer<ConsumerRecord<String, Long>> testHandler;
-	EndlessConsumer<String, Long> endlessConsumer;
 	Map<TopicPartition, Long> oldOffsets;
 	Map<TopicPartition, Long> newOffsets;
 	Set<ConsumerRecord<String, Long>> receivedRecords;
@@ -78,7 +82,7 @@ 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)));
+		send100Messages(i ->  new Bytes(valueSerializer.serialize(TOPIC, i)));
 
 		await("100 records received")
 				.atMost(Duration.ofSeconds(30))
@@ -91,6 +95,10 @@ class ApplicationTests
 					checkSeenOffsetsForProgress();
 					compareToCommitedOffsets(newOffsets);
 				});
+
+		assertThatExceptionOfType(IllegalStateException.class)
+				.isThrownBy(() -> endlessConsumer.exitStatus())
+				.describedAs("Consumer should still be running");
 	}
 
 	@Test
@@ -100,25 +108,23 @@ class ApplicationTests
 		send100Messages(counter ->
 				counter == 77
 						? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
-						: new Bytes(longSerializer.serialize(TOPIC, counter)));
-
-		await("Consumer failed")
-				.atMost(Duration.ofSeconds(30))
-				.until(() -> !endlessConsumer.running());
+						: new Bytes(valueSerializer.serialize(TOPIC, counter)));
 
-		checkSeenOffsetsForProgress();
-		compareToCommitedOffsets(newOffsets);
-
-		endlessConsumer.start();
 		await("Consumer failed")
 				.atMost(Duration.ofSeconds(30))
-				.until(() -> !endlessConsumer.running());
+				.untilAsserted(() -> checkSeenOffsetsForProgress());
 
-		checkSeenOffsetsForProgress();
 		compareToCommitedOffsets(newOffsets);
 		assertThat(receivedRecords.size())
 				.describedAs("Received not all sent events")
 				.isLessThan(100);
+
+		assertThatNoException()
+				.describedAs("Consumer should not be running")
+				.isThrownBy(() -> endlessConsumer.exitStatus());
+		((OptionalAssert<Exception>)assertThat(endlessConsumer.exitStatus()))
+				.describedAs("Consumer should have exited abnormally")
+				.containsInstanceOf(RecordDeserializationException.class);
 	}
 
 
@@ -220,7 +226,7 @@ class ApplicationTests
 	@BeforeEach
 	public void init()
 	{
-		testHandler = record -> {} ;
+		recordHandler.testHandler = (record) -> {};
 
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
@@ -232,24 +238,15 @@ class ApplicationTests
 			newOffsets.put(tp, offset - 1);
 		});
 
-		Consumer<ConsumerRecord<String, Long>> captureOffsetAndExecuteTestHandler =
+		recordHandler.captureOffsets =
 				record ->
 				{
+					receivedRecords.add(record);
 					newOffsets.put(
 							new TopicPartition(record.topic(), record.partition()),
 							record.offset());
-					receivedRecords.add(record);
-					testHandler.accept(record);
 				};
 
-		endlessConsumer =
-				new EndlessConsumer<>(
-						executor,
-						properties.getClientId(),
-						properties.getTopic(),
-						kafkaConsumer,
-						captureOffsetAndExecuteTestHandler);
-
 		endlessConsumer.start();
 	}
 
@@ -266,11 +263,38 @@ class ApplicationTests
 		}
 	}
 
+	public static class RecordHandler implements Consumer<ConsumerRecord<String, Long>>
+	{
+		Consumer<ConsumerRecord<String, Long>> captureOffsets;
+		Consumer<ConsumerRecord<String, Long>> testHandler;
+
+
+		@Override
+		public void accept(ConsumerRecord<String, Long> record)
+		{
+			captureOffsets
+					.andThen(testHandler)
+					.accept(record);
+		}
+	}
 
 	@TestConfiguration
 	@Import(ApplicationConfiguration.class)
 	public static class Configuration
 	{
+		@Primary
+		@Bean
+		public Consumer<ConsumerRecord<String, Long>> testHandler()
+		{
+			return new RecordHandler();
+		}
+
+		@Bean
+		Serializer<Long> serializer()
+		{
+			return new LongSerializer();
+		}
+
 		@Bean
 		KafkaProducer<String, Bytes> kafkaProducer(ApplicationProperties properties)
 		{