X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;fp=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=fc5d4c9e51d21348a9271fad7877bbd07b9ed0fe;hb=2da45caa1f9d32e3a5506d71cce7f06fa2e36523;hp=a632a89c41f936b88f1f23742e78183279138ef3;hpb=b3777fba0ae679d9e2c9d36626fa208a952f83e8;p=demos%2Fkafka%2Ftraining

diff --git a/src/test/java/de/juplo/kafka/ApplicationTests.java b/src/test/java/de/juplo/kafka/ApplicationTests.java
index a632a89..fc5d4c9 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -26,7 +26,6 @@ import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.function.BiConsumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -63,6 +62,8 @@ class ApplicationTests
 	@Autowired
 	KafkaConsumer<String, Long> kafkaConsumer;
 	@Autowired
+	KafkaConsumer<Bytes, Bytes> offsetConsumer;
+	@Autowired
 	PartitionStatisticsRepository partitionStatisticsRepository;
 	@Autowired
 	ApplicationProperties properties;
@@ -84,17 +85,22 @@ class ApplicationTests
 	/** Tests methods */
 
 	@Test
-	@Order(1) // << The poistion pill is not skipped. Hence, this test must run first
 	void commitsCurrentOffsetsOnSuccess() throws ExecutionException, InterruptedException
 	{
-		send100Messages(i ->  new Bytes(valueSerializer.serialize(TOPIC, i)));
+		send100Messages((partition, key, counter) ->
+		{
+			Bytes value = new Bytes(valueSerializer.serialize(TOPIC, counter));
+			return new ProducerRecord<>(TOPIC, partition, key, value);
+		});
 
 		await("100 records received")
 				.atMost(Duration.ofSeconds(30))
+				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> receivedRecords.size() >= 100);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
+				.pollInterval(Duration.ofSeconds(1))
 				.untilAsserted(() ->
 				{
 					checkSeenOffsetsForProgress();
@@ -107,16 +113,19 @@ class ApplicationTests
 	}
 
 	@Test
-	@Order(2)
-	void commitsOffsetOfErrorForReprocessingOnError()
+	void commitsOffsetOfErrorForReprocessingOnDeserializationError()
 	{
-		send100Messages(counter ->
-				counter == 77
-						? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
-						: new Bytes(valueSerializer.serialize(TOPIC, counter)));
+		send100Messages((partition, key, counter) ->
+		{
+			Bytes value = counter == 77
+					? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
+					: new Bytes(valueSerializer.serialize(TOPIC, counter));
+			return new ProducerRecord<>(TOPIC, partition, key, value);
+		});
 
 		await("Consumer failed")
 				.atMost(Duration.ofSeconds(30))
+				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
@@ -125,6 +134,7 @@ class ApplicationTests
 		endlessConsumer.start();
 		await("Consumer failed")
 				.atMost(Duration.ofSeconds(30))
+				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
@@ -162,8 +172,8 @@ class ApplicationTests
 		Set<TopicPartition> withProgress = new HashSet<>();
 		partitions().forEach(tp ->
 		{
-			Long oldOffset = oldOffsets.get(tp);
-			Long newOffset = newOffsets.get(tp);
+			Long oldOffset = oldOffsets.get(tp) + 1;
+			Long newOffset = newOffsets.get(tp) + 1;
 			if (!oldOffset.equals(newOffset))
 			{
 				log.debug("Progress for {}: {} -> {}", tp, oldOffset, newOffset);
@@ -178,6 +188,24 @@ class ApplicationTests
 
 	/** Helper methods for setting up and running the tests */
 
+	void seekToEnd()
+	{
+		offsetConsumer.assign(partitions());
+		partitions().forEach(tp ->
+		{
+			Long offset = offsetConsumer.position(tp);
+			log.info("New position for {}: {}", tp, offset);
+			Integer partition = tp.partition();
+			StatisticsDocument document =
+					partitionStatisticsRepository
+							.findById(partition.toString())
+							.orElse(new StatisticsDocument(partition));
+			document.offset = offset;
+			partitionStatisticsRepository.save(document);
+		});
+		offsetConsumer.unsubscribe();
+	}
+
 	void doForCurrentOffsets(BiConsumer<TopicPartition, Long> consumer)
 	{
 		partitions().forEach(tp ->
@@ -198,7 +226,12 @@ class ApplicationTests
 	}
 
 
-	void send100Messages(Function<Long, Bytes> messageGenerator)
+	public interface RecordGenerator<K, V>
+	{
+		public ProducerRecord<String, Bytes> generate(int partition, String key, long counter);
+	}
+
+	void send100Messages(RecordGenerator recordGenerator)
 	{
 		long i = 0;
 
@@ -206,14 +239,8 @@ class ApplicationTests
 		{
 			for (int key = 0; key < 10; key++)
 			{
-				Bytes value = messageGenerator.apply(++i);
-
 				ProducerRecord<String, Bytes> record =
-						new ProducerRecord<>(
-								TOPIC,
-								partition,
-								Integer.toString(key%2),
-								value);
+						recordGenerator.generate(partition, Integer.toString(partition*10+key%2), ++i);
 
 				kafkaProducer.send(record, (metadata, e) ->
 				{
@@ -243,6 +270,8 @@ class ApplicationTests
 	@BeforeEach
 	public void init()
 	{
+		seekToEnd();
+
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
 		receivedRecords = new HashSet<>();
@@ -312,5 +341,19 @@ class ApplicationTests
 
 			return new KafkaProducer<>(props);
 		}
+
+		@Bean
+		KafkaConsumer<Bytes, Bytes> offsetConsumer(ApplicationProperties properties)
+		{
+			Properties props = new Properties();
+			props.put("bootstrap.servers", properties.getBootstrapServer());
+			props.put("client.id", "OFFSET-CONSUMER");
+			props.put("enable.auto.commit", false);
+			props.put("auto.offset.reset", "latest");
+			props.put("key.deserializer", BytesDeserializer.class.getName());
+			props.put("value.deserializer", BytesDeserializer.class.getName());
+
+			return new KafkaConsumer<>(props);
+		}
 	}
 }