diff --git a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java index 414c615ac4..86df2697c7 100644 --- a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java +++ b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2023 the original author or authors. + * Copyright 2023-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ public interface DebeziumMySqlTestContainer { MySQLContainer DEBEZIUM_MYSQL = new MySQLContainer<>( - DockerImageName.parse("debezium/example-mysql:2.2.0.Final") + DockerImageName.parse("debezium/example-mysql:2.7.0.Final") .asCompatibleSubstituteFor("mysql")) .withUsername("mysqluser") .withPassword("mysqlpw"); diff --git a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java index eede491be3..b728713a51 100644 --- a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java +++ b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2023 the original author or authors. + * Copyright 2023-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package org.springframework.integration.debezium.it; +import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -62,7 +63,7 @@ public class DebeziumBatchTests implements DebeziumMySqlTestContainer { @Test void batchMode() { - await().until(this::receivePayloads, (count) -> count == EXPECTED_DB_TX_COUNT); + await().atMost(Duration.ofSeconds(30)).until(this::receivePayloads, (count) -> count == EXPECTED_DB_TX_COUNT); assertThat(allPayload).hasSize(EXPECTED_DB_TX_COUNT); assertThat(batchCount).isLessThan(EXPECTED_DB_TX_COUNT); diff --git a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumStreamTests.java b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumStreamTests.java index 3847b67e2d..73779f0ad6 100644 --- a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumStreamTests.java +++ b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumStreamTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2023 the original author or authors. + * Copyright 2023-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ public class DebeziumStreamTests implements DebeziumMySqlTestContainer { void streamMode() { boolean foundDebeziumHeaders = false; for (int i = 0; i < EXPECTED_DB_TX_COUNT; i++) { - Message message = this.queueChannel.receive(10_000); + Message message = this.queueChannel.receive(30_000); assertThat(message).isNotNull(); if (message.getHeaders().size() > 5) {