X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fsplitter%2FTestData.java;h=a3f757566813fdf9ff77d30040bd513e8d6185bc;hb=53b03696e9e3890d9aeca795482cf66252449fad;hp=89cebaab07b3c44de4935f2dff88eca73865d1c2;hpb=b1db057d3c58d20620482ff68eb210b309e615fe;p=demos%2Fkafka%2Fwordcount

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 89cebaa..a3f7575 100644
--- a/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java
@@ -1,12 +1,12 @@
 package de.juplo.kafka.wordcount.splitter;
 
 import de.juplo.kafka.wordcount.counter.TestWord;
+import de.juplo.kafka.wordcount.recorder.TestRecording;
 import org.apache.kafka.streams.KeyValue;
 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;
@@ -15,37 +15,38 @@ import static org.awaitility.Awaitility.await;
 
 public class TestData
 {
-	static void writeInputData(BiConsumer<String, Recording> consumer)
-	{
-		Recording recording;
-
-		recording = new Recording();
-		recording.setUser("peter");
-		recording.setSentence("Hallo Welt!");
-		consumer.accept(recording.getUser(), recording);
+	static final String PETER = "peter";
+	static final String KLAUS = "klaus";
 
-		recording = new Recording();
-		recording.setUser("klaus");
-		recording.setSentence("Müsch gäb's auch!");
-		consumer.accept(recording.getUser(), recording);
 
-		recording = new Recording();
-		recording.setUser("peter");
-		recording.setSentence("Boäh, echt! ß mal nä Nümmäh!");
-		consumer.accept(recording.getUser(), recording);
+	static final Stream<KeyValue<String, TestRecording>> getInputMessages()
+	{
+		return Stream.of(INPUT_MESSAGES);
 	}
 
+	private static final KeyValue<String, TestRecording>[] INPUT_MESSAGES = new KeyValue[]
+	{
+			new KeyValue<>(
+					PETER,
+					TestRecording.of(PETER, "Hallo Welt!")),
+			new KeyValue<>(
+					KLAUS,
+					TestRecording.of(KLAUS, "Müsch gäb's auch!")),
+			new KeyValue<>(
+					PETER,
+					TestRecording.of(PETER, "Boäh, echt! ß mal nä Nümmäh!")),
+	};
+
 	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")),
@@ -81,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;
+	}
 }