X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FTestData.java;h=5dc8bc2c5f95a34a0912cb45fc2299cb6ccf3c7d;hb=48dabf093db63d517252f47b15f597e80852e9d4;hp=c1dd45a333d052dee558c97fb00669ceafcd79eb;hpb=15f12279802c23601b648c631d044c3c77f40902;p=demos%2Fkafka%2Fwordcount

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..5dc8bc2 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
@@ -1,113 +1,90 @@
 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;
 
 
 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(List<KeyValue<Word, WordCount>> receivedMessages)
+	static void assertExpectedMessages(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 final KeyValue<Word, WordCounter>[] EXPECTED_MESSAGES = 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()
+	{
+		MultiValueMap<Word, WordCounter> 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
@@ -119,4 +96,17 @@ class TestData
 								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());
+		}
+	}
 }