X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FTestData.java;h=f795e7765f6dba7e69ce24b01ddf81c0c8873660;hb=f9106e5166ce84caa2a910aa21fb41efaebcc73f;hp=dc3bcecfd98663b9f8d5dc0200804aaf39e3f5db;hpb=4072a93fd94a847c86ea422d74b17b0913b7de2a;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 dc3bcec..f795e77 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/TestData.java
@@ -8,41 +8,41 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class TestData
 {
-	static void writeInputData(BiConsumer<String, String> consumer)
+	static void writeInputData(BiConsumer<String, Word> consumer)
 	{
 		consumer.accept(
 				"peter",
-				"Hallo");
+				Word.of("peter","Hallo"));
 		consumer.accept(
 				"klaus",
-				"Müsch");
+				Word.of("klaus","Müsch"));
 		consumer.accept(
 				"peter",
-				"Welt");
+				Word.of("peter","Welt"));
 		consumer.accept(
 				"klaus",
-				"Müsch");
+				Word.of("klaus","Müsch"));
 		consumer.accept(
 				"klaus",
-				"s");
+				Word.of("klaus","s"));
 		consumer.accept(
 				"peter",
-				"Boäh");
+				Word.of("peter","Boäh"));
 		consumer.accept(
 				"peter",
-				"Welt");
+				Word.of("peter","Welt"));
 		consumer.accept(
 				"peter",
-				"Boäh");
+				Word.of("peter","Boäh"));
 		consumer.accept(
 				"klaus",
-				"s");
+				Word.of("klaus","s"));
 		consumer.accept(
 				"peter",
-				"Boäh");
+				Word.of("peter","Boäh"));
 		consumer.accept(
 				"klaus",
-				"s");
+				Word.of("klaus","s"));
 	}
 
 	static void assertExpectedResult(List<Message> receivedMessages)
@@ -69,37 +69,37 @@ class TestData
 	static Message[] expectedMessages =
 	{
 			Message.of(
-					"{\"username\":\"peter\",\"word\":\"Hallo\"}",
-					"1"),
+					"{\"user\":\"peter\",\"word\":\"Hallo\"}",
+					"{\"user\":\"peter\",\"word\":\"Hallo\",\"count\":1}"),
 			Message.of(
-					"{\"username\":\"klaus\",\"word\":\"Müsch\"}",
-					"1"),
+					"{\"user\":\"klaus\",\"word\":\"Müsch\"}",
+					"{\"user\":\"klaus\",\"word\":\"Müsch\",\"count\":1}"),
 			Message.of(
-					"{\"username\":\"peter\",\"word\":\"Welt\"}",
-					"1"),
+					"{\"user\":\"peter\",\"word\":\"Welt\"}",
+					"{\"user\":\"peter\",\"word\":\"Welt\",\"count\":1}"),
 			Message.of(
-					"{\"username\":\"klaus\",\"word\":\"Müsch\"}",
-					"2"),
+					"{\"user\":\"klaus\",\"word\":\"Müsch\"}",
+					"{\"user\":\"klaus\",\"word\":\"Müsch\",\"count\":2}"),
 			Message.of(
-					"{\"username\":\"klaus\",\"word\":\"s\"}",
-					"1"),
+					"{\"user\":\"klaus\",\"word\":\"s\"}",
+					"{\"user\":\"klaus\",\"word\":\"s\",\"count\":1}"),
 			Message.of(
-					"{\"username\":\"peter\",\"word\":\"Boäh\"}",
-					"1"),
+					"{\"user\":\"peter\",\"word\":\"Boäh\"}",
+					"{\"user\":\"peter\",\"word\":\"Boäh\",\"count\":1}"),
 			Message.of(
-					"{\"username\":\"peter\",\"word\":\"Welt\"}",
-					"2"),
+					"{\"user\":\"peter\",\"word\":\"Welt\"}",
+					"{\"user\":\"peter\",\"word\":\"Welt\",\"count\":2}"),
 			Message.of(
-					"{\"username\":\"peter\",\"word\":\"Boäh\"}",
-					"2"),
+					"{\"user\":\"peter\",\"word\":\"Boäh\"}",
+					"{\"user\":\"peter\",\"word\":\"Boäh\",\"count\":2}"),
 			Message.of(
-					"{\"username\":\"klaus\",\"word\":\"s\"}",
-					"2"),
+					"{\"user\":\"klaus\",\"word\":\"s\"}",
+					"{\"user\":\"klaus\",\"word\":\"s\",\"count\":2}"),
 			Message.of(
-					"{\"username\":\"peter\",\"word\":\"Boäh\"}",
-					"3"),
+					"{\"user\":\"peter\",\"word\":\"Boäh\"}",
+					"{\"user\":\"peter\",\"word\":\"Boäh\",\"count\":3}"),
 			Message.of(
-					"{\"username\":\"klaus\",\"word\":\"s\"}",
-					"3"),
+					"{\"user\":\"klaus\",\"word\":\"s\"}",
+					"{\"user\":\"klaus\",\"word\":\"s\",\"count\":3}"),
 	};
 }