X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FTestData.java;h=4a65a78a4f15997416615e33b8dcc25fa0ca8b93;hb=ff29d17cc2b1fa9b465c1874e387c23b7d7adc4e;hp=8ff70223d844a78065622968d67796a211bc29fb;hpb=c2d06f0efd9e09a9df1c4c536d54ad969cf456eb;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 8ff7022..4a65a78 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",
-				"{\"user\":\"peter\",\"word\":\"Hallo\"}");
+				Word.of("peter","Hallo"));
 		consumer.accept(
 				"klaus",
-				"{\"user\":\"klaus\",\"word\":\"Müsch\"}");
+				Word.of("klaus","Müsch"));
 		consumer.accept(
 				"peter",
-				"{\"user\":\"peter\",\"word\":\"Welt\"}");
+				Word.of("peter","Welt"));
 		consumer.accept(
 				"klaus",
-				"{\"user\":\"klaus\",\"word\":\"Müsch\"}");
+				Word.of("klaus","Müsch"));
 		consumer.accept(
 				"klaus",
-				"{\"user\":\"klaus\",\"word\":\"s\"}");
+				Word.of("klaus","s"));
 		consumer.accept(
 				"peter",
-				"{\"user\":\"peter\",\"word\":\"Boäh\"}");
+				Word.of("peter","Boäh"));
 		consumer.accept(
 				"peter",
-				"{\"user\":\"peter\",\"word\":\"Welt\"}");
+				Word.of("peter","Welt"));
 		consumer.accept(
 				"peter",
-				"{\"user\":\"peter\",\"word\":\"Boäh\"}");
+				Word.of("peter","Boäh"));
 		consumer.accept(
 				"klaus",
-				"{\"user\":\"klaus\",\"word\":\"s\"}");
+				Word.of("klaus","s"));
 		consumer.accept(
 				"peter",
-				"{\"user\":\"peter\",\"word\":\"Boäh\"}");
+				Word.of("peter","Boäh"));
 		consumer.accept(
 				"klaus",
-				"{\"user\":\"klaus\",\"word\":\"s\"}");
+				Word.of("klaus","s"));
 	}
 
 	static void assertExpectedResult(List<Message> receivedMessages)
@@ -69,37 +69,37 @@ class TestData
 	static Message[] expectedMessages =
 	{
 			Message.of(
-					"{\"user\":\"peter\",\"word\":\"Hallo\"}",
-					"{\"user\":\"peter\",\"word\":\"Hallo\",\"count\":1}"),
+					Word.of("peter","Hallo"),
+					WordCount.of("peter","Hallo",1)),
 			Message.of(
-					"{\"user\":\"klaus\",\"word\":\"Müsch\"}",
-					"{\"user\":\"klaus\",\"word\":\"Müsch\",\"count\":1}"),
+					Word.of("klaus","Müsch"),
+					WordCount.of("klaus","Müsch",1)),
 			Message.of(
-					"{\"user\":\"peter\",\"word\":\"Welt\"}",
-					"{\"user\":\"peter\",\"word\":\"Welt\",\"count\":1}"),
+					Word.of("peter","Welt"),
+					WordCount.of("peter","Welt",1)),
 			Message.of(
-					"{\"user\":\"klaus\",\"word\":\"Müsch\"}",
-					"{\"user\":\"klaus\",\"word\":\"Müsch\",\"count\":2}"),
+					Word.of("klaus","Müsch"),
+					WordCount.of("klaus","Müsch",2)),
 			Message.of(
-					"{\"user\":\"klaus\",\"word\":\"s\"}",
-					"{\"user\":\"klaus\",\"word\":\"s\",\"count\":1}"),
+					Word.of("klaus","s"),
+					WordCount.of("klaus","s",1)),
 			Message.of(
-					"{\"user\":\"peter\",\"word\":\"Boäh\"}",
-					"{\"user\":\"peter\",\"word\":\"Boäh\",\"count\":1}"),
+					Word.of("peter","Boäh"),
+					WordCount.of("peter","Boäh",1)),
 			Message.of(
-					"{\"user\":\"peter\",\"word\":\"Welt\"}",
-					"{\"user\":\"peter\",\"word\":\"Welt\",\"count\":2}"),
+					Word.of("peter","Welt"),
+					WordCount.of("peter","Welt",2)),
 			Message.of(
-					"{\"user\":\"peter\",\"word\":\"Boäh\"}",
-					"{\"user\":\"peter\",\"word\":\"Boäh\",\"count\":2}"),
+					Word.of("peter","Boäh"),
+					WordCount.of("peter","Boäh",2)),
 			Message.of(
-					"{\"user\":\"klaus\",\"word\":\"s\"}",
-					"{\"user\":\"klaus\",\"word\":\"s\",\"count\":2}"),
+					Word.of("klaus","s"),
+					WordCount.of("klaus","s",2)),
 			Message.of(
-					"{\"user\":\"peter\",\"word\":\"Boäh\"}",
-					"{\"user\":\"peter\",\"word\":\"Boäh\",\"count\":3}"),
+					Word.of("peter","Boäh"),
+					WordCount.of("peter","Boäh",3)),
 			Message.of(
-					"{\"user\":\"klaus\",\"word\":\"s\"}",
-					"{\"user\":\"klaus\",\"word\":\"s\",\"count\":3}"),
+					Word.of("klaus","s"),
+					WordCount.of("klaus","s",3)),
 	};
 }