projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
`EndlessConsumer` auf `@KafkaHandler` umgestellt
[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
..
49ddb47
100644
(file)
--- a/
src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/
src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@
-12,7
+12,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
+19,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
+38,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,9
+66,11
@@
abstract class GenericApplicationTests<K, V>
@Autowired
MongoProperties mongoProperties;
@Autowired
@Autowired
MongoProperties mongoProperties;
@Autowired
-
TestRecordHandler<K, V> recordHandler
;
+
KafkaListenerEndpointRegistry kafkaListenerEndpointRegistry
;
@Autowired
@Autowired
- EndlessConsumer<K, V> endlessConsumer;
+ TestRecordHandler recordHandler;
+ @Autowired
+ EndlessConsumer endlessConsumer;
KafkaProducer<Bytes, Bytes> testRecordProducer;
KafkaConsumer<Bytes, Bytes> offsetConsumer;
KafkaProducer<Bytes, Bytes> testRecordProducer;
KafkaConsumer<Bytes, Bytes> offsetConsumer;
@@
-99,7
+98,7
@@
abstract class GenericApplicationTests<K, V>
await(numberOfGeneratedMessages + " records received")
.atMost(Duration.ofSeconds(30))
.pollInterval(Duration.ofSeconds(1))
await(numberOfGeneratedMessages + " records received")
.atMost(Duration.ofSeconds(30))
.pollInterval(Duration.ofSeconds(1))
- .until(() -> recordHandler.received
Records.size()
>= numberOfGeneratedMessages);
+ .until(() -> recordHandler.received
Messages
>= numberOfGeneratedMessages);
await("Offsets committed")
.atMost(Duration.ofSeconds(10))
await("Offsets committed")
.atMost(Duration.ofSeconds(10))
@@
-141,7
+140,7
@@
abstract class GenericApplicationTests<K, V>
checkSeenOffsetsForProgress();
assertSeenOffsetsEqualCommittedOffsets(recordHandler.seenOffsets);
checkSeenOffsetsForProgress();
assertSeenOffsetsEqualCommittedOffsets(recordHandler.seenOffsets);
- assertThat(recordHandler.received
Records.size()
)
+ assertThat(recordHandler.received
Messages
)
.describedAs("Received not all sent events")
.isLessThan(numberOfGeneratedMessages);
.describedAs("Received not all sent events")
.isLessThan(numberOfGeneratedMessages);
@@
-157,7
+156,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
+167,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
+175,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")
@@
-348,7
+347,7
@@
abstract class GenericApplicationTests<K, V>
oldOffsets = new HashMap<>();
recordHandler.seenOffsets = new HashMap<>();
oldOffsets = new HashMap<>();
recordHandler.seenOffsets = new HashMap<>();
- recordHandler.received
Records = new HashSet<>()
;
+ recordHandler.received
Messages = 0
;
doForCurrentOffsets((tp, offset) ->
{
doForCurrentOffsets((tp, offset) ->
{
@@
-392,5
+391,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();
+ }
}
}
}
}