counter: 1.2.15 - Refined `TestData.assertExpectedResult(..)`

[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 5798fc3..1687a33 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,9 +1,16 @@
 package de.juplo.kafka.wordcount.counter;
 
+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.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;
 
@@ -47,61 +54,82 @@ class TestData
                                Word.of("klaus","s"));
        }
 
-       static void assertExpectedResult(List<KeyValue<Word, WordCount>> receivedMessages)
+       static void assertExpectedResult(MultiValueMap<Word, WordCounter> 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[]
+       static KeyValue<Word, WordCounter>[] expectedMessagesArray = new KeyValue[]
        {
                        KeyValue.pair(
                                        Word.of("peter","Hallo"),
-                                       WordCount.of("peter","Hallo",1)),
+                                       WordCounter.of("peter","Hallo",1)),
                        KeyValue.pair(
                                        Word.of("klaus","Müsch"),
-                                       WordCount.of("klaus","Müsch",1)),
+                                       WordCounter.of("klaus","Müsch",1)),
                        KeyValue.pair(
                                        Word.of("peter","Welt"),
-                                       WordCount.of("peter","Welt",1)),
+                                       WordCounter.of("peter","Welt",1)),
                        KeyValue.pair(
                                        Word.of("klaus","Müsch"),
-                                       WordCount.of("klaus","Müsch",2)),
+                                       WordCounter.of("klaus","Müsch",2)),
                        KeyValue.pair(
                                        Word.of("klaus","s"),
-                                       WordCount.of("klaus","s",1)),
+                                       WordCounter.of("klaus","s",1)),
                        KeyValue.pair(
                                        Word.of("peter","Boäh"),
-                                       WordCount.of("peter","Boäh",1)),
+                                       WordCounter.of("peter","Boäh",1)),
                        KeyValue.pair(
                                        Word.of("peter","Welt"),
-                                       WordCount.of("peter","Welt",2)),
+                                       WordCounter.of("peter","Welt",2)),
                        KeyValue.pair(
                                        Word.of("peter","Boäh"),
-                                       WordCount.of("peter","Boäh",2)),
+                                       WordCounter.of("peter","Boäh",2)),
                        KeyValue.pair(
                                        Word.of("klaus","s"),
-                                       WordCount.of("klaus","s",2)),
+                                       WordCounter.of("klaus","s",2)),
                        KeyValue.pair(
                                        Word.of("peter","Boäh"),
-                                       WordCount.of("peter","Boäh",3)),
+                                       WordCounter.of("peter","Boäh",3)),
                        KeyValue.pair(
                                        Word.of("klaus","s"),
-                                       WordCount.of("klaus","s",3)),
+                                       WordCounter.of("klaus","s",3)),
        };
+
+       static MultiValueMap<Word, WordCounter> expectedMessages;
+       static
+       {
+               expectedMessages = new LinkedMultiValueMap<>();
+               Stream
+                               .of(expectedMessagesArray)
+                               .forEach(keyValue -> expectedMessages.add(keyValue.key, keyValue.value));
+       }
+
+       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);
+               if (header == null)
+               {
+                       return key + "=null";
+               }
+               else
+               {
+                       return key + "=" + new String(header.value());
+               }
+       }
 }