Browse Source

Polishing.

Align Oracle container versions for testing.

See #1179
pull/1188/head
Mark Paluch 4 years ago
parent
commit
71cad5ff2c
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
  1. 2
      spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/ExternalDatabase.java
  2. 4
      spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java

2
spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/ExternalDatabase.java

@ -86,7 +86,7 @@ public abstract class ExternalDatabase implements BeforeAllCallback {
if (!checkValidity()) { if (!checkValidity()) {
throw new TestAbortedException( throw new TestAbortedException(
String.format("Cannot connect to %s:%d. Skipping tests.", getHostname(), getPort())); String.format("Cannot connect to %s. Skipping tests.", this));
} }
} }

4
spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java

@ -125,12 +125,12 @@ public class OracleTestSupport {
if (testContainerDatabase == null) { if (testContainerDatabase == null) {
try { try {
OracleContainer container = new OracleContainer("springci/spring-data-oracle-xe-prebuild:18.4.0") OracleContainer container = new OracleContainer("gvenzl/oracle-xe:18.4.0-slim")
.withReuse(true); .withReuse(true);
container.start(); container.start();
testContainerDatabase = ProvidedDatabase.builder(container) // testContainerDatabase = ProvidedDatabase.builder(container) //
.database("XEPDB1").build(); .database(container.getDatabaseName()).build();
DataSource dataSource = createDataSource(testContainerDatabase); DataSource dataSource = createDataSource(testContainerDatabase);

Loading…
Cancel
Save