Make Oracle Docker Compose integration tests more robust

Closes gh-35285

Author: wilkinsona

spring-boot-project/spring-boot-docker-compose/build.gradle

@@ -22,12 +22,13 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
-	testImplementation("org.springframework:spring-core-test")
-	testImplementation("org.springframework:spring-test")
-	testImplementation("org.assertj:assertj-core")
-	testImplementation("org.mockito:mockito-core")
 	testImplementation("ch.qos.logback:logback-classic")
+	testImplementation("org.assertj:assertj-core")
+	testImplementation("org.awaitility:awaitility")
 	testImplementation("org.junit.jupiter:junit-jupiter")
+	testImplementation("org.mockito:mockito-core")
+	testImplementation("org.springframework:spring-core-test")
+	testImplementation("org.springframework:spring-test")
 
 	testRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc")
 	testRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc")

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -17,7 +17,9 @@
 package org.springframework.boot.docker.compose.service.connection.oracle;
 
 import java.sql.Driver;
+import java.time.Duration;
 
+import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.OS;
 
@@ -57,9 +59,11 @@ void runCreatesConnectionDetailsThatCanBeUsedToAccessDatabase() throws Exception
 		dataSource.setPassword(connectionDetails.getPassword());
 		dataSource.setDriverClass((Class<? extends Driver>) ClassUtils.forName(connectionDetails.getDriverClassName(),
 				getClass().getClassLoader()));
-		JdbcTemplate template = new JdbcTemplate(dataSource);
-		assertThat(template.queryForObject(DatabaseDriver.ORACLE.getValidationQuery(), String.class))
-			.isEqualTo("Hello");
+		Awaitility.await().atMost(Duration.ofMinutes(1)).ignoreExceptions().untilAsserted(() -> {
+			JdbcTemplate template = new JdbcTemplate(dataSource);
+			assertThat(template.queryForObject(DatabaseDriver.ORACLE.getValidationQuery(), String.class))
+				.isEqualTo("Hello");
+		});
 	}
 
 }

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -20,6 +20,7 @@
 
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.OS;
 
@@ -51,12 +52,14 @@ void runCreatesConnectionDetailsThatCanBeUsedToAccessDatabase() {
 		assertThat(connectionFactoryOptions.toString()).contains("database=xepdb1", "driver=oracle",
 				"password=REDACTED", "user=system");
 		assertThat(connectionFactoryOptions.getRequiredValue(ConnectionFactoryOptions.PASSWORD)).isEqualTo("secret");
-		Object result = DatabaseClient.create(ConnectionFactories.get(connectionFactoryOptions))
-			.sql(DatabaseDriver.ORACLE.getValidationQuery())
-			.map((row, metadata) -> row.get(0))
-			.first()
-			.block(Duration.ofSeconds(30));
-		assertThat(result).isEqualTo("Hello");
+		Awaitility.await().atMost(Duration.ofMinutes(1)).ignoreExceptions().untilAsserted(() -> {
+			Object result = DatabaseClient.create(ConnectionFactories.get(connectionFactoryOptions))
+				.sql(DatabaseDriver.ORACLE.getValidationQuery())
+				.map((row, metadata) -> row.get(0))
+				.first()
+				.block(Duration.ofSeconds(30));
+			assertThat(result).isEqualTo("Hello");
+		});
 	}
 
 }