From 9d3586d0b821c768be51159de0ed60ab5d6260e6 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 18 Sep 2019 17:08:18 +0100
Subject: [PATCH] Test DatabaseDriver.ORACLE now it's available from Maven
 Central

Closes gh-18274
---
 spring-boot-project/spring-boot/pom.xml                   | 5 +++++
 .../boot/jdbc/DatabaseDriverClassNameTests.java           | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot/pom.xml b/spring-boot-project/spring-boot/pom.xml
index 90483e4be4b..c55831c374d 100644
--- a/spring-boot-project/spring-boot/pom.xml
+++ b/spring-boot-project/spring-boot/pom.xml
@@ -56,6 +56,11 @@
 			<artifactId>gson</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.oracle.ojdbc</groupId>
+			<artifactId>ojdbc8</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>com.samskivert</groupId>
 			<artifactId>jmustache</artifactId>
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
index d1ae0f129e4..92272c0b0a3 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
@@ -45,8 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 class DatabaseDriverClassNameTests {
 
 	private static final Set<DatabaseDriver> EXCLUDED_DRIVERS = Collections
-			.unmodifiableSet(EnumSet.of(DatabaseDriver.UNKNOWN, DatabaseDriver.ORACLE, DatabaseDriver.DB2_AS400,
-					DatabaseDriver.INFORMIX, DatabaseDriver.HANA, DatabaseDriver.TERADATA, DatabaseDriver.REDSHIFT));
+			.unmodifiableSet(EnumSet.of(DatabaseDriver.UNKNOWN, DatabaseDriver.DB2_AS400, DatabaseDriver.INFORMIX,
+					DatabaseDriver.HANA, DatabaseDriver.TERADATA, DatabaseDriver.REDSHIFT));
 
 	@ParameterizedTest(name = "{0} {2}")
 	@MethodSource
@@ -63,6 +63,10 @@ class DatabaseDriverClassNameTests {
 			interfaceNames.add(name);
 			interfaceNames.addAll(getInterfaceNames(name));
 		}
+		String superName = classReader.getSuperName();
+		if (superName != null) {
+			interfaceNames.addAll(getInterfaceNames(superName));
+		}
 		return interfaceNames;
 	}