[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src/test: java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jan 26 19:26:39 2015
New Revision: 7284

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7284&view=rev
Log:
IDP-573 Add empty attribute value test for LDAP and RDBMS data connectors.

Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsData.sql
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsStore.sql

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java?rev=7284&r1=7283&r2=7284&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java Mon Jan 26 19:26:39 2015
@@ -22,9 +22,12 @@
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.idp.attribute.EmptyAttributeValue;
+import net.shibboleth.idp.attribute.EmptyAttributeValue.EmptyType;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.attribute.resolver.DataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.dc.impl.ExecutableSearchBuilder;
@@ -341,24 +344,27 @@
         // check total attributes: uid, cn, sn, mail
         Assert.assertTrue(attrs.size() == 4);
         // check uid
-        Assert.assertTrue(attrs.get("uid").getValues().size() == 2);
+        Assert.assertTrue(attrs.get("uid").getValues().size() == 3);
         Assert.assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue(TestSources.PRINCIPAL_ID)));
         Assert.assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue("PAUL_THE_PRINCIPAL")));
+        Assert.assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue("PHILIP_THE_PRINCIPAL")));
         // check cn
-        Assert.assertTrue(attrs.get("cn").getValues().size() == 4);
+        Assert.assertTrue(attrs.get("cn").getValues().size() == 5);
         Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter Principal")));
         Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter J Principal")));
         Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("pete principal")));
         Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Paul Principal")));
+        Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Philip Principal")));
         // check sn
-        Assert.assertTrue(attrs.get("sn").getValues().size() == 2);
+        Assert.assertTrue(attrs.get("sn").getValues().size() == 3);
         Assert.assertTrue(attrs.get("sn").getValues().contains(new StringAttributeValue("Principal")));
         // check mail
-        Assert.assertTrue(attrs.get("mail").getValues().size() == 4);
+        Assert.assertTrue(attrs.get("mail").getValues().size() == 5);
         Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peter.principal at shibboleth.net")));
         Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peterprincipal at shibboleth.net")));
         Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("paul.principal at shibboleth.net")));
         Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("paulprincipal at shibboleth.net")));
+        Assert.assertTrue(attrs.get("mail").getValues().contains(EmptyAttributeValue.ZERO_LENGTH));
     }
     
     @Test(expectedExceptions = ResolutionException.class) public void resolveNoFilter()
@@ -440,4 +446,34 @@
         Assert.assertEquals(cache.iterator().next(), optional);
     }
     
+    /** See IDP-573. */
+    @Test public void resolveEmptyAttribute() throws ComponentInitializationException, ResolutionException {
+        ParameterizedExecutableSearchFilterBuilder builder =

[... 133 lines stripped ...]