Signatur und Handling des `RecordGenerator` vereinfacht/überarbeitet

[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 1aacb94..9175e52 100644 (file)
--- a/src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@ -78,12 +78,13 @@ abstract class GenericApplicationTests<K, V>
        @Test
        void commitsCurrentOffsetsOnSuccess()
        {
-               recordGenerator.generate(100, Set.of(), Set.of(), messageSender);
+               int numberOfGeneratedMessages =
+                               recordGenerator.generate(false, false, messageSender);
 
-               await("100 records received")
+               await(numberOfGeneratedMessages + " records received")
                                .atMost(Duration.ofSeconds(30))
                                .pollInterval(Duration.ofSeconds(1))
-                               .until(() -> receivedRecords.size() >= 100);
+                               .until(() -> receivedRecords.size() >= numberOfGeneratedMessages);
 
                await("Offsets committed")
                                .atMost(Duration.ofSeconds(10))
@@ -103,7 +104,8 @@ abstract class GenericApplicationTests<K, V>
        @SkipWhenErrorCannotBeGenerated(poisonPill = true)
        void commitsOffsetOfErrorForReprocessingOnDeserializationError()
        {
-               recordGenerator.generate(100, Set.of(77), Set.of(), messageSender);
+               int numberOfGeneratedMessages =
+                               recordGenerator.generate(true, false, messageSender);
 
                await("Consumer failed")
                                .atMost(Duration.ofSeconds(30))
@@ -123,7 +125,7 @@ abstract class GenericApplicationTests<K, V>
                compareToCommitedOffsets(newOffsets);
                assertThat(receivedRecords.size())
                                .describedAs("Received not all sent events")
-                               .isLessThan(100);
+                               .isLessThan(numberOfGeneratedMessages);
 
                assertThatNoException()
                                .describedAs("Consumer should not be running")
@@ -137,7 +139,8 @@ abstract class GenericApplicationTests<K, V>
        @SkipWhenErrorCannotBeGenerated(logicError = true)
        void doesNotCommitOffsetsOnLogicError()
        {
-               recordGenerator.generate(100, Set.of(), Set.of(77), messageSender);
+               int numberOfGeneratedMessages =
+                               recordGenerator.generate(false, true, messageSender);
 
                await("Consumer failed")
                                .atMost(Duration.ofSeconds(30))
@@ -157,7 +160,7 @@ abstract class GenericApplicationTests<K, V>
                compareToCommitedOffsets(oldOffsets);
                assertThat(receivedRecords.size())
                                .describedAs("Received not all sent events")
-                               .isLessThan(100);
+                               .isLessThan(numberOfGeneratedMessages);
 
                assertThatNoException()
                                .describedAs("Consumer should not be running")
@@ -238,12 +241,12 @@ abstract class GenericApplicationTests<K, V>
 
        public interface RecordGenerator
        {
-               void generate(
-                               Set<Integer> poisonPills,
-                               Set<Integer> logicErrors,
+               int generate(
+                               boolean poisonPills,
+                               boolean logicErrors,
                                Consumer<ProducerRecord<Bytes, Bytes>> messageSender);
 
-               default boolean canGeneratePoisionPill()
+               default boolean canGeneratePoisonPill()
                {
                        return true;
                }