[java-idp-integration-tests] 01/02: Enable consent only for tests that need it

[Tom Zeller]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=6b236ccd547bef2fa72749e3b698d1de9ae74a16

commit 6b236ccd547bef2fa72749e3b698d1de9ae74a16
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon May 22 12:12:57 2023 -0500

    Enable consent only for tests that need it
---
 .../shibboleth/idp/integration/tests/BaseIntegrationTest.java  |  5 -----
 .../integration/tests/saml1/AbstractSAML1IntegrationTest.java  |  8 ++++----
 .../integration/tests/saml2/AbstractSAML2IntegrationTest.java  | 10 ++++------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
index bf791dc..14e1e25 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -493,11 +493,6 @@ public abstract class BaseIntegrationTest {
         Assert.assertTrue(pathToPluginCLI.toFile().exists());
         pluginCLI = pathToPluginCLI.toAbsolutePath().toString();
 
-        listModules();
-        enableModule("idp.intercept.Consent");
-        listModules();
-        assertModulesAreEnabled("idp.intercept.Consent");
-
         // Copy directories from idp distribution to idp home
         copyFromIdPDistToIdPHome("metadata");
         copyFromIdPDistToIdPHome("credentials");
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/saml1/AbstractSAML1IntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/saml1/AbstractSAML1IntegrationTest.java
index f8cd1ba..23d545e 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/saml1/AbstractSAML1IntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/saml1/AbstractSAML1IntegrationTest.java
@@ -135,10 +135,10 @@ public class AbstractSAML1IntegrationTest extends BaseIntegrationTest {
      */
     @BeforeClass
     public void setUpAttributeConsent() throws IOException {
-        if (idpVersion.startsWith("3") || idpVersion.startsWith("4.0")) {
-        } else {
-            enableAttributeReleaseConsent();
-        }
+        enableModule("idp.intercept.Consent");
+        listModules();
+        assertModulesAreEnabled("idp.intercept.Consent");
+        enableAttributeReleaseConsent();
     }
 
     /**
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/saml2/AbstractSAML2IntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/saml2/AbstractSAML2IntegrationTest.java
index 2baec96..382f8f5 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/saml2/AbstractSAML2IntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/saml2/AbstractSAML2IntegrationTest.java
@@ -87,12 +87,10 @@ public abstract class AbstractSAML2IntegrationTest extends BaseIntegrationTest {
      * @throws IOException if an I/O error occurs
      */
     public void setUpAttributeConsent() throws IOException {
-        if (idpVersion.startsWith("3") || idpVersion.startsWith("4.0")) {
-            log.debug("Not enabling attribute-release consent for IdP version '{}'", idpVersion);
-        } else {
-            log.debug("Enabling attribute-release consent for IdP version '{}'", idpVersion);
-            enableAttributeReleaseConsent();
-        }
+        enableModule("idp.intercept.Consent");
+        listModules();
+        assertModulesAreEnabled("idp.intercept.Consent");
+        enableAttributeReleaseConsent();
     }
 
     /**

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