projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
`EndlessConsumer` nimmt jetzt einzelne `ConsumerRecord`s entgegen
[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
937b40f
..
124143c
100644
(file)
--- a/
src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/
src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@
-2,6
+2,7
@@
package de.juplo.kafka;
import com.mongodb.client.MongoClient;
import lombok.extern.slf4j.Slf4j;
import com.mongodb.client.MongoClient;
import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
@@
-12,7
+13,6
@@
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.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
import org.springframework.boot.autoconfigure.mongo.MongoProperties;
import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
import org.springframework.boot.autoconfigure.mongo.MongoProperties;
import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
@@
-20,6
+20,8
@@
import org.springframework.boot.test.context.ConfigDataApplicationContextInitial
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
+import org.springframework.kafka.core.ConsumerFactory;
import org.springframework.kafka.test.context.EmbeddedKafka;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.kafka.test.context.EmbeddedKafka;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@
-37,11
+39,7
@@
import static org.assertj.core.api.Assertions.*;
import static org.awaitility.Awaitility.*;
import static org.awaitility.Awaitility.*;
-@SpringJUnitConfig(
- initializers = ConfigDataApplicationContextInitializer.class,
- classes = {
- KafkaAutoConfiguration.class,
- ApplicationTests.Configuration.class })
+@SpringJUnitConfig(initializers = ConfigDataApplicationContextInitializer.class)
@TestPropertySource(
properties = {
"spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
@TestPropertySource(
properties = {
"spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
@@
-69,6
+67,8
@@
abstract class GenericApplicationTests<K, V>
@Autowired
MongoProperties mongoProperties;
@Autowired
@Autowired
MongoProperties mongoProperties;
@Autowired
+ KafkaListenerEndpointRegistry kafkaListenerEndpointRegistry;
+ @Autowired
TestRecordHandler<K, V> recordHandler;
@Autowired
EndlessConsumer<K, V> endlessConsumer;
TestRecordHandler<K, V> recordHandler;
@Autowired
EndlessConsumer<K, V> endlessConsumer;
@@
-157,7
+157,7
@@
abstract class GenericApplicationTests<K, V>
@Test
@SkipWhenErrorCannotBeGenerated(logicError = true)
@Test
@SkipWhenErrorCannotBeGenerated(logicError = true)
- void
doesNotCommitOffset
sOnLogicError()
+ void
commitsOffsetsOfUnseenRecord
sOnLogicError()
{
int numberOfGeneratedMessages =
recordGenerator.generate(false, true, messageSender);
{
int numberOfGeneratedMessages =
recordGenerator.generate(false, true, messageSender);
@@
-168,7
+168,7
@@
abstract class GenericApplicationTests<K, V>
.until(() -> !endlessConsumer.running());
checkSeenOffsetsForProgress();
.until(() -> !endlessConsumer.running());
checkSeenOffsetsForProgress();
- assertSeenOffsets
AreBehind
CommittedOffsets(recordHandler.seenOffsets);
+ assertSeenOffsets
Equal
CommittedOffsets(recordHandler.seenOffsets);
endlessConsumer.start();
await("Consumer failed")
endlessConsumer.start();
await("Consumer failed")
@@
-176,7
+176,7
@@
abstract class GenericApplicationTests<K, V>
.pollInterval(Duration.ofSeconds(1))
.until(() -> !endlessConsumer.running());
.pollInterval(Duration.ofSeconds(1))
.until(() -> !endlessConsumer.running());
- assertSeenOffsets
AreBehind
CommittedOffsets(recordHandler.seenOffsets);
+ assertSeenOffsets
Equal
CommittedOffsets(recordHandler.seenOffsets);
assertThatNoException()
.describedAs("Consumer should not be running")
assertThatNoException()
.describedAs("Consumer should not be running")
@@
-392,5
+392,11
@@
abstract class GenericApplicationTests<K, V>
{
return new TestRecordHandler(applicationRecordHandler);
}
{
return new TestRecordHandler(applicationRecordHandler);
}
+
+ @Bean(destroyMethod = "close")
+ public org.apache.kafka.clients.consumer.Consumer<String, Message> kafkaConsumer(ConsumerFactory<String, Message> factory)
+ {
+ return factory.createConsumer();
+ }
}
}
}
}