Skip to content

Commit 6c44cd7

Browse files
committed
Add @RetryingTest to MessageDrivenAdapterTests.testInboundBatch
**Auto-cherry-pick to `7.0.x`**
1 parent 558abc3 commit 6c44cd7

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.apache.kafka.common.header.internals.RecordHeaders;
4242
import org.assertj.core.api.InstanceOfAssertFactories;
4343
import org.junit.jupiter.api.Test;
44+
import org.junitpioneer.jupiter.RetryingTest;
4445

4546
import org.springframework.core.retry.RetryListener;
4647
import org.springframework.core.retry.RetryPolicy;
@@ -399,12 +400,12 @@ protected boolean doSend(Message<?> message, long timeout) {
399400
pf.reset();
400401
}
401402

402-
@Test
403+
@RetryingTest(10)
403404
void testInboundBatch(EmbeddedKafkaBroker embeddedKafka) throws Exception {
404405
Map<String, Object> props = KafkaTestUtils.consumerProps(embeddedKafka, "test2", true);
405406
props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
406-
props.put(ConsumerConfig.FETCH_MIN_BYTES_CONFIG, 68);
407-
props.put(ConsumerConfig.FETCH_MAX_WAIT_MS_CONFIG, 10000);
407+
props.put(ConsumerConfig.FETCH_MIN_BYTES_CONFIG, 50);
408+
props.put(ConsumerConfig.FETCH_MAX_WAIT_MS_CONFIG, 1000);
408409

409410
DefaultKafkaConsumerFactory<Integer, String> cf = new DefaultKafkaConsumerFactory<>(props);
410411
ContainerProperties containerProps = new ContainerProperties(topic2);
@@ -478,9 +479,9 @@ public Message<?> toMessage(List<ConsumerRecord<?, ?>> records, Acknowledgment a
478479
});
479480
PollableChannel errors = new QueueChannel();
480481
adapter.setErrorChannel(errors);
481-
template.sendDefault(1, "foo");
482-
template.sendDefault(1, "bar");
483-
Message<?> error = errors.receive(10000);
482+
template.sendDefault(0, 1487694048607L, 1, "foo");
483+
template.sendDefault(0, 1487694048608L, 1, "bar");
484+
Message<?> error = errors.receive(30000);
484485
assertThat(error).isNotNull();
485486
assertThat(error.getPayload()).isInstanceOf(ConversionException.class);
486487
assertThat(((ConversionException) error.getPayload()).getMessage())

0 commit comments

Comments
 (0)