X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Ftop10%2FTop10ApplicationIT.java;h=ea8fe1815bb2b2d8b4f965fc71b299ed512a2b7c;hb=ef9fff623043d2dffddbe8e70d984106cdde6c6b;hp=d55048d14f629fc4768f6e6a82d5e46fd68d8c43;hpb=9e0ee342b531e7cfcddfe2e34390807802725a14;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 d55048d..ea8fe18 100644
--- a/src/test/java/de/juplo/kafka/wordcount/top10/Top10ApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/top10/Top10ApplicationIT.java
@@ -3,6 +3,7 @@ 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.query.TestRanking;
+import de.juplo.kafka.wordcount.query.TestUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.Stores;
@@ -25,6 +26,7 @@ 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;
 
 
@@ -36,10 +38,7 @@ import static org.awaitility.Awaitility.await;
 				"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=user:de.juplo.kafka.wordcount.query.TestUser,ranking:de.juplo.kafka.wordcount.query.TestRanking",
 				"logging.level.root=WARN",
 				"logging.level.de.juplo=DEBUG",
 				"logging.level.org.apache.kafka.clients=INFO",
@@ -55,7 +54,6 @@ public class Top10ApplicationIT
 {
 	public static final String TOPIC_IN = "in";
 	public static final String TOPIC_OUT = "out";
-	public static final String STORE_NAME = "TEST-STORE";
 
 	@Autowired
 	Consumer consumer;
@@ -94,7 +92,7 @@ public class Top10ApplicationIT
 	{
 		await("Expected state")
 				.atMost(Duration.ofSeconds(5))
-				.untilAsserted(() -> TestData.assertExpectedState(streamProcessor.getStore(STORE_NAME)));
+				.untilAsserted(() -> TestData.assertExpectedState(streamProcessor.getStore()));
 	}
 
 	@DisplayName("Await the expected output messages")
@@ -107,21 +105,39 @@ public class Top10ApplicationIT
 				.untilAsserted(() -> TestData.assertExpectedMessages(consumer.getReceivedMessages()));
 	}
 
+	@DisplayName("Await the expected number of messages")
+	@Test
+	public void testAwaitExpectedNumberOfMessagesForUsers()
+	{
+		await("Expected number of messages")
+				.atMost(Duration.ofSeconds(5))
+				.untilAsserted(() -> TestData.assertExpectedNumberOfMessagesForUsers(consumer.getReceivedMessages()));
+	}
+
+	@DisplayName("Await the expected final output messages")
+	@Test
+	public void testAwaitExpectedLastMessagesForUsers()
+	{
+		await("Expected final output messages")
+				.atMost(Duration.ofSeconds(5))
+				.untilAsserted(() -> TestData.assertExpectedLastMessagesForUsers(consumer.getReceivedMessages()));
+	}
+
 
 	static class Consumer
 	{
-		private final MultiValueMap<User, Ranking> received = new LinkedMultiValueMap<>();
+		private final MultiValueMap<TestUser, TestRanking> received = new LinkedMultiValueMap<>();
 
 		@KafkaListener(groupId = "TEST", topics = TOPIC_OUT)
 		public synchronized void receive(
-				@Header(KafkaHeaders.RECEIVED_KEY) User user,
+				@Header(KafkaHeaders.RECEIVED_KEY) TestUser 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 MultiValueMap<TestUser, TestRanking> getReceivedMessages()
 		{
 			return received;
 		}