X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fquery%2FTestData.java;h=1fe34d9eecf50c609910dd02be5c5d0b919ef986;hb=57f47fca712981116b726e437f589ac727c5d0a7;hp=610bca04c05892a37641e79eb15ad1b6ca447d7f;hpb=2b22a006cc57203406c8589687a6c729ebdbf40c;p=demos%2Fkafka%2Fwordcount

diff --git a/src/test/java/de/juplo/kafka/wordcount/query/TestData.java b/src/test/java/de/juplo/kafka/wordcount/query/TestData.java
index 610bca0..1fe34d9 100644
--- a/src/test/java/de/juplo/kafka/wordcount/query/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/query/TestData.java
@@ -1,13 +1,12 @@
 package de.juplo.kafka.wordcount.query;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import de.juplo.kafka.wordcount.top10.TestEntry;
 import de.juplo.kafka.wordcount.top10.TestRanking;
 import de.juplo.kafka.wordcount.users.TestUserData;
 import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
 
 import java.util.Arrays;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -15,7 +14,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class TestData
 {
-	static final ObjectMapper objectMapper = new ObjectMapper();
 	static final String PETER = "peter";
 	static final String KLAUS = "klaus";
 
@@ -29,32 +27,15 @@ class TestData
 		return Stream.of(USERS_MESSAGES);
 	}
 
-	static void assertExpectedState(ReadOnlyKeyValueStore<String, String> store)
+	static void assertExpectedState(Function<String, UserRanking> function)
 	{
-		assertRankingEqualsRankingFromLastMessage(PETER, store.get(PETER));
-		assertRankingEqualsRankingFromLastMessage(KLAUS, store.get(KLAUS));
+		assertRankingEqualsRankingFromLastMessage(PETER, function.apply(PETER));
+		assertRankingEqualsRankingFromLastMessage(KLAUS, function.apply(KLAUS));
 	}
 
-	private static void assertRankingEqualsRankingFromLastMessage(String user, String userRankingJson)
+	private static void assertRankingEqualsRankingFromLastMessage(String user, UserRanking rankingJson)
 	{
-		assertThat(userRankingOf(userRankingJson)).isEqualTo(getLastMessageFor(user));
-	}
-
-	private static UserRanking userRankingOf(String json)
-	{
-		if (json == null)
-		{
-			return null;
-		}
-
-		try
-		{
-			return objectMapper.readValue(json, UserRanking.class);
-		}
-		catch (Exception e)
-		{
-			throw new RuntimeException(e);
-		}
+		assertThat(rankingJson).isEqualTo(getLastMessageFor(user));
 	}
 
 	private static UserRanking getLastMessageFor(String user)