X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterStreamProcessorTopologyTest.java;h=ca2664e802844fbbf8af56bbcbc15ff489ac558c;hb=e94a327bebf468e2bcb5b686346a18a1409ec254;hp=42ca78b961c444eb1c01b1627926c49ac3f918d5;hpb=ff29d17cc2b1fa9b465c1874e387c23b7d7adc4e;p=demos%2Fkafka%2Fwordcount

diff --git a/src/test/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessorTopologyTest.java b/src/test/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessorTopologyTest.java
index 42ca78b..ca2664e 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessorTopologyTest.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessorTopologyTest.java
@@ -1,9 +1,7 @@
 package de.juplo.kafka.wordcount.counter;
 
-import org.apache.kafka.streams.TestInputTopic;
-import org.apache.kafka.streams.TestOutputTopic;
-import org.apache.kafka.streams.Topology;
-import org.apache.kafka.streams.TopologyTestDriver;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.streams.*;
 import org.apache.kafka.streams.state.Stores;
 import org.junit.jupiter.api.Test;
 import org.springframework.kafka.support.serializer.JsonDeserializer;
@@ -13,9 +11,14 @@ import org.springframework.kafka.support.serializer.JsonSerializer;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
+import static de.juplo.kafka.wordcount.counter.TestData.convertToMap;
+import static de.juplo.kafka.wordcount.counter.TestData.parseHeader;
+import static org.springframework.kafka.support.mapping.AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME;
+import static org.springframework.kafka.support.mapping.AbstractJavaTypeMapper.KEY_DEFAULT_CLASSID_FIELD_NAME;
 
+
+@Slf4j
 public class CounterStreamProcessorTopologyTest
 {
   public final static String IN = "TEST-IN";
@@ -33,15 +36,8 @@ public class CounterStreamProcessorTopologyTest
         new CounterApplicationConfiguriation();
     Properties streamProcessorProperties =
         applicationConfiguriation.streamProcessorProperties(new CounterApplicationProperties());
+    Map<String, Object> propertyMap = convertToMap(streamProcessorProperties);
 
-    Map<String, ?> propertyMap = streamProcessorProperties
-        .entrySet()
-        .stream()
-        .collect(
-            Collectors.toMap(
-                entry -> (String)entry.getKey(),
-                entry -> entry.getValue()
-            ));
     JsonSerde<?> keySerde = new JsonSerde<>();
     keySerde.configure(propertyMap, true);
     JsonSerde<?> valueSerde = new JsonSerde<>();
@@ -54,17 +50,26 @@ public class CounterStreamProcessorTopologyTest
         (JsonSerializer<String>)keySerde.serializer(),
         (JsonSerializer<Word>)valueSerde.serializer());
 
-    TestOutputTopic<Word, WordCount> out = testDriver.createOutputTopic(
+    TestOutputTopic<Word, WordCounter> out = testDriver.createOutputTopic(
         OUT,
         (JsonDeserializer<Word>)keySerde.deserializer(),
-        (JsonDeserializer<WordCount>)valueSerde.deserializer());
+        (JsonDeserializer<WordCounter>)valueSerde.deserializer());
 
     TestData.writeInputData((key, value) -> in.pipeInput(key, value));
 
-    List<Message> receivedMessages = out
+    List<KeyValue<Word, WordCounter>> receivedMessages = out
         .readRecordsToList()
         .stream()
-        .map(record -> Message.of(record.key(), record.value()))
+        .map(record ->
+        {
+          log.debug(
+              "OUT: {} -> {}, {}, {}",
+              record.key(),
+              record.value(),
+              parseHeader(record.headers(), KEY_DEFAULT_CLASSID_FIELD_NAME),
+              parseHeader(record.headers(), DEFAULT_CLASSID_FIELD_NAME));
+          return KeyValue.pair(record.key(), record.value());
+        })
         .toList();
 
     TestData.assertExpectedResult(receivedMessages);