X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FTestData.java;h=862eb2bc67463437168bc94db062c62d8d3cdb5f;hb=d8173052504e89f85b09ce060302e87979973714;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..862eb2b 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
@@ -1,13 +1,14 @@
 package de.juplo.kafka.wordcount.counter;
 
+import de.juplo.kafka.wordcount.splitter.TestInputUser;
 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;
@@ -30,53 +31,48 @@ class TestData
 	static final TestOutputWord KLAUS_MÜSCH = TestOutputWord.of(KLAUS, WORD_MÜSCH);
 	static final TestOutputWord KLAUS_S = TestOutputWord.of(KLAUS, WORD_S);
 
-	private static final KeyValue<String, TestInputWord>[] INPUT_MESSAGES = new KeyValue[]
+	private static final KeyValue<TestInputUser, TestInputWord>[] INPUT_MESSAGES = new KeyValue[]
 	{
-			new KeyValue<>(
-					PETER,
+			KeyValue.pair(
+					TestInputUser.of(PETER),
 					TestInputWord.of(PETER, WORD_HALLO)),
-			new KeyValue<>(
-					KLAUS,
+			KeyValue.pair(
+					TestInputUser.of(KLAUS),
 					TestInputWord.of(KLAUS, WORD_MÜSCH)),
-			new KeyValue<>(
-					PETER,
+			KeyValue.pair(
+					TestInputUser.of(PETER),
 					TestInputWord.of(PETER, WORD_WELT)),
-			new KeyValue<>(
-					KLAUS,
+			KeyValue.pair(
+					TestInputUser.of(KLAUS),
 					TestInputWord.of(KLAUS, WORD_MÜSCH)),
-			new KeyValue<>(
-					KLAUS,
+			KeyValue.pair(
+					TestInputUser.of(KLAUS),
 					TestInputWord.of(KLAUS, WORD_S)),
-			new KeyValue<>(
-					PETER,
+			KeyValue.pair(
+					TestInputUser.of(PETER),
 					TestInputWord.of(PETER, WORD_BOÄH)),
-			new KeyValue<>(
-					PETER,
+			KeyValue.pair(
+					TestInputUser.of(PETER),
 					TestInputWord.of(PETER, WORD_WELT)),
-			new KeyValue<>(
-					PETER,
+			KeyValue.pair(
+					TestInputUser.of(PETER),
 					TestInputWord.of(PETER, WORD_BOÄH)),
-			new KeyValue<>(
-					KLAUS,
+			KeyValue.pair(
+					TestInputUser.of(KLAUS),
 					TestInputWord.of(KLAUS, WORD_S)),
-			new KeyValue<>(
-					PETER,
+			KeyValue.pair(
+					TestInputUser.of(PETER),
 					TestInputWord.of(PETER, WORD_BOÄH)),
-			new KeyValue<>(
-					KLAUS,
+			KeyValue.pair(
+					TestInputUser.of(KLAUS),
 					TestInputWord.of(KLAUS, WORD_S)),
 	};
 
-	static Stream<KeyValue<String, TestInputWord>> getInputMessages()
+	static Stream<KeyValue<TestInputUser, TestInputWord>> getInputMessages()
 	{
 		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 +81,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));
@@ -101,12 +92,28 @@ class TestData
 
 	private static int countMessagesForWord(TestOutputWord word, MultiValueMap<TestOutputWord, TestOutputWordCounter> messagesForUsers)
 	{
-		return messagesForUsers.get(word).size();
+		return messagesForUsers.get(word) == null
+				? 0
+				: messagesForUsers.get(word).size();
 	}
 
-	static Consumer<MultiValueMap<TestOutputWord, TestOutputWordCounter>> expectedLastMessagesForWordAssertion()
+	static void assertExpectedState(ReadOnlyKeyValueStore<Word, Long> store)
 	{
-		return receivedMessages -> assertExpectedLastMessagesForWord(receivedMessages);
+		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)
+	{
+		Word word = new Word();
+
+		word.setUser(testOutputWord.getUser());
+		word.setWord(testOutputWord.getWord());
+
+		return word;
 	}
 
 	static void assertExpectedLastMessagesForWord(MultiValueMap<TestOutputWord, TestOutputWordCounter> receivedMessages)
@@ -118,6 +125,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)