X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=d446bbed8a922c5542beb86bc28a04f1c4a5080a;hb=d8f4e839b57b8405ca909b5472a8d4639937a101;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..d446bbe 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -7,13 +7,11 @@ 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;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -34,17 +32,15 @@ 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)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestPropertySource(
 		properties = {
-				"consumer.bootstrap-server=${spring.embedded.kafka.brokers}",
+				"spring.kafka.consumer.bootstrap-servers=${spring.embedded.kafka.brokers}",
 				"consumer.topic=" + TOPIC })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
 @Slf4j
@@ -55,8 +51,9 @@ class ApplicationTests
 
 
 	StringSerializer stringSerializer = new StringSerializer();
-	LongSerializer longSerializer = new LongSerializer();
 
+	@Autowired
+	Serializer valueSerializer;
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
@@ -64,7 +61,9 @@ class ApplicationTests
 	@Autowired
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	@Autowired
-	ApplicationProperties properties;
+	ApplicationProperties applicationProperties;
+	@Autowired
+	KafkaProperties kafkaProperties;
 	@Autowired
 	ExecutorService executor;
 
@@ -81,7 +80,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))
@@ -95,10 +94,9 @@ 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
@@ -108,7 +106,7 @@ class ApplicationTests
 		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))
@@ -128,9 +126,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);
@@ -260,8 +258,8 @@ class ApplicationTests
 		endlessConsumer =
 				new EndlessConsumer<>(
 						executor,
-						properties.getClientId(),
-						properties.getTopic(),
+						kafkaProperties.getConsumer().getClientId(),
+						applicationProperties.getTopic(),
 						kafkaConsumer,
 						captureOffsetAndExecuteTestHandler);
 
@@ -287,10 +285,16 @@ class ApplicationTests
 	public static class Configuration
 	{
 		@Bean
-		KafkaProducer<String, Bytes> kafkaProducer(ApplicationProperties properties)
+		Serializer<Long> serializer()
+		{
+			return new LongSerializer();
+		}
+
+		@Bean
+		KafkaProducer<String, Bytes> kafkaProducer(KafkaProperties properties)
 		{
 			Properties props = new Properties();
-			props.put("bootstrap.servers", properties.getBootstrapServer());
+			props.put("bootstrap.servers", properties.getConsumer().getBootstrapServers());
 			props.put("linger.ms", 100);
 			props.put("key.serializer", StringSerializer.class.getName());
 			props.put("value.serializer", BytesSerializer.class.getName());
@@ -299,12 +303,12 @@ class ApplicationTests
 		}
 
 		@Bean
-		KafkaConsumer<Bytes, Bytes> offsetConsumer(ApplicationProperties properties)
+		KafkaConsumer<Bytes, Bytes> offsetConsumer(KafkaProperties properties)
 		{
 			Properties props = new Properties();
-			props.put("bootstrap.servers", properties.getBootstrapServer());
+			props.put("bootstrap.servers", properties.getConsumer().getBootstrapServers());
 			props.put("client.id", "OFFSET-CONSUMER");
-			props.put("group.id", properties.getGroupId());
+			props.put("group.id", properties.getConsumer().getGroupId());
 			props.put("key.deserializer", BytesDeserializer.class.getName());
 			props.put("value.deserializer", BytesDeserializer.class.getName());