root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Test DatabaseDriver.ORACLE now it's available from Maven Central 

Closes gh-18274
This commit is contained in:
Andy Wilkinson 2019-09-18 17:08:18 +01:00
parent dce9d3da82
commit 9d3586d0b8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/pom.xml
View File

@ -56,6 +56,11 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.oracle.ojdbc</groupId>
<artifactId>ojdbc8</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>com.samskivert</groupId> <groupId>com.samskivert</groupId>
<artifactId>jmustache</artifactId> <artifactId>jmustache</artifactId>

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
View File

@ -45,8 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class DatabaseDriverClassNameTests { class DatabaseDriverClassNameTests {
private static final Set<DatabaseDriver> EXCLUDED_DRIVERS = Collections private static final Set<DatabaseDriver> EXCLUDED_DRIVERS = Collections
.unmodifiableSet(EnumSet.of(DatabaseDriver.UNKNOWN, DatabaseDriver.ORACLE, DatabaseDriver.DB2_AS400, .unmodifiableSet(EnumSet.of(DatabaseDriver.UNKNOWN, DatabaseDriver.DB2_AS400, DatabaseDriver.INFORMIX,
DatabaseDriver.INFORMIX, DatabaseDriver.HANA, DatabaseDriver.TERADATA, DatabaseDriver.REDSHIFT)); DatabaseDriver.HANA, DatabaseDriver.TERADATA, DatabaseDriver.REDSHIFT));
@ParameterizedTest(name = "{0} {2}") @ParameterizedTest(name = "{0} {2}")
@MethodSource @MethodSource
@ -63,6 +63,10 @@ class DatabaseDriverClassNameTests {
interfaceNames.add(name); interfaceNames.add(name);
interfaceNames.addAll(getInterfaceNames(name)); interfaceNames.addAll(getInterfaceNames(name));
} }
String superName = classReader.getSuperName();
if (superName != null) {
interfaceNames.addAll(getInterfaceNames(superName));
}
return interfaceNames; return interfaceNames;
} }