query: 2.1.0 - Refined input JSON (adapted to general format for stats)

[demos/kafka/wordcount] / src / test / java / de / juplo / kafka / wordcount / query / TestData.java

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 f5b8a00..44162a0 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/query/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/query/TestData.java
@@ -10,13 +10,14 @@ import java.util.Arrays;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import static de.juplo.kafka.wordcount.query.QueryStreamProcessor.STATS_TYPE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
 class TestData
 {
-       static final TestUser PETER = TestUser.of("peter");
-       static final TestUser KLAUS = TestUser.of("klaus");
+       static final TestUser PETER = TestUser.of(STATS_TYPE, "peter");
+       static final TestUser KLAUS = TestUser.of(STATS_TYPE, "klaus");
 
        static final Stream<KeyValue<TestUser, TestRanking>> getTop10Messages()
        {
@@ -30,8 +31,8 @@ class TestData
 
        static void assertExpectedState(Function<String, UserRanking> function)
        {
-               assertRankingEqualsRankingFromLastMessage(PETER.getUser(), function.apply(PETER.getUser()));
-               assertRankingEqualsRankingFromLastMessage(KLAUS.getUser(), function.apply(KLAUS.getUser()));
+               assertRankingEqualsRankingFromLastMessage(PETER.getChannel(), function.apply(PETER.getChannel()));
+               assertRankingEqualsRankingFromLastMessage(KLAUS.getChannel(), function.apply(KLAUS.getChannel()));
        }
 
        private static void assertRankingEqualsRankingFromLastMessage(String user, UserRanking rankingJson)
@@ -42,7 +43,7 @@ class TestData
        private static UserRanking getLastMessageFor(String user)
        {
                return getTop10Messages()
-                               .filter(kv -> kv.key.getUser().equals(user))
+                               .filter(kv -> kv.key.getChannel().equals(user))
                                .map(kv -> kv.value)
                                .map(testRanking -> userRankingFor(user, testRanking))
                                .reduce(null, (left, right) -> right);
@@ -69,7 +70,7 @@ class TestData
        private static Entry entryOf(TestEntry testEntry)
        {
                Entry entry = new Entry();
-               entry.setWord(testEntry.getWord());
+               entry.setKey(testEntry.getKey());
                entry.setCounter(testEntry.getCounter());
                return entry;
        }
@@ -136,10 +137,10 @@ class TestData
        private static KeyValue<String, TestUserData>[] USERS_MESSAGES = new KeyValue[]
        {
                        KeyValue.pair(
-                                       PETER.getUser(),
-                                       TestUserData.of(PETER.getUser(), "Peter", "Pan", TestUserData.Sex.MALE)),
+                                       PETER.getChannel(),
+                                       TestUserData.of(PETER.getChannel(), "Peter", "Pan", TestUserData.Sex.MALE)),
                        KeyValue.pair(
-                                       KLAUS.getUser(),
-                                       TestUserData.of(KLAUS.getUser(), "Klaus", "Klüse", TestUserData.Sex.OTHER)),
+                                       KLAUS.getChannel(),
+                                       TestUserData.of(KLAUS.getChannel(), "Klaus", "Klüse", TestUserData.Sex.OTHER)),
        };
 }