X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationIT.java;h=334cd05d4e788cbbd90569e016873f6a8f3eb8dd;hb=5aa03935c0d09c363dc2b3ddcbd5fc9aac93b8e1;hp=a771904c900dc614f9d20fe5e7b2e603ef5f08f4;hpb=1127988a1b631aa9e0c0107c1a3ed9f99edd188b;p=demos%2Fkafka%2Fwordcount

diff --git a/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java b/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
index a771904..334cd05 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
@@ -1,5 +1,6 @@
 package de.juplo.kafka.wordcount.counter;
 
+import de.juplo.kafka.wordcount.splitter.TestInputUser;
 import de.juplo.kafka.wordcount.splitter.TestInputWord;
 import de.juplo.kafka.wordcount.top10.TestOutputWord;
 import de.juplo.kafka.wordcount.top10.TestOutputWordCounter;
@@ -28,11 +29,13 @@ import java.time.Duration;
 
 import static de.juplo.kafka.wordcount.counter.CounterApplicationIT.TOPIC_IN;
 import static de.juplo.kafka.wordcount.counter.CounterApplicationIT.TOPIC_OUT;
+import static de.juplo.kafka.wordcount.counter.CounterStreamProcessor.STORE_NAME;
 import static org.awaitility.Awaitility.await;
 
 
 @SpringBootTest(
 		properties = {
+				"spring.kafka.producer.key-serializer=org.springframework.kafka.support.serializer.JsonSerializer",
 				"spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer",
 				"spring.kafka.producer.properties.spring.json.add.type.headers=false",
 				"spring.kafka.consumer.auto-offset-reset=earliest",
@@ -43,7 +46,6 @@ import static org.awaitility.Awaitility.await;
 				"logging.level.de.juplo=DEBUG",
 				"juplo.wordcount.counter.bootstrap-server=${spring.embedded.kafka.brokers}",
 				"juplo.wordcount.counter.commit-interval=0",
-				"juplo.wordcount.counter.cacheMaxBytes=0",
 				"juplo.wordcount.counter.input-topic=" + TOPIC_IN,
 				"juplo.wordcount.counter.output-topic=" + TOPIC_OUT })
 @EmbeddedKafka(topics = { TOPIC_IN, TOPIC_OUT })
@@ -55,11 +57,13 @@ public class CounterApplicationIT
 
 	@Autowired
 	Consumer consumer;
+	@Autowired
+	CounterStreamProcessor streamProcessor;
 
 
 	@BeforeAll
 	public static void testSendMessage(
-			@Autowired KafkaTemplate<String, TestInputWord> kafkaTemplate)
+			@Autowired KafkaTemplate<TestInputUser, TestInputWord> kafkaTemplate)
 	{
 		TestData
 				.getInputMessages()
@@ -67,7 +71,7 @@ public class CounterApplicationIT
 				{
 					try
 					{
-						SendResult<String, TestInputWord> result = kafkaTemplate.send(TOPIC_IN, kv.key, kv.value).get();
+						SendResult<TestInputUser, TestInputWord> result = kafkaTemplate.send(TOPIC_IN, kv.key, kv.value).get();
 						log.info(
 								"Sent: {}={}, partition={}, offset={}",
 								result.getProducerRecord().key(),
@@ -88,7 +92,8 @@ public class CounterApplicationIT
 	{
 		await("Expected number of messages")
 				.atMost(Duration.ofSeconds(5))
-				.untilAsserted(() -> consumer.enforceAssertion(TestData.expectedNumberOfMessagesForWordAssertion()));
+				.untilAsserted(() -> consumer.enforceAssertion(
+						receivedMessages -> TestData.assertExpectedNumberOfMessagesForWord(receivedMessages)));
 	}
 
 	@DisplayName("Await the expected output messages")
@@ -97,7 +102,27 @@ public class CounterApplicationIT
 	{
 		await("Expected messages")
 				.atMost(Duration.ofSeconds(10))
-				.untilAsserted(() -> consumer.enforceAssertion(TestData.expectedMessagesAssertion()));
+				.untilAsserted(() -> consumer.enforceAssertion(
+						receivedMessages -> TestData.assertExpectedMessages(receivedMessages)));
+	}
+
+	@DisplayName("Await the expected final output messages")
+	@Test
+	public void testAwaitExpectedLastMessagesForUsers()
+	{
+		await("Expected final output messages")
+				.atMost(Duration.ofSeconds(5))
+				.untilAsserted(() -> consumer.enforceAssertion(
+						receivedMessages -> TestData.assertExpectedLastMessagesForWord(receivedMessages)));
+	}
+
+	@DisplayName("Await the expected state in the state-store")
+	@Test
+	public void testAwaitExpectedState()
+	{
+		await("Expected state")
+				.atMost(Duration.ofSeconds(5))
+				.untilAsserted(() -> TestData.assertExpectedState(streamProcessor.getStore()));
 	}
 
 
@@ -134,7 +159,7 @@ public class CounterApplicationIT
 		@Bean
 		KeyValueBytesStoreSupplier inMemoryStoreSupplier()
 		{
-			return Stores.inMemoryKeyValueStore("TEST-STORE");
+			return Stores.inMemoryKeyValueStore(STORE_NAME);
 		}
 	}
 }