X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Ftop10%2FTop10ApplicationIT.java;h=f5ef236c19a26095b1a118262fb860314229b28d;hb=478b25d6700bd0a48b55647f09386f3b1d59fa29;hp=ea8fe1815bb2b2d8b4f965fc71b299ed512a2b7c;hpb=ef9fff623043d2dffddbe8e70d984106cdde6c6b;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 ea8fe18..f5ef236 100644
--- a/src/test/java/de/juplo/kafka/wordcount/top10/Top10ApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/top10/Top10ApplicationIT.java
@@ -1,13 +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.TestUser;
 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;
@@ -24,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;
@@ -65,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
@@ -102,7 +104,8 @@ 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")
@@ -111,7 +114,8 @@ public class Top10ApplicationIT
 	{
 		await("Expected number of messages")
 				.atMost(Duration.ofSeconds(5))
-				.untilAsserted(() -> TestData.assertExpectedNumberOfMessagesForUsers(consumer.getReceivedMessages()));
+				.untilAsserted(() -> consumer.enforceAssertion(
+						receivedMessages -> TestData.assertExpectedNumberOfMessagesForUsers(receivedMessages)));
 	}
 
 	@DisplayName("Await the expected final output messages")
@@ -120,7 +124,8 @@ public class Top10ApplicationIT
 	{
 		await("Expected final output messages")
 				.atMost(Duration.ofSeconds(5))
-				.untilAsserted(() -> TestData.assertExpectedLastMessagesForUsers(consumer.getReceivedMessages()));
+				.untilAsserted(() -> consumer.enforceAssertion(
+						receivedMessages -> TestData.assertExpectedLastMessagesForUsers(receivedMessages)));
 	}
 
 
@@ -137,9 +142,10 @@ public class Top10ApplicationIT
 			received.add(user, ranking);
 		}
 
-		synchronized MultiValueMap<TestUser, TestRanking> getReceivedMessages()
+		synchronized void enforceAssertion(
+				java.util.function.Consumer<MultiValueMap<TestUser, TestRanking>> assertion)
 		{
-			return received;
+			assertion.accept(received);
 		}
 	}