X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=d446bbed8a922c5542beb86bc28a04f1c4a5080a;hb=d8f4e839b57b8405ca909b5472a8d4639937a101;hp=92074fffbbe12df59266f038af1be8424e27c645;hpb=1206d7938f995eed3353d2bd3e26241f30b88e44;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 92074ff..d446bbe 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -11,6 +11,7 @@ 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;
@@ -31,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
@@ -62,7 +61,9 @@ class ApplicationTests
 	@Autowired
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	@Autowired
-	ApplicationProperties properties;
+	ApplicationProperties applicationProperties;
+	@Autowired
+	KafkaProperties kafkaProperties;
 	@Autowired
 	ExecutorService executor;
 
@@ -93,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
@@ -126,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);
@@ -258,8 +258,8 @@ class ApplicationTests
 		endlessConsumer =
 				new EndlessConsumer<>(
 						executor,
-						properties.getClientId(),
-						properties.getTopic(),
+						kafkaProperties.getConsumer().getClientId(),
+						applicationProperties.getTopic(),
 						kafkaConsumer,
 						captureOffsetAndExecuteTestHandler);
 
@@ -291,10 +291,10 @@ class ApplicationTests
 		}
 
 		@Bean
-		KafkaProducer<String, Bytes> kafkaProducer(ApplicationProperties properties)
+		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());
@@ -303,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());