counter: 1.2.15 - Removed logging of type-headers in tests

[demos/kafka/wordcount] / src / test / java / de / juplo / kafka / wordcount / counter / TestData.java

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 c1dd45a..40ef09e 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
@@ -1,122 +1,90 @@
 package de.juplo.kafka.wordcount.counter;
 
+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.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 
 class TestData
 {
-       static void writeInputData(BiConsumer<String, Word> consumer)
+       private static final TestInputWord[] INPUT_MESSAGES = new TestInputWord[]
        {
-               consumer.accept(
-                               "peter",
-                               Word.of("peter","Hallo"));
-               consumer.accept(
-                               "klaus",
-                               Word.of("klaus","Müsch"));
-               consumer.accept(
-                               "peter",
-                               Word.of("peter","Welt"));
-               consumer.accept(
-                               "klaus",
-                               Word.of("klaus","Müsch"));
-               consumer.accept(
-                               "klaus",
-                               Word.of("klaus","s"));
-               consumer.accept(
-                               "peter",
-                               Word.of("peter","Boäh"));
-               consumer.accept(
-                               "peter",
-                               Word.of("peter","Welt"));
-               consumer.accept(
-                               "peter",
-                               Word.of("peter","Boäh"));
-               consumer.accept(
-                               "klaus",
-                               Word.of("klaus","s"));
-               consumer.accept(
-                               "peter",
-                               Word.of("peter","Boäh"));
-               consumer.accept(
-                               "klaus",
-                               Word.of("klaus","s"));
+                       TestInputWord.of("peter","Hallo"),
+                       TestInputWord.of("klaus","Müsch"),
+                       TestInputWord.of("peter","Welt"),
+                       TestInputWord.of("klaus","Müsch"),
+                       TestInputWord.of("klaus","s"),
+                       TestInputWord.of("peter","Boäh"),
+                       TestInputWord.of("peter","Welt"),
+                       TestInputWord.of("peter","Boäh"),
+                       TestInputWord.of("klaus","s"),
+                       TestInputWord.of("peter","Boäh"),
+                       TestInputWord.of("klaus","s"),
+       };
+
+       static Stream<TestInputWord> getInputMessages()
+       {
+               return Stream.of(TestData.INPUT_MESSAGES);
        }
 
-       static void assertExpectedResult(List<KeyValue<Word, WordCount>> receivedMessages)
+       static void assertExpectedMessages(MultiValueMap<TestOutputWord, TestOutputWordCounter> receivedMessages)
        {
-               assertThat(receivedMessages).hasSize(11);
-               assertThat(receivedMessages).containsSubsequence(
-                               expectedMessages[0]); // Hallo
-               assertThat(receivedMessages).containsSubsequence(
-                               expectedMessages[1],
-                               expectedMessages[3]); // Müsch
-               assertThat(receivedMessages).containsSubsequence(
-                               expectedMessages[2],
-                               expectedMessages[6]);
-               assertThat(receivedMessages).containsSubsequence(
-                               expectedMessages[4],
-                               expectedMessages[8],
-                               expectedMessages[10]); // s
-               assertThat(receivedMessages).containsSubsequence(
-                               expectedMessages[5],
-                               expectedMessages[7],
-                               expectedMessages[9]); // Boäh
+               expectedMessages().forEach(
+                               (word, counter) ->
+                                               assertThat(receivedMessages.get(word))
+                                                               .containsExactlyElementsOf(counter));
        }
 
-       static KeyValue<Word,WordCount>[] expectedMessages = new KeyValue[]
+       private static final KeyValue<TestOutputWord, TestOutputWordCounter>[] EXPECTED_MESSAGES = new KeyValue[]
        {
                        KeyValue.pair(
-                                       Word.of("peter","Hallo"),
-                                       WordCount.of("peter","Hallo",1)),
+                                       TestOutputWord.of("peter","Hallo"),
+                                       TestOutputWordCounter.of("peter","Hallo",1)),
                        KeyValue.pair(
-                                       Word.of("klaus","Müsch"),
-                                       WordCount.of("klaus","Müsch",1)),
+                                       TestOutputWord.of("klaus","Müsch"),
+                                       TestOutputWordCounter.of("klaus","Müsch",1)),
                        KeyValue.pair(
-                                       Word.of("peter","Welt"),
-                                       WordCount.of("peter","Welt",1)),
+                                       TestOutputWord.of("peter","Welt"),
+                                       TestOutputWordCounter.of("peter","Welt",1)),
                        KeyValue.pair(
-                                       Word.of("klaus","Müsch"),
-                                       WordCount.of("klaus","Müsch",2)),
+                                       TestOutputWord.of("klaus","Müsch"),
+                                       TestOutputWordCounter.of("klaus","Müsch",2)),
                        KeyValue.pair(
-                                       Word.of("klaus","s"),
-                                       WordCount.of("klaus","s",1)),
+                                       TestOutputWord.of("klaus","s"),
+                                       TestOutputWordCounter.of("klaus","s",1)),
                        KeyValue.pair(
-                                       Word.of("peter","Boäh"),
-                                       WordCount.of("peter","Boäh",1)),
+                                       TestOutputWord.of("peter","Boäh"),
+                                       TestOutputWordCounter.of("peter","Boäh",1)),
                        KeyValue.pair(
-                                       Word.of("peter","Welt"),
-                                       WordCount.of("peter","Welt",2)),
+                                       TestOutputWord.of("peter","Welt"),
+                                       TestOutputWordCounter.of("peter","Welt",2)),
                        KeyValue.pair(
-                                       Word.of("peter","Boäh"),
-                                       WordCount.of("peter","Boäh",2)),
+                                       TestOutputWord.of("peter","Boäh"),
+                                       TestOutputWordCounter.of("peter","Boäh",2)),
                        KeyValue.pair(
-                                       Word.of("klaus","s"),
-                                       WordCount.of("klaus","s",2)),
+                                       TestOutputWord.of("klaus","s"),
+                                       TestOutputWordCounter.of("klaus","s",2)),
                        KeyValue.pair(
-                                       Word.of("peter","Boäh"),
-                                       WordCount.of("peter","Boäh",3)),
+                                       TestOutputWord.of("peter","Boäh"),
+                                       TestOutputWordCounter.of("peter","Boäh",3)),
                        KeyValue.pair(
-                                       Word.of("klaus","s"),
-                                       WordCount.of("klaus","s",3)),
+                                       TestOutputWord.of("klaus","s"),
+                                       TestOutputWordCounter.of("klaus","s",3)),
        };
 
-       static Map<String, Object> convertToMap(Properties properties)
+       static MultiValueMap<TestOutputWord, TestOutputWordCounter> expectedMessages()
        {
-               return properties
-                               .entrySet()
-                               .stream()
-                               .collect(
-                                               Collectors.toMap(
-                                                               entry -> (String)entry.getKey(),
-                                                               entry -> entry.getValue()
-                                               ));
+               MultiValueMap<TestOutputWord, TestOutputWordCounter> expectedMessages = new LinkedMultiValueMap<>();
+               Stream
+                               .of(EXPECTED_MESSAGES)
+                               .forEach(keyValue -> expectedMessages.add(keyValue.key, keyValue.value));
+               return expectedMessages;
        }
 }