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=ea33cb0b29869d2def92b03de6593d025ff3bfe1;hpb=f08dc87a018fb2cd84de1a274c20fb9f4487b7a0;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 ea33cb0..5dc8bc2 100644
--- 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,14 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class TestData
 {
-	static void writeInputData(BiConsumer<String, Word> consumer)
-	{
-		Stream
-				.of(inputMessagesArray)
-				.forEach(word -> consumer.accept(word.getUser(), word));
-	}
-
-	static Word[] inputMessagesArray = new Word[]
+	static final Word[] INPUT_MESSAGES = new Word[]
 	{
 			Word.of("peter","Hallo"),
 			Word.of("klaus","Müsch"),
@@ -39,15 +31,15 @@ class TestData
 			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"),
@@ -84,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)