X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationIT.java;h=a771904c900dc614f9d20fe5e7b2e603ef5f08f4;hb=1127988a1b631aa9e0c0107c1a3ed9f99edd188b;hp=31bf6a6d6c1f898793e51f9481f4a07d295687aa;hpb=3a0dbf30eaee8aade255360217d7ab6049a95041;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 31bf6a6..a771904 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
@@ -6,7 +6,8 @@ import de.juplo.kafka.wordcount.top10.TestOutputWordCounter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.Stores;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -16,6 +17,7 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.kafka.support.SendResult;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.messaging.handler.annotation.Payload;
@@ -51,29 +53,51 @@ public class CounterApplicationIT
 	public static final String TOPIC_IN = "in";
 	public static final String TOPIC_OUT = "out";
 
-	@Autowired
-	KafkaTemplate<String, TestInputWord> kafkaTemplate;
 	@Autowired
 	Consumer consumer;
 
 
-	@BeforeEach
-	public void clear()
+	@BeforeAll
+	public static void testSendMessage(
+			@Autowired KafkaTemplate<String, TestInputWord> kafkaTemplate)
 	{
-		consumer.received.clear();
+		TestData
+				.getInputMessages()
+				.forEach(kv ->
+				{
+					try
+					{
+						SendResult<String, TestInputWord> result = kafkaTemplate.send(TOPIC_IN, kv.key, kv.value).get();
+						log.info(
+								"Sent: {}={}, partition={}, offset={}",
+								result.getProducerRecord().key(),
+								result.getProducerRecord().value(),
+								result.getRecordMetadata().partition(),
+								result.getRecordMetadata().offset());
+					}
+					catch (Exception e)
+					{
+						throw new RuntimeException(e);
+					}
+				});
 	}
 
+	@DisplayName("Await the expected number of messages")
+	@Test
+	public void testAwaitExpectedNumberOfMessagesForUsers()
+	{
+		await("Expected number of messages")
+				.atMost(Duration.ofSeconds(5))
+				.untilAsserted(() -> consumer.enforceAssertion(TestData.expectedNumberOfMessagesForWordAssertion()));
+	}
 
+	@DisplayName("Await the expected output messages")
 	@Test
 	void testSendMessage()
 	{
-		TestData
-				.getInputMessages()
-				.forEach(word -> kafkaTemplate.send(TOPIC_IN, word.getUser(), word));
-
 		await("Expected messages")
 				.atMost(Duration.ofSeconds(10))
-				.untilAsserted(() -> TestData.assertExpectedMessages(consumer.getReceivedMessages()));
+				.untilAsserted(() -> consumer.enforceAssertion(TestData.expectedMessagesAssertion()));
 	}
 
 
@@ -90,9 +114,10 @@ public class CounterApplicationIT
 			received.add(word, counter);
 		}
 
-		synchronized MultiValueMap<TestOutputWord, TestOutputWordCounter> getReceivedMessages()
+		synchronized void enforceAssertion(
+				java.util.function.Consumer<MultiValueMap<TestOutputWord, TestOutputWordCounter>> assertion)
 		{
-			return received;
+			assertion.accept(received);
 		}
 	}