[java-idp-integration-tests COMMIT] /trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegration...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 18 11:06:53 2014
New Revision: 41

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=41&view=rev
Log:
IDP-546 - new default resolver/filter, an LDAP example version, and test changes

Modified:
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java

Modified: trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java?rev=41&r1=40&r2=41&view=diff
==============================================================================
--- trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java (original)
+++ trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java Thu Dec 18 11:06:53 2014
@@ -66,7 +66,13 @@
     public final static String EMAIL_ID = "email";
 
     /** ID of eduPersonAffiliation attribute checkbox. */
-    public final static String EDU_PERSON_AFFILIATION_ID = "eduPersonAffiliation";
+    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";
@@ -239,7 +245,17 @@
         if (eduPersonAffiliation.isSelected()) {
             eduPersonAffiliation.click();
         }
-    }
+
+        final WebElement eduPersonPrincipalName = driver.findElement(By.id(EDU_PERSON_PRINCIPAL_NAME_ID));
+        if (eduPersonPrincipalName.isSelected()) {
+            eduPersonPrincipalName.click();
+        }
+
+        final WebElement uid = driver.findElement(By.id(UID_ID));
+        if (uid.isSelected()) {
+            uid.click();
+        }
+}
 
     /**
      * Select web element with id {@link #REMEMBER_CONSENT_ID}.