From d5f49b19abb2db1ca0e3b8ea2de926d1c46e8e8b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Thu, 18 Mar 2021 09:30:02 +0100
Subject: [PATCH] Enable Oracle integration tests.

Closes #560
---
 pom.xml                                                |  9 +++++++--
 .../data/r2dbc/testing/OracleTestSupport.java          | 10 ++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b95c9cd..4e43c4dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,6 +320,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>4.0.3</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -464,7 +471,6 @@
 		<profile>
 			<id>java11</id>
 
-			<!-- enable once oracle-r2db is available from Maven Central
 			<dependencies>
 				<dependency>
 					<groupId>com.oracle.database.r2dbc</groupId>
@@ -474,7 +480,6 @@
 				</dependency>
 			</dependencies>
 
-			-->
 		</profile>
 	</profiles>
 
diff --git a/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java
index 2997fb7b..66b0b0e3 100644
--- a/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java
+++ b/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java
@@ -24,7 +24,10 @@ import java.util.stream.Stream;
 
 import javax.sql.DataSource;
 
+import org.awaitility.Awaitility;
+
 import org.springframework.data.r2dbc.testing.ExternalDatabase.ProvidedDatabase;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.util.ClassUtils;
 
@@ -119,6 +122,13 @@ public class OracleTestSupport {
 
 				testContainerDatabase = ProvidedDatabase.builder(container) //
 						.database("XEPDB1").build();
+
+				DataSource dataSource = createDataSource(testContainerDatabase);
+
+				Awaitility.await().ignoreExceptions().until(() -> {
+					new JdbcTemplate(dataSource).queryForList("SELECT 'Hello, Oracle' FROM sys.dual");
+					return true;
+				});
 			} catch (IllegalStateException ise) {
 				// docker not available.
 				testContainerDatabase = ExternalDatabase.unavailable();