[java-idp-integration-tests] 02/02: Updates for new defaults in IdP 4.3

[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=1227fa29188875cc107b99b2b4149178e27b6e12

commit 1227fa29188875cc107b99b2b4149178e27b6e12
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 17 11:58:09 2022 -0500

    Updates for new defaults in IdP 4.3
---
 .../shibboleth/idp/integration/tests/BaseIntegrationTest.java  |  8 ++++++--
 .../integration/tests/saml1/AbstractSAML1IntegrationTest.java  | 10 +++++-----
 2 files changed, 11 insertions(+), 7 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 f44ad6f..3e0a90c 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -1503,8 +1503,12 @@ public abstract class BaseIntegrationTest
 
     public void enableAttributeReleaseConsent() throws IOException {
         final Path pathToRelyingPartyXML = Paths.get("conf", "relying-party.xml");
-
-        final String oldText = "<bean parent=\"SAML2.SSO\" />";
+        String oldText;
+        if (idpVersion.startsWith("4.1") || idpVersion.startsWith("4.2")) {
+            oldText = "<bean parent=\"SAML2.SSO\" />";
+        } else {
+            oldText = "<ref bean=\"SAML2.SSO\" />";
+        }
         final String newText = "<bean parent=\"SAML2.SSO\" p:postAuthenticationFlows=\"attribute-release\" />";
         replaceIdPHomeFile(pathToRelyingPartyXML, oldText, newText);
     }
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 f0616c8..be4afb0 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
@@ -104,9 +104,11 @@ public class AbstractSAML1IntegrationTest extends BaseIntegrationTest {
         final StringBuilder toUncomment = new StringBuilder();
         toUncomment.append("\\<\\!--\\s+");
         if (idpVersion.startsWith("3") || idpVersion.startsWith("4.0")) {
-        toUncomment.append("<bean parent=\"Shibboleth.SSO\" p:postAuthenticationFlows=\"attribute-release\" />");
+            toUncomment.append("<bean parent=\"Shibboleth.SSO\" p:postAuthenticationFlows=\"attribute-release\" />");
+        } else if (idpVersion.startsWith("4.1") || idpVersion.startsWith("4.2")) {
+            toUncomment.append("<bean parent=\"Shibboleth.SSO\" />");
         } else {
-            toUncomment.append("<bean parent=\"Shibboleth.SSO\" />");    
+            toUncomment.append("<ref bean=\"Shibboleth.SSO\" />");
         }
         toUncomment.append("\\s+");
         toUncomment.append("<ref bean=\"SAML1.AttributeQuery\" />");
@@ -115,7 +117,7 @@ public class AbstractSAML1IntegrationTest extends BaseIntegrationTest {
         toUncomment.append("\\s+--\\>");
 
         final StringBuilder uncommented = new StringBuilder();
-        uncommented.append("<bean parent=\"Shibboleth.SSO\" p:postAuthenticationFlows=\"attribute-release\" />");
+        uncommented.append("<bean parent=\"Shibboleth.SSO\" p:includeAttributeStatement=\"true\" p:postAuthenticationFlows=\"attribute-release\" />");
         uncommented.append(System.lineSeparator());
         uncommented.append("<ref bean=\"SAML1.AttributeQuery\" />");
         uncommented.append(System.lineSeparator());
@@ -153,8 +155,6 @@ public class AbstractSAML1IntegrationTest extends BaseIntegrationTest {
             enableSAML1Profiles();
         }
 
-        enableCustomRelyingPartyConfiguration();
-
         startServer();
 
         startFlow();

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