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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 20 01:36:51 2014
New Revision: 6747

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6747&view=rev
Log:
IDP-494 - add test for multi LDAP result set

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/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif

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=6747&r1=6746&r2=6747&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 Oct 20 01:36:51 2014
@@ -17,10 +17,8 @@
 
 package net.shibboleth.idp.attribute.resolver.dc.ldap.impl;
 
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.annotation.Nonnull;
 
@@ -193,6 +191,12 @@
         resolve(builder);
     }
 
+    @Test public void resolveMulti() throws ComponentInitializationException, ResolutionException {
+        ParameterizedExecutableSearchFilterBuilder builder =
+                new ParameterizedExecutableSearchFilterBuilder("(objectclass=inetOrgPerson)");
+        resolveMulti(builder);
+    }
+
     @Test public void resolveWithDepends() throws ComponentInitializationException, ResolutionException {
         ParameterizedExecutableSearchFilterBuilder builder =
                 new ParameterizedExecutableSearchFilterBuilder("(&(cn={principalName})(eduPersonAffiliation={affiliation[0]}))");
@@ -296,13 +300,13 @@
 
     protected void resolve(ExecutableSearchBuilder builder) throws ComponentInitializationException,
             ResolutionException {
-        LDAPDataConnector connector = createLdapDataConnector(builder, new StringAttributeValueMappingStrategy());
-        connector.initialize();
-
-        AttributeResolutionContext context =
-                TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
-                        TestSources.SP_ENTITY_ID);
-        Map<String, IdPAttribute> attrs = connector.resolve(context);
+        final LDAPDataConnector connector = createLdapDataConnector(builder, new StringAttributeValueMappingStrategy());
+        connector.initialize();
+
+        final AttributeResolutionContext context =
+                TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
+                        TestSources.SP_ENTITY_ID);
+        final Map<String, IdPAttribute> attrs = connector.resolve(context);
         Assert.assertNotNull(attrs);
         // check total attributes: uid, cn, sn, mail
         Assert.assertTrue(attrs.size() == 4);
@@ -312,22 +316,51 @@
                 .next());
         // check cn
         Assert.assertTrue(attrs.get("cn").getValues().size() == 3);
-        Set<StringAttributeValue> cn = new HashSet<StringAttributeValue>();
-        cn.add(new StringAttributeValue("Peter Principal"));
-        cn.add(new StringAttributeValue("Peter J Principal"));
-        cn.add(new StringAttributeValue("pete principal"));
-        Assert.assertEquals(cn, attrs.get("cn").getValues());
+        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")));
         // check sn
         Assert.assertTrue(attrs.get("sn").getValues().size() == 1);
         Assert.assertEquals(new StringAttributeValue("Principal"), attrs.get("sn").getValues().iterator().next());
         // check mail
         Assert.assertTrue(attrs.get("mail").getValues().size() == 2);
-        Set<StringAttributeValue> mail = new HashSet<StringAttributeValue>();
-        mail.add(new StringAttributeValue("peter.principal at shibboleth.net"));
-        mail.add(new StringAttributeValue("peterprincipal at shibboleth.net"));
-        Assert.assertEquals(mail, attrs.get("mail").getValues());
-    }
-
+        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")));
+    }
+
+    protected void resolveMulti(ExecutableSearchBuilder builder) throws ComponentInitializationException,
+            ResolutionException {

[... 46 lines stripped ...]