X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Ftop10%2FTop10ApplicationIT.java;h=f5ef236c19a26095b1a118262fb860314229b28d;hb=refs%2Fheads%2Ftop10;hp=88d03baf6b6e4cd9a1be95964096e3786d8c26cc;hpb=3b7fae76b8abb62a8cae3a4a32c880b29bce0574;p=demos%2Fkafka%2Fwordcount

diff --git a/src/test/java/de/juplo/kafka/wordcount/top10/Top10ApplicationIT.java b/src/test/java/de/juplo/kafka/wordcount/top10/Top10ApplicationIT.java
index 88d03ba..51e424e 100644
--- a/src/test/java/de/juplo/kafka/wordcount/top10/Top10ApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/top10/Top10ApplicationIT.java
@@ -1,12 +1,16 @@
 package de.juplo.kafka.wordcount.top10;
 
-import de.juplo.kafka.wordcount.counter.TestWord;
 import de.juplo.kafka.wordcount.counter.TestCounter;
+import de.juplo.kafka.wordcount.counter.TestWord;
 import de.juplo.kafka.wordcount.query.TestRanking;
+import de.juplo.kafka.wordcount.query.TestStats;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.Stores;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
@@ -23,7 +27,6 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import java.time.Duration;
-import java.util.stream.Stream;
 
 import static de.juplo.kafka.wordcount.top10.Top10StreamProcessor.STORE_NAME;
 import static org.awaitility.Awaitility.await;
@@ -33,14 +36,11 @@ import static org.awaitility.Awaitility.await;
 		properties = {
 				"spring.kafka.producer.key-serializer=org.springframework.kafka.support.serializer.JsonSerializer",
 				"spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer",
-				"spring.kafka.producer.properties.spring.json.type.mapping=word:de.juplo.kafka.wordcount.counter.TestWord,counter:de.juplo.kafka.wordcount.counter.TestCounter",
+				"spring.kafka.producer.properties.spring.json.type.mapping=key:de.juplo.kafka.wordcount.counter.TestWord,counter:de.juplo.kafka.wordcount.counter.TestCounter",
 				"spring.kafka.consumer.auto-offset-reset=earliest",
 				"spring.kafka.consumer.key-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer",
 				"spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer",
-				"spring.kafka.consumer.properties.spring.json.use.type.headers=false",
-				"spring.kafka.consumer.properties.spring.json.key.default.type=de.juplo.kafka.wordcount.top10.User",
-				"spring.kafka.consumer.properties.spring.json.value.default.type=de.juplo.kafka.wordcount.query.TestRanking",
-				"spring.kafka.consumer.properties.spring.json.trusted.packages=de.juplo.kafka.wordcount.top10	",
+				"spring.kafka.consumer.properties.spring.json.type.mapping=stats:de.juplo.kafka.wordcount.query.TestStats,ranking:de.juplo.kafka.wordcount.query.TestRanking",
 				"logging.level.root=WARN",
 				"logging.level.de.juplo=DEBUG",
 				"logging.level.org.apache.kafka.clients=INFO",
@@ -67,8 +67,8 @@ public class Top10ApplicationIT
 	public static void testSendMessage(
 			@Autowired KafkaTemplate<TestWord, TestCounter> kafkaTemplate)
 	{
-		Stream
-				.of(TestData.INPUT_MESSAGES)
+		TestData
+				.getInputMessages()
 				.forEach(kv ->
 				{
 					try
@@ -104,44 +104,48 @@ public class Top10ApplicationIT
 	{
 		await("Expected messages")
 				.atMost(Duration.ofSeconds(5))
-				.untilAsserted(() -> TestData.assertExpectedMessages(consumer.getReceivedMessages()));
+				.untilAsserted(() -> consumer.enforceAssertion(
+						receivedMessages -> TestData.assertExpectedMessages(receivedMessages)));
 	}
 
 	@DisplayName("Await the expected number of messages")
 	@Test
-	public void testAwaitExpectedNumberOfMessagesForUsers()
+	public void testAwaitExpectedNumberOfMessages()
 	{
 		await("Expected number of messages")
 				.atMost(Duration.ofSeconds(5))
-				.untilAsserted(() -> TestData.assertExpectedNumberOfMessagesForUsers(consumer.getReceivedMessages()));
+				.untilAsserted(() -> consumer.enforceAssertion(
+						receivedMessages -> TestData.assertExpectedNumberOfMessages(receivedMessages)));
 	}
 
 	@DisplayName("Await the expected final output messages")
 	@Test
-	public void testAwaitExpectedLastMessagesForUsers()
+	public void testAwaitExpectedLastMessages()
 	{
 		await("Expected final output messages")
 				.atMost(Duration.ofSeconds(5))
-				.untilAsserted(() -> TestData.assertExpectedLastMessagesForUsers(consumer.getReceivedMessages()));
+				.untilAsserted(() -> consumer.enforceAssertion(
+						receivedMessages -> TestData.assertExpectedLastMessages(receivedMessages)));
 	}
 
 
 	static class Consumer
 	{
-		private final MultiValueMap<User, Ranking> received = new LinkedMultiValueMap<>();
+		private final MultiValueMap<TestStats, TestRanking> received = new LinkedMultiValueMap<>();
 
 		@KafkaListener(groupId = "TEST", topics = TOPIC_OUT)
 		public synchronized void receive(
-				@Header(KafkaHeaders.RECEIVED_KEY) User user,
+				@Header(KafkaHeaders.RECEIVED_KEY) TestStats user,
 				@Payload TestRanking ranking)
 		{
 			log.debug("Received message: {} -> {}", user, ranking);
-			received.add(user, Ranking.of(ranking.getEntries()));
+			received.add(user, ranking);
 		}
 
-		synchronized MultiValueMap<User, Ranking> getReceivedMessages()
+		synchronized void enforceAssertion(
+				java.util.function.Consumer<MultiValueMap<TestStats, TestRanking>> assertion)
 		{
-			return received;
+			assertion.accept(received);
 		}
 	}