diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java index e54188641..5c4883ba7 100644 --- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java +++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java @@ -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; @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(); diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java index 85487e412..9ddd6d44c 100644 --- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java +++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java @@ -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 { 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();