X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FTestData.java;h=6419059f8e9d76546ab63eac1fe08ef9900731d5;hb=3c23bfd42005211ac9812fba698ab74c8a6b7aa0;hp=ab265a93a562e47a8fd4988dd51c696c29545f5f;hpb=ac64aac16d87b469f7772463e70f38db95e9943d;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 ab265a9..6419059 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
@@ -1,15 +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.function.BiConsumer;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -17,92 +16,78 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class TestData
 {
-	static void injectInputMessages(BiConsumer<String, Word> consumer)
+	private static final TestInputWord[] INPUT_MESSAGES = new TestInputWord[]
 	{
-		Stream
-				.of(inputMessagesArray)
-				.forEach(word -> consumer.accept(word.getUser(), word));
-	}
+			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 Word[] inputMessagesArray = new Word[]
+	static Stream<TestInputWord> getInputMessages()
 	{
-			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"),
-	};
+		return Stream.of(TestData.INPUT_MESSAGES);
+	}
 
-	static void assertExpectedMessages(MultiValueMap<Word, WordCounter> receivedMessages)
+	static void assertExpectedMessages(MultiValueMap<TestOutputWord, TestOutputWordCounter> receivedMessages)
 	{
-		expectedMessages.forEach(
+		expectedMessages().forEach(
 				(word, counter) ->
 						assertThat(receivedMessages.get(word))
 								.containsExactlyElementsOf(counter));
 	}
 
-	static KeyValue<Word, WordCounter>[] expectedMessagesArray = 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
+	static MultiValueMap<TestOutputWord, TestOutputWordCounter> expectedMessages()
 	{
-		expectedMessages = new LinkedMultiValueMap<>();
+		MultiValueMap<TestOutputWord, TestOutputWordCounter> expectedMessages = new LinkedMultiValueMap<>();
 		Stream
-				.of(expectedMessagesArray)
+				.of(EXPECTED_MESSAGES)
 				.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()
-						));
+		return expectedMessages;
 	}
 
 	static String parseHeader(Headers headers, String key)