[Misc] Ensure to be able to use Oracle image for docker test

* Set the missing instructions for allowing to use our custom image * Fix the username since TC does not allow to use sys/system user
xwiki · Mar 30, 2022 · e677893 · e677893
1 parent e675063
commit e677893
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...c/main/java/org/xwiki/test/docker/internal/junit5/database/DatabaseContainerExecutor.java b/...c/main/java/org/xwiki/test/docker/internal/junit5/database/DatabaseContainerExecutor.java
@@ -31,6 +31,7 @@
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 import org.xwiki.test.docker.internal.junit5.AbstractContainerExecutor;
 import org.xwiki.test.docker.junit5.TestConfiguration;
 import org.xwiki.test.junit5.RuntimeUtils;
@@ -248,14 +249,17 @@ private void mountDatabaseDataIfNeeded(JdbcDatabaseContainer<?> databaseContaine
     private void startOracleContainer(TestConfiguration testConfiguration) throws Exception
     {
         JdbcDatabaseContainer<?> databaseContainer;
+        String oracleImageFullName;
         if (testConfiguration.getDatabaseTag() != null) {
-            databaseContainer = new OracleContainer(String.format("xwiki/oracle-database:%s",
-                testConfiguration.getDatabaseTag()));
+            oracleImageFullName = String.format("xwiki/oracle-database:%s", testConfiguration.getDatabaseTag());
         } else {
-            databaseContainer = new OracleContainer("xwiki/oracle-database");
+            oracleImageFullName = "xwiki/oracle-database";
         }
+        DockerImageName oracleImage = DockerImageName.parse(oracleImageFullName)
+            .asCompatibleSubstituteFor("gvenzl/oracle-xe");
+        databaseContainer = new OracleContainer(oracleImage);
         databaseContainer
-            .withUsername("system")
+            .withUsername("oracle")
             .withPassword("oracle");
 
         startDatabaseContainer(databaseContainer, 1521, testConfiguration);