[java-idp-integration-tests] 01/02: IDP-465 - Fix test without new condition

[Tom Zeller]

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

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

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

commit 60d6bca0bad2c133b33c95a776f14d405562f55e
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Oct 3 17:11:10 2018 -0500

    IDP-465 - Fix test without new condition
    
    The test without a consent attribute query condition bean was failing
    when run after other tests where the condition bean was set. Ideally,
    the test would be in a new class to guarantee a clean idp.home.
    
    https://issues.shibboleth.net/jira/browse/IDP-465
---
 .../idp/test/saml2/SAML2AttributeQueryIntegrationTest.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/test/saml2/SAML2AttributeQueryIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/saml2/SAML2AttributeQueryIntegrationTest.java
index 6f10fdd..89ad2b1 100644
--- a/src/test/java/net/shibboleth/idp/test/saml2/SAML2AttributeQueryIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/saml2/SAML2AttributeQueryIntegrationTest.java
@@ -800,9 +800,12 @@ public class SAML2AttributeQueryIntegrationTest extends AbstractSAML2Integration
 
         // remove condition from configuration, simulate an upgrade
         final Path pathToConsentInterceptConfigXML = Paths.get("conf", "intercept", "consent-intercept-config.xml");
-        final String oldText =
-                "<bean id=\"shibboleth.consent.AttributeQuery.Condition\" parent=\"shibboleth.Conditions.FALSE\" />";
-        replaceIdPHomeFile(pathToConsentInterceptConfigXML, oldText, "");
+        replaceIdPHomeFile(pathToConsentInterceptConfigXML,
+                "<bean id=\"shibboleth.consent.AttributeQuery.Condition\" parent=\"shibboleth.Conditions.FALSE\" />",
+                "");
+        replaceIdPHomeFile(pathToConsentInterceptConfigXML,
+                "<bean id=\"shibboleth.consent.AttributeQuery.Condition\" parent=\"shibboleth.Conditions.TRUE\" />",
+                "");
 
         enableConsentStorageService();
 

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