[java-idp-integration-tests COMMIT] in /trunk/src/test: conf/relying-party-with-consent.xml java/net/shibboleth/idp/t...

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Dec 21 00:50:25 2014
New Revision: 45

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=45&view=rev
Log:
Rework integration tests again for default consent settings, add attr statement to SAML 1 flow.

Added:
    trunk/src/test/java/net/shibboleth/idp/test/saml1/AbstractSAML1UnsolicitedSSOIntegrationTest.java   (with props)
Modified:
    trunk/src/test/conf/relying-party-with-consent.xml
    trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
    trunk/src/test/java/net/shibboleth/idp/test/saml1/SAML1UnsolicitedSSOIntegrationTest.java
    trunk/src/test/java/net/shibboleth/idp/test/saml2/AbstractSAML2UnsolicitedSSOIntegrationTest.java
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationTest.java
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOPerAttributeConsentIntegrationTest.java
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOTermsOfUseIntegrationTest.java

Modified: trunk/src/test/conf/relying-party-with-consent.xml
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/conf/relying-party-with-consent.xml?rev=45&r1=44&r2=45&view=diff
==============================================================================
--- trunk/src/test/conf/relying-party-with-consent.xml (original)
+++ trunk/src/test/conf/relying-party-with-consent.xml Sun Dec 21 00:50:25 2014
@@ -34,7 +34,7 @@
     <bean id="shibboleth.DefaultRelyingParty" parent="RelyingParty">
         <property name="profileConfigurations">
             <list>
-                <bean parent="Shibboleth.SSO" p:postAuthenticationFlows="attribute-release" />
+                <bean parent="Shibboleth.SSO" p:includeAttributeStatement="true" p:postAuthenticationFlows="attribute-release" />
                 <ref bean="SAML1.AttributeQuery" />
                 <ref bean="SAML1.ArtifactResolution" />
                 <bean parent="SAML2.SSO" p:postAuthenticationFlows="#{ {'terms-of-use', 'attribute-release'} }" />

Modified: trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java?rev=45&r1=44&r2=45&view=diff
==============================================================================
--- trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java (original)
+++ trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java Sun Dec 21 00:50:25 2014
@@ -34,6 +34,15 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.firefox.FirefoxProfile;
+import org.openqa.selenium.firefox.internal.ProfilesIni;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.WebDriverWait;
 import org.opensaml.core.config.InitializationException;
 import org.opensaml.core.config.InitializationService;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -61,6 +70,42 @@
     /** IdP XML security manager property value for this test. */
     @Nonnull public final static String IDP_XML_SECURITY_MANAGER_PROP_VALUE = "org.apache.xerces.util.SecurityManager";
 
+    /** Property value of consent flows to enable. */
+    public final static String ENABLE_CONSENT_FLOW_PROPERTY_VALUE = "terms-of-use|attribute-release";
+
+    /** Title of terms of use page. */
+    public final static String TERMS_OF_USE_PAGE_TITLE = "Example Terms of Use";
+
+    /** Title of attribute release page. */
+    public final static String ATTRIBUTE_RELEASE_PAGE_TITLE = "Information Release";
+
+    /** ID of email attribute checkbox. */
+    public final static String EMAIL_ID = "mail";
+
+    /** ID of eduPersonAffiliation attribute checkbox. */
+    public final static String EDU_PERSON_AFFILIATION_ID = "eduPersonScopedAffiliation";
+
+    /** ID of uid attribute checkbox. */
+    public final static String UID_ID = "uid";
+
+    /** ID of eduPersonAffiliation attribute checkbox. */
+    public final static String EDU_PERSON_PRINCIPAL_NAME_ID = "eduPersonPrincipalName";
+
+    /** ID of radio button to not remember consent. */
+    public final static String DO_NOT_REMEMBER_CONSENT_ID = "_shib_idp_doNotRememberConsent";
+
+    /** ID of radio button to remember consent. */
+    public final static String REMEMBER_CONSENT_ID = "_shib_idp_rememberConsent";
+
+    /** ID of radio button for global consent. */
+    public final static String GLOBAL_CONSENT_ID = "_shib_idp_globalConsent";
+
+    /** Name of form input element containing consent IDs. */
+    public final static String CONSENT_IDS_INPUT_NAME = "_shib_idp_consentIds";
+
+    /** Name of form input element to submit form. */

[... 629 lines stripped ...]