[java-idp-integration-tests] 05/05: Move TLS keystore password property to base class

Codeberg noreply at shibboleth.net
Fri Nov 14 22:15:24 UTC 2025


This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-integration-tests/commit/47dc5ae82fd208aecca8677695b03a78f9830352

commit 47dc5ae82fd208aecca8677695b03a78f9830352
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Nov 10 16:47:58 2025 -0600

    Move TLS keystore password property to base class
---
 src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java    | 3 +++
 .../java/net/shibboleth/idp/integration/tests/oidc/RPContainer.java | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java b/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java
index 9d32f05..bbe18fc 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java
@@ -252,6 +252,9 @@ public abstract class BaseTest {
     /** Name of form input element to submit form. */
     public final static String SUBMIT_FORM_INPUT_NAME = "_eventId_proceed";
 
+    /** Environment variable containing TLS keystore password. */
+    public final static String KEYSTORE_PASSWORD_ENV_VAR = "SHIB_TESTS_OP_TLS_PWD";
+
     /** IdP XML security manager value before and after this test. */
     @NonnullAfterInit protected String defaultIdpXMLSecurityManager;
 
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/oidc/RPContainer.java b/src/test/java/net/shibboleth/idp/integration/tests/oidc/RPContainer.java
index ef15a61..8834cf5 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/oidc/RPContainer.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/oidc/RPContainer.java
@@ -32,6 +32,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.MountableFile;
 
+import net.shibboleth.idp.integration.tests.BaseTest;
 import net.shibboleth.idp.integration.tests.util.CertificateHelper;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
@@ -108,9 +109,6 @@ public class RPContainer extends AbstractIdentifiableInitializableComponent impl
     @NonnullAfterInit
     private Path pathToKeyStore;
 
-    /** Environment variable containing TLS keystore password. */
-    final static String keyStorePasswordEnvVar = "SHIB_TESTS_OP_TLS_PWD";
-
     /**
      * Path to RP directory.
      * 
@@ -201,7 +199,7 @@ public class RPContainer extends AbstractIdentifiableInitializableComponent impl
             throw new ComponentInitializationException("Path to keystore cannot be null");
         }
         
-        final String keyStorePassword = System.getenv(keyStorePasswordEnvVar);
+        final String keyStorePassword = System.getenv(BaseTest.KEYSTORE_PASSWORD_ENV_VAR);
         if (keyStorePassword == null) {
             throw new ComponentInitializationException("Keystore password environment variable not set");
         }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list