Browse Source

Enable Oracle integration tests on Apple Silicon.

See #2264
main
Mark Paluch 2 weeks ago
parent
commit
33d054cdec
No known key found for this signature in database
GPG Key ID: 55BC6374BAA9D973
  1. 2
      spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java
  2. 7
      spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java

2
spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java

@ -23,7 +23,6 @@ import java.util.Optional; @@ -23,7 +23,6 @@ import java.util.Optional;
import javax.sql.DataSource;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@ -52,7 +51,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -52,7 +51,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
@ExtendWith(SpringExtension.class)
@ContextConfiguration
@EnabledOnClass("oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl")
@DisabledOnOs(architectures = "aarch64")
public class OracleR2dbcRepositoryIntegrationTests extends AbstractR2dbcRepositoryIntegrationTests {
@RegisterExtension public static final ExternalDatabase database = OracleTestSupport.database();

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

@ -72,11 +72,6 @@ public class OracleTestSupport { @@ -72,11 +72,6 @@ public class OracleTestSupport {
*/
public static ExternalDatabase database() {
// Disable Oracle support as there's no M1 support yet.
if (ConnectionUtils.AARCH64.equals(System.getProperty("os.arch"))) {
return ExternalDatabase.unavailable();
}
if (!ClassUtils.isPresent("oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl",
OracleTestSupport.class.getClassLoader())) {
return ExternalDatabase.unavailable();
@ -129,7 +124,7 @@ public class OracleTestSupport { @@ -129,7 +124,7 @@ public class OracleTestSupport {
if (testContainerDatabase == null) {
try {
OracleContainer container = new OracleContainer("gvenzl/oracle-free:23-slim") //
OracleContainer container = new OracleContainer("gvenzl/oracle-free:23.26.1-slim-faststart") //
.withReuse(true) //
.withStartupTimeoutSeconds(200); // the default of 60s isn't sufficient
container.start();

Loading…
Cancel
Save