X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fsplitter%2FTestData.java;fp=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fsplitter%2FTestData.java;h=00ea4c4846e7811df0a9647c9f600f340507a2fd;hb=52831df8733700f29fd2e430d7a8912c26f22c08;hp=d1bbc0fb794280600901bc60ba70b6e7571c9788;hpb=d7fa29b35fef537b65e9110f708e781925ebff9f;p=demos%2Fkafka%2Fwordcount

diff --git a/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java b/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java
index d1bbc0f..00ea4c4 100644
--- a/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/splitter/TestData.java
@@ -1,20 +1,7 @@
 package de.juplo.kafka.wordcount.splitter;
 
 import de.juplo.kafka.wordcount.counter.TestWord;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.streams.KeyValue;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.KafkaHeaders;
-import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.messaging.handler.annotation.Header;
-import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
@@ -22,43 +9,12 @@ import java.time.Duration;
 import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
-import static de.juplo.kafka.wordcount.splitter.SplitterApplicationIT.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
 
-@SpringBootTest(
-		properties = {
-				"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",
-				"spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer",
-				"spring.kafka.consumer.properties.spring.json.value.default.type=de.juplo.kafka.wordcount.counter.TestWord",
-				"spring.kafka.consumer.properties.spring.json.trusted.packages=de.juplo.kafka.wordcount.splitter",
-				"logging.level.root=WARN",
-				"logging.level.de.juplo=DEBUG",
-				"juplo.wordcount.splitter.bootstrap-server=${spring.embedded.kafka.brokers}",
-				"juplo.wordcount.splitter.input-topic=" + TOPIC_IN,
-				"juplo.wordcount.splitter.output-topic=" + TOPIC_OUT })
-@EmbeddedKafka(topics = { TOPIC_IN, TOPIC_OUT })
-@Slf4j
-public class SplitterApplicationIT
+public class TestData
 {
-	public final static String TOPIC_IN = "in";
-	public final static String TOPIC_OUT = "out";
-
-	@Autowired
-	KafkaTemplate<String, Recording> kafkaTemplate;
-	@Autowired
-	Consumer consumer;
-
-
-	@BeforeEach
-	public void clear()
-	{
-		consumer.received.clear();
-	}
-
 	static void writeInputData(BiConsumer<String, Recording> consumer)
 	{
 		Recording recording;
@@ -79,18 +35,6 @@ public class SplitterApplicationIT
 		consumer.accept(recording.getUser(), recording);
 	}
 
-	@Test
-	void testSendMessage() throws Exception
-	{
-		writeInputData((user, recording) -> kafkaTemplate.send(TOPIC_IN, user, recording));
-
-		await("Expexted converted data")
-				.atMost(Duration.ofSeconds(5))
-				.untilAsserted(() ->
-						assertExpectedMessages(consumer.getReceivedMessages()));
-	}
-
-
 	static void assertExpectedMessages(MultiValueMap<String, TestWord> receivedMessages)
 	{
 		MultiValueMap<String, TestWord> expected = new LinkedMultiValueMap<>();
@@ -138,35 +82,4 @@ public class SplitterApplicationIT
 			KeyValue.pair(
 					"peter",
 					new TestWord("peter", "Nümmäh")));
-
-
-	static class Consumer
-	{
-		private final MultiValueMap<String, TestWord> received = new LinkedMultiValueMap<>();
-
-		@KafkaListener(groupId = "TEST", topics = TOPIC_OUT)
-		public synchronized void receive(
-				@Header(KafkaHeaders.RECEIVED_KEY) String key,
-				@Payload TestWord value)
-		{
-			log.debug("Received message: {}={}", key, value);
-			received.add(key, value);
-		}
-
-		synchronized MultiValueMap<String, TestWord> getReceivedMessages()
-		{
-			return received;
-		}
-	}
-
-
-	@TestConfiguration
-	static class Configuration
-	{
-		@Bean
-		Consumer consumer()
-		{
-			return new Consumer();
-		}
-	}
 }