X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FTestData.java;h=7446db6b8a11b32fcde42e8e417a0fe9bb544917;hb=8d0426539d69616900f4d6ef19e52d50b497f57f;hp=b5c6c46fcdda396cba69e4e2c20aaf4c4427e434;hpb=237133719b1d06d542302fb948d9cf3aff80a8a4;p=demos%2Fkafka%2Fwordcount

diff --git a/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java b/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
index b5c6c46..7446db6 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
@@ -4,10 +4,10 @@ import de.juplo.kafka.wordcount.splitter.TestInputWord;
 import de.juplo.kafka.wordcount.top10.TestOutputWord;
 import de.juplo.kafka.wordcount.top10.TestOutputWordCounter;
 import org.apache.kafka.streams.KeyValue;
+import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -72,11 +72,6 @@ class TestData
 		return Stream.of(TestData.INPUT_MESSAGES);
 	}
 
-	static Consumer<MultiValueMap<TestOutputWord, TestOutputWordCounter>> expectedMessagesAssertion()
-	{
-		return receivedMessages -> assertExpectedMessages(receivedMessages);
-	}
-
 	static void assertExpectedMessages(MultiValueMap<TestOutputWord, TestOutputWordCounter> receivedMessages)
 	{
 		expectedMessages().forEach(
@@ -85,11 +80,6 @@ class TestData
 								.containsExactlyElementsOf(counter));
 	}
 
-	static Consumer<MultiValueMap<TestOutputWord, TestOutputWordCounter>> expectedNumberOfMessagesForWordAssertion()
-	{
-		return receivedMessages -> assertExpectedNumberOfMessagesForWord(receivedMessages);
-	}
-
 	static void assertExpectedNumberOfMessagesForWord(MultiValueMap<TestOutputWord, TestOutputWordCounter> receivedMessages)
 	{
 		assertThat(countMessagesForWord(PETER_HALLO, receivedMessages));
@@ -104,9 +94,23 @@ class TestData
 		return messagesForUsers.get(word).size();
 	}
 
-	static Consumer<MultiValueMap<TestOutputWord, TestOutputWordCounter>> expectedLastMessagesForWordAssertion()
+	static void assertExpectedState(ReadOnlyKeyValueStore<Word, Long> store)
+	{
+		assertWordCountEqualsWordCountFromLastMessage(PETER_HALLO, store.get(wordOf(PETER_HALLO)));
+		assertWordCountEqualsWordCountFromLastMessage(PETER_WELT, store.get(wordOf(PETER_WELT)));
+		assertWordCountEqualsWordCountFromLastMessage(PETER_BOÄH, store.get(wordOf(PETER_BOÄH)));
+		assertWordCountEqualsWordCountFromLastMessage(KLAUS_MÜSCH, store.get(wordOf(KLAUS_MÜSCH)));
+		assertWordCountEqualsWordCountFromLastMessage(KLAUS_S, store.get(wordOf(KLAUS_S)));
+	}
+
+	private static Word wordOf(TestOutputWord testOutputWord)
 	{
-		return receivedMessages -> assertExpectedLastMessagesForWord(receivedMessages);
+		Word word = new Word();
+
+		word.setUser(testOutputWord.getUser());
+		word.setWord(testOutputWord.getWord());
+
+		return word;
 	}
 
 	static void assertExpectedLastMessagesForWord(MultiValueMap<TestOutputWord, TestOutputWordCounter> receivedMessages)
@@ -118,6 +122,17 @@ class TestData
 		assertWordCountEqualsWordCountFromLastMessage(KLAUS_S, getLastMessageFor(KLAUS_S, receivedMessages));
 	}
 
+	private static void assertWordCountEqualsWordCountFromLastMessage(
+			TestOutputWord word,
+			Long counter)
+	{
+		TestOutputWordCounter testOutputWordCounter = TestOutputWordCounter.of(
+				word.getUser(),
+				word.getWord(),
+				counter);
+		assertWordCountEqualsWordCountFromLastMessage(word, testOutputWordCounter);
+	}
+
 	private static void assertWordCountEqualsWordCountFromLastMessage(
 			TestOutputWord word,
 			TestOutputWordCounter counter)