refactor(oracle): rename withSystemPassword to withOraclePassword

Rename method for setting system user password to better reflect its purpose and align with environment variable naming. Update tests to verify system user connection instead of granting DBA privileges.

Author: cetindogu

modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java

@@ -60,12 +60,12 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     /**
      * Password for Oracle system user (e.g. SYSTEM/SYS). Defaults to {@link #APP_USER_PASSWORD}
-     * for backwards compatibility, but can be customized independently via {@link #withSystemPassword(String)}.
+     * for backwards compatibility, but can be customized independently via {@link #withOraclePassword(String)}.
      */
-    private String oraclePassword = APP_USER_PASSWORD;
+    private String systemPassword = APP_USER_PASSWORD;
 
     /**
-     * Tracks whether {@link #withSystemPassword(String)} was called to avoid overriding
+     * Tracks whether {@link #withOraclePassword(String)} was called to avoid overriding
      * the system password when {@link #withPassword(String)} is used for the application user only.
      */
     private boolean systemPasswordExplicitlySet = false;
@@ -125,7 +125,7 @@ public String getUsername() {
     @Override
     public String getPassword() {
         // When connecting via SID we authenticate as SYSTEM. Use the dedicated system password.
-        return isUsingSid() ? oraclePassword : password;
+        return isUsingSid() ? systemPassword : password;
     }
 
     @Override
@@ -158,7 +158,7 @@ public OracleContainer withPassword(String password) {
         // Maintain backwards compatibility: if system password wasn't set explicitly,
         // align it with the application user's password.
         if (!systemPasswordExplicitlySet) {
-            this.oraclePassword = password;
+            this.systemPassword = password;
         }
         return self();
     }
@@ -167,14 +167,14 @@ public OracleContainer withPassword(String password) {
      * Sets the password for the Oracle system user (SYSTEM/SYS). This is independent from the
      * application user password set via {@link #withPassword(String)}.
      *
-     * @param oraclePassword password for SYSTEM/SYS users inside the container
+     * @param systemPassword password for SYSTEM/SYS users inside the container
      * @return this container instance
      */
-    public OracleContainer withSystemPassword(String oraclePassword) {
-        if (StringUtils.isEmpty(oraclePassword)) {
+    public OracleContainer withOraclePassword(String systemPassword) {
+        if (StringUtils.isEmpty(systemPassword)) {
             throw new IllegalArgumentException("Oracle password cannot be null or empty");
         }
-        this.oraclePassword = oraclePassword;
+        this.systemPassword = systemPassword;
         this.systemPasswordExplicitlySet = true;
         return self();
     }
@@ -220,7 +220,7 @@ public String getTestQueryString() {
     @Override
     protected void configure() {
         // Configure system user password independently from application user's password
-        withEnv("ORACLE_PASSWORD", oraclePassword);
+        withEnv("ORACLE_PASSWORD", systemPassword);
 
         // Only set ORACLE_DATABASE if different than the default.
         if (databaseName != DEFAULT_DATABASE_NAME) {

modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java

@@ -38,11 +38,15 @@ private void runTestSystemUser(OracleContainer container, String databaseName, S
         assertThat(container.getUsername()).isEqualTo(username);
         assertThat(container.getPassword()).isEqualTo(password);
 
-        //Test we can get a connection and execute a system-level command
+        //Test we can get a connection and verify current user
         container.start();
-        ResultSet resultSet = performQuery(container, "GRANT DBA TO " + username);
-        int resultSetInt = resultSet.getInt(1);
-        assertThat(resultSetInt).as("A basic system user query succeeds").isEqualTo(1);
+
+        // Verify we are connected as the system user
+        ResultSet resultSet = performQuery(container, "SELECT USER FROM DUAL");
+        String currentUser = resultSet.getString(1);
+        assertThat(currentUser)
+            .as("Connected session should run as the system user")
+            .isEqualToIgnoringCase(username);
     }
 
     @Test
@@ -116,7 +120,7 @@ public void testWithSystemPassword() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
                 .usingSid()
-                .withSystemPassword("SysP@ss1!")
+                .withOraclePassword("SysP@ss1!")
                 .withPassword("AppP@ss1!")
         ) {
             runTestSystemUser(oracle, "freepdb1", "system", "SysP@ss1!");
@@ -127,7 +131,7 @@ public void testWithSystemPassword() throws SQLException {
     public void testWithPassword() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
-                .withSystemPassword("SysP@ss2!")
+                .withOraclePassword("SysP@ss2!")
                 .withPassword("AppP@ss2!")
         ) {
             runTest(oracle, "freepdb1", "test", "AppP@ss2!");

modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java

@@ -63,12 +63,12 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     /**
      * Password for Oracle system user (e.g. SYSTEM/SYS). Defaults to {@link #APP_USER_PASSWORD}
-     * for backwards compatibility, but can be customized independently via {@link #withSystemPassword(String)}.
+     * for backwards compatibility, but can be customized independently via {@link #withOraclePassword(String)}.
      */
     private String systemPassword = APP_USER_PASSWORD;
 
     /**
-     * Tracks whether {@link #withSystemPassword(String)} was called to avoid overriding
+     * Tracks whether {@link #withOraclePassword(String)} was called to avoid overriding
      * the system password when {@link #withPassword(String)} is used for the application user only.
      */
     private boolean systemPasswordExplicitlySet = false;
@@ -176,7 +176,7 @@ public OracleContainer withPassword(String password) {
             throw new IllegalArgumentException("Password cannot be null or empty");
         }
         this.password = password;
-        // Maintain backwards compatibility: if oracle password wasn't set explicitly,
+        // Maintain backwards compatibility: if system password wasn't set explicitly,
         // align it with the application user's password.
         if (!systemPasswordExplicitlySet) {
             this.systemPassword = password;
@@ -188,14 +188,14 @@ public OracleContainer withPassword(String password) {
      * Sets the password for the Oracle system user (SYSTEM/SYS). This is independent from the
      * application user password set via {@link #withPassword(String)}.
      *
-     * @param oraclePassword password for SYSTEM/SYS users inside the container
+     * @param systemPassword password for SYSTEM/SYS users inside the container
      * @return this container instance
      */
-    public OracleContainer withSystemPassword(String oraclePassword) {
-        if (StringUtils.isEmpty(oraclePassword)) {
+    public OracleContainer withOraclePassword(String systemPassword) {
+        if (StringUtils.isEmpty(systemPassword)) {
             throw new IllegalArgumentException("Oracle password cannot be null or empty");
         }
-        this.systemPassword = oraclePassword;
+        this.systemPassword = systemPassword;
         this.systemPasswordExplicitlySet = true;
         return self();
     }

modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java

@@ -38,6 +38,8 @@ private void runTestSystemUser(OracleContainer container, String databaseName, S
         assertThat(container.getPassword()).isEqualTo(password);
 
         container.start();
+
+        // Verify we are connected as the system user
         ResultSet resultSet = performQuery(container, "SELECT USER FROM DUAL");
         String currentUser = resultSet.getString(1);
         assertThat(currentUser)
@@ -116,7 +118,7 @@ public void testSeparateSystemAndAppPasswords() throws SQLException {
         try (
             OracleContainer oracleSid = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
                 .usingSid()
-                .withSystemPassword("SysP@ss1!")
+                .withOraclePassword("SysP@ss1!")
                 .withPassword("AppP@ss1!")
         ) {
             runTestSystemUser(oracleSid, "xepdb1", "system", "SysP@ss1!");
@@ -125,7 +127,7 @@ public void testSeparateSystemAndAppPasswords() throws SQLException {
         // Non-SID mode should use application user's password
         try (
             OracleContainer oraclePdb = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
-                .withSystemPassword("SysP@ss2!")
+                .withOraclePassword("SysP@ss2!")
                 .withPassword("AppP@ss2!")
         ) {
             runTest(oraclePdb, "xepdb1", "test", "AppP@ss2!");