counter: 1.2.15 - Separated serialization-config into a static method

[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 5dc8bc2..6419059 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,14 +1,14 @@
 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.common.header.Header;
 import org.apache.kafka.common.header.Headers;
 import org.apache.kafka.streams.KeyValue;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import java.util.Map;
-import java.util.Properties;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -16,22 +16,27 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class TestData
 {
-       static final Word[] INPUT_MESSAGES = new Word[]
+       private static final TestInputWord[] INPUT_MESSAGES = new TestInputWord[]
        {
-                       Word.of("peter","Hallo"),
-                       Word.of("klaus","Müsch"),
-                       Word.of("peter","Welt"),
-                       Word.of("klaus","Müsch"),
-                       Word.of("klaus","s"),
-                       Word.of("peter","Boäh"),
-                       Word.of("peter","Welt"),
-                       Word.of("peter","Boäh"),
-                       Word.of("klaus","s"),
-                       Word.of("peter","Boäh"),
-                       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 void assertExpectedMessages(MultiValueMap<Word, WordCounter> receivedMessages)
+       static Stream<TestInputWord> getInputMessages()
+       {
+               return Stream.of(TestData.INPUT_MESSAGES);
+       }
+
+       static void assertExpectedMessages(MultiValueMap<TestOutputWord, TestOutputWordCounter> receivedMessages)
        {
                expectedMessages().forEach(
                                (word, counter) ->
@@ -39,64 +44,52 @@ class TestData
                                                                .containsExactlyElementsOf(counter));
        }
 
-       static final KeyValue<Word, WordCounter>[] EXPECTED_MESSAGES = new KeyValue[]
+       private static final KeyValue<TestOutputWord, TestOutputWordCounter>[] EXPECTED_MESSAGES = new KeyValue[]
        {
                        KeyValue.pair(
-                                       Word.of("peter","Hallo"),
-                                       WordCounter.of("peter","Hallo",1)),
+                                       TestOutputWord.of("peter","Hallo"),
+                                       TestOutputWordCounter.of("peter","Hallo",1)),
                        KeyValue.pair(
-                                       Word.of("klaus","Müsch"),
-                                       WordCounter.of("klaus","Müsch",1)),
+                                       TestOutputWord.of("klaus","Müsch"),
+                                       TestOutputWordCounter.of("klaus","Müsch",1)),
                        KeyValue.pair(
-                                       Word.of("peter","Welt"),
-                                       WordCounter.of("peter","Welt",1)),
+                                       TestOutputWord.of("peter","Welt"),
+                                       TestOutputWordCounter.of("peter","Welt",1)),
                        KeyValue.pair(
-                                       Word.of("klaus","Müsch"),
-                                       WordCounter.of("klaus","Müsch",2)),
+                                       TestOutputWord.of("klaus","Müsch"),
+                                       TestOutputWordCounter.of("klaus","Müsch",2)),
                        KeyValue.pair(
-                                       Word.of("klaus","s"),
-                                       WordCounter.of("klaus","s",1)),
+                                       TestOutputWord.of("klaus","s"),
+                                       TestOutputWordCounter.of("klaus","s",1)),
                        KeyValue.pair(
-                                       Word.of("peter","Boäh"),
-                                       WordCounter.of("peter","Boäh",1)),
+                                       TestOutputWord.of("peter","Boäh"),
+                                       TestOutputWordCounter.of("peter","Boäh",1)),
                        KeyValue.pair(
-                                       Word.of("peter","Welt"),
-                                       WordCounter.of("peter","Welt",2)),
+                                       TestOutputWord.of("peter","Welt"),
+                                       TestOutputWordCounter.of("peter","Welt",2)),
                        KeyValue.pair(
-                                       Word.of("peter","Boäh"),
-                                       WordCounter.of("peter","Boäh",2)),
+                                       TestOutputWord.of("peter","Boäh"),
+                                       TestOutputWordCounter.of("peter","Boäh",2)),
                        KeyValue.pair(
-                                       Word.of("klaus","s"),
-                                       WordCounter.of("klaus","s",2)),
+                                       TestOutputWord.of("klaus","s"),
+                                       TestOutputWordCounter.of("klaus","s",2)),
                        KeyValue.pair(
-                                       Word.of("peter","Boäh"),
-                                       WordCounter.of("peter","Boäh",3)),
+                                       TestOutputWord.of("peter","Boäh"),
+                                       TestOutputWordCounter.of("peter","Boäh",3)),
                        KeyValue.pair(
-                                       Word.of("klaus","s"),
-                                       WordCounter.of("klaus","s",3)),
+                                       TestOutputWord.of("klaus","s"),
+                                       TestOutputWordCounter.of("klaus","s",3)),
        };
 
-       static MultiValueMap<Word, WordCounter> expectedMessages()
+       static MultiValueMap<TestOutputWord, TestOutputWordCounter> expectedMessages()
        {
-               MultiValueMap<Word, WordCounter> expectedMessages = new LinkedMultiValueMap<>();
+               MultiValueMap<TestOutputWord, TestOutputWordCounter> expectedMessages = new LinkedMultiValueMap<>();
                Stream
                                .of(EXPECTED_MESSAGES)
                                .forEach(keyValue -> expectedMessages.add(keyValue.key, keyValue.value));
                return expectedMessages;
        }
 
-       static Map<String, Object> convertToMap(Properties properties)
-       {
-               return properties
-                               .entrySet()
-                               .stream()
-                               .collect(
-                                               Collectors.toMap(
-                                                               entry -> (String)entry.getKey(),
-                                                               entry -> entry.getValue()
-                                               ));
-       }
-
        static String parseHeader(Headers headers, String key)
        {
                Header header = headers.lastHeader(key);