splitter: 1.2.0 - Refined `TestData` clearified concerns

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

diff --git a/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java b/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java
index 2af8644..a3f7575 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java
@@ -7,7 +7,6 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import java.time.Duration;
-import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -19,14 +18,13 @@ public class TestData
        static final String PETER = "peter";
        static final String KLAUS = "klaus";
 
-       static void writeInputData(BiConsumer<String, TestRecording> consumer)
+
+       static final Stream<KeyValue<String, TestRecording>> getInputMessages()
        {
-               Stream
-                               .of(INPUT_MESSAGES)
-                               .forEach(kv -> consumer.accept(kv.key, kv.value));
+               return Stream.of(INPUT_MESSAGES);
        }
 
-       static final KeyValue<String, TestRecording>[] INPUT_MESSAGES = new KeyValue[]
+       private static final KeyValue<String, TestRecording>[] INPUT_MESSAGES = new KeyValue[]
        {
                        new KeyValue<>(
                                        PETER,
@@ -41,15 +39,14 @@ public class TestData
 
        static void assertExpectedMessages(MultiValueMap<String, TestWord> receivedMessages)
        {
-               MultiValueMap<String, TestWord> expected = new LinkedMultiValueMap<>();
-               expectedMessages.forEach(keyValue -> expected.add(keyValue.key, keyValue.value));
                await("Received expected messages")
                                .atMost(Duration.ofSeconds(5))
-                               .untilAsserted(() -> expected.forEach((user, word) ->
+                               .untilAsserted(() -> expectedMessages().forEach((user, word) ->
                                                assertThat(receivedMessages.get(user)).containsExactlyElementsOf(word)));
        }
 
-       static Stream<KeyValue<String, TestWord>> expectedMessages = Stream.of(
+       private static final KeyValue<String, TestWord>[] EXPECTED_MESSAGES = new KeyValue[]
+       {
                        KeyValue.pair(
                                        "peter",
                                        TestWord.of("peter", "Hallo")),
@@ -85,5 +82,15 @@ public class TestData
                                        TestWord.of("peter", "nä")),
                        KeyValue.pair(
                                        "peter",
-                                       TestWord.of("peter", "Nümmäh")));
+                                       TestWord.of("peter", "Nümmäh")),
+       };
+
+       static MultiValueMap<String, TestWord> expectedMessages()
+       {
+               MultiValueMap<String, TestWord> expectedMessages = new LinkedMultiValueMap<>();
+               Stream
+                               .of(EXPECTED_MESSAGES)
+                               .forEach(keyValue -> expectedMessages.add(keyValue.key, keyValue.value));
+               return expectedMessages;
+       }
 }