counter: 1.2.15 - `TestData` only holds and asserts the test-data

[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 1687a33..5dc8bc2 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
@@ -8,7 +8,6 @@ import org.springframework.util.MultiValueMap;
 
 import java.util.Map;
 import java.util.Properties;
-import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -17,52 +16,30 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class TestData
 {
-       static void writeInputData(BiConsumer<String, Word> consumer)
+       static final Word[] INPUT_MESSAGES = new Word[]
        {
-               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"));
-       }
+                       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"),
+       };
 
-       static void assertExpectedResult(MultiValueMap<Word, WordCounter> receivedMessages)
+       static void assertExpectedMessages(MultiValueMap<Word, WordCounter> receivedMessages)
        {
-               expectedMessages.forEach(
+               expectedMessages().forEach(
                                (word, counter) ->
                                                assertThat(receivedMessages.get(word))
                                                                .containsExactlyElementsOf(counter));
        }
 
-       static KeyValue<Word, WordCounter>[] expectedMessagesArray = new KeyValue[]
+       static final KeyValue<Word, WordCounter>[] EXPECTED_MESSAGES = new KeyValue[]
        {
                        KeyValue.pair(
                                        Word.of("peter","Hallo"),
@@ -99,13 +76,13 @@ class TestData
                                        WordCounter.of("klaus","s",3)),
        };
 
-       static MultiValueMap<Word, WordCounter> expectedMessages;
-       static
+       static MultiValueMap<Word, WordCounter> expectedMessages()
        {
-               expectedMessages = new LinkedMultiValueMap<>();
+               MultiValueMap<Word, WordCounter> expectedMessages = new LinkedMultiValueMap<>();
                Stream
-                               .of(expectedMessagesArray)
+                               .of(EXPECTED_MESSAGES)
                                .forEach(keyValue -> expectedMessages.add(keyValue.key, keyValue.value));
+               return expectedMessages;
        }
 
        static Map<String, Object> convertToMap(Properties properties)