ROT: Korrigierten/Verbesserten Test und Überarbeitetes Setup gemerged

[demos/kafka/training] / src / test / java / de / juplo / kafka / GenericApplicationTests.java

diff --git a/src/test/java/de/juplo/kafka/GenericApplicationTests.java b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
index 711a44a..b019373 100644 (file)
--- a/src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@ -1,5 +1,6 @@
 package de.juplo.kafka;
 
+import com.mongodb.client.MongoClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -12,6 +13,7 @@ import org.apache.kafka.common.utils.Bytes;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoProperties;
 import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
 import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
 import org.springframework.boot.test.context.TestConfiguration;
@@ -39,7 +41,7 @@ import static org.awaitility.Awaitility.*;
                properties = {
                                "sumup.adder.bootstrap-server=${spring.embedded.kafka.brokers}",
                                "sumup.adder.topic=" + TOPIC,
-                               "sumup.adder.commit-interval=1s",
+                               "sumup.adder.commit-interval=500ms",
                                "spring.mongodb.embedded.version=4.4.13" })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
 @EnableAutoConfiguration
@@ -60,7 +62,11 @@ abstract class GenericApplicationTests<K, V>
        @Autowired
        ExecutorService executor;
        @Autowired
-       PartitionStatisticsRepository partitionStatisticsRepository;
+       StateRepository stateRepository;
+       @Autowired
+       MongoClient mongoClient;
+       @Autowired
+       MongoProperties mongoProperties;
        @Autowired
        PollIntervalAwareConsumerRebalanceListener rebalanceListener;
        @Autowired
@@ -173,9 +179,6 @@ abstract class GenericApplicationTests<K, V>
 
                checkSeenOffsetsForProgress();
                compareToCommitedOffsets(oldOffsets);
-               assertThat(receivedRecords.size())
-                               .describedAs("Received not all sent events")
-                               .isLessThan(numberOfGeneratedMessages);
 
                assertThatNoException()
                                .describedAs("Consumer should not be running")
@@ -233,11 +236,11 @@ abstract class GenericApplicationTests<K, V>
                        log.info("New position for {}: {}", tp, offset);
                        Integer partition = tp.partition();
                        StateDocument document =
-                                       partitionStatisticsRepository
+                                       stateRepository
                                                        .findById(partition.toString())
                                                        .orElse(new StateDocument(partition));
                        document.offset = offset;
-                       partitionStatisticsRepository.save(document);
+                       stateRepository.save(document);
                });
                offsetConsumer.unsubscribe();
        }
@@ -247,7 +250,7 @@ abstract class GenericApplicationTests<K, V>
                partitions().forEach(tp ->
                {
                        String partition = Integer.toString(tp.partition());
-                       Optional<Long> offset = partitionStatisticsRepository.findById(partition).map(document -> document.offset);
+                       Optional<Long> offset = stateRepository.findById(partition).map(document -> document.offset);
                        consumer.accept(tp, offset.orElse(0l));
                });
        }
@@ -329,6 +332,7 @@ abstract class GenericApplicationTests<K, V>
                props.put("value.deserializer", BytesDeserializer.class.getName());
                offsetConsumer = new KafkaConsumer<>(props);
 
+               mongoClient.getDatabase(mongoProperties.getDatabase()).drop();
                seekToEnd();
 
                oldOffsets = new HashMap<>();