From e6fb0b8215a0f415766baab6c32d3005b40692c1 Mon Sep 17 00:00:00 2001 From: Mickael Jeanroy Date: Mon, 16 Oct 2023 22:03:07 +0200 Subject: [PATCH] tests: specify oracle-xe version --- .../dbunit/core/jdbc/AutoDetectForeignKeyManagerTest.java | 4 ++-- .../dbunit/core/jdbc/OracleForeignKeyManagerTest.java | 4 ++-- .../mjeanroy/dbunit/it/jupiter/DbUnitDbProductITest.java | 4 ++-- .../mjeanroy/dbunit/tests/utils/TestContainersImages.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/github/mjeanroy/dbunit/core/jdbc/AutoDetectForeignKeyManagerTest.java b/src/test/java/com/github/mjeanroy/dbunit/core/jdbc/AutoDetectForeignKeyManagerTest.java index 0605af67..127afc77 100644 --- a/src/test/java/com/github/mjeanroy/dbunit/core/jdbc/AutoDetectForeignKeyManagerTest.java +++ b/src/test/java/com/github/mjeanroy/dbunit/core/jdbc/AutoDetectForeignKeyManagerTest.java @@ -32,7 +32,7 @@ import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.MARIADB_10; import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.MSSQL_2017; import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.MYSQL_57; -import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.ORACLE; +import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.ORACLE_21; import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.POSTGRES_13; class AutoDetectForeignKeyManagerTest { @@ -86,7 +86,7 @@ class AutoDetectMsSQLForeignKeyManagerTest extends BaseAutoAutoDetectForeignKeyM matches = "aarch64", disabledReason = "Oracle Container does not work on Apple M1" ) - @TestContainersTest(image = ORACLE, resolveConnection = true) + @TestContainersTest(image = ORACLE_21, resolveConnection = true) class AutoDetectOracleForeignKeyManagerTest extends BaseAutoAutoDetectForeignKeyManagerTest { } } diff --git a/src/test/java/com/github/mjeanroy/dbunit/core/jdbc/OracleForeignKeyManagerTest.java b/src/test/java/com/github/mjeanroy/dbunit/core/jdbc/OracleForeignKeyManagerTest.java index d4535914..5e8d728e 100644 --- a/src/test/java/com/github/mjeanroy/dbunit/core/jdbc/OracleForeignKeyManagerTest.java +++ b/src/test/java/com/github/mjeanroy/dbunit/core/jdbc/OracleForeignKeyManagerTest.java @@ -27,14 +27,14 @@ import com.github.mjeanroy.dbunit.tests.jupiter.TestContainersTest; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.ORACLE; +import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.ORACLE_21; @DisabledIfSystemProperty( named = "os.arch", matches = "aarch64", disabledReason = "Oracle Container does not work on Apple M1" ) -@TestContainersTest(image = ORACLE, resolveConnection = true) +@TestContainersTest(image = ORACLE_21, resolveConnection = true) class OracleForeignKeyManagerTest extends AbstractForeignKeyManagerTest { @Override diff --git a/src/test/java/com/github/mjeanroy/dbunit/it/jupiter/DbUnitDbProductITest.java b/src/test/java/com/github/mjeanroy/dbunit/it/jupiter/DbUnitDbProductITest.java index cbbbf723..8f647a78 100644 --- a/src/test/java/com/github/mjeanroy/dbunit/it/jupiter/DbUnitDbProductITest.java +++ b/src/test/java/com/github/mjeanroy/dbunit/it/jupiter/DbUnitDbProductITest.java @@ -54,7 +54,7 @@ import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.MSSQL_2017; import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.MYSQL_57; import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.MYSQL_8; -import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.ORACLE; +import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.ORACLE_21; import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.POSTGRES_12; import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.POSTGRES_13; import static com.github.mjeanroy.dbunit.tests.utils.TestContainersImages.POSTGRES_14; @@ -161,7 +161,7 @@ class MsSQL extends AbstractDbUnitDbProductITest { matches = "aarch64", disabledReason = "Oracle Container does not work on Apple M1" ) - @TestContainersTest(image = ORACLE) + @TestContainersTest(image = ORACLE_21) @DbUnitTestContainersTest @DbUnitConfig(fkManagers = OracleForeignKeyManager.class) @Nested diff --git a/src/test/java/com/github/mjeanroy/dbunit/tests/utils/TestContainersImages.java b/src/test/java/com/github/mjeanroy/dbunit/tests/utils/TestContainersImages.java index a0b076cd..de119360 100644 --- a/src/test/java/com/github/mjeanroy/dbunit/tests/utils/TestContainersImages.java +++ b/src/test/java/com/github/mjeanroy/dbunit/tests/utils/TestContainersImages.java @@ -37,5 +37,5 @@ private TestContainersImages() { public static final String POSTGRES_14 = "postgres:14-alpine"; public static final String POSTGRES_15 = "postgres:15-alpine"; public static final String MSSQL_2017 = "mcr.microsoft.com/mssql/server:2017-latest"; - public static final String ORACLE = "gvenzl/oracle-xe:21-slim-faststart"; + public static final String ORACLE_21 = "gvenzl/oracle-xe:21-slim-faststart"; }