[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-spring/src/test: java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Nov 25 12:38:30 2014
New Revision: 7011

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7011&view=rev
Log:
Add test for permitAny="true"

Added:
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policyAll.xml   (with props)
Modified:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java?rev=7011&r1=7010&r2=7011&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java Tue Nov 25 12:38:30 2014
@@ -161,6 +161,34 @@
         common45("policy5.xml");
     }
 
+    @Test public void testAll() throws ServiceException, AttributeFilterException, ComponentInitializationException {
+
+        final AttributeFilter filter = getFilter("policyAll.xml");
+
+        AttributeFilterContext filterContext = new AttributeFilterContext();
+        filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
+        filter.filterAttributes(filterContext);
+
+        Map<String, IdPAttribute> filteredAttributes = filterContext.getFilteredIdPAttributes();
+
+        Assert.assertEquals(filteredAttributes.size(), 1);
+
+        Assert.assertNull(filteredAttributes.get("firstName"));
+
+        Assert.assertNull(filteredAttributes.get("lastName"));
+
+        Assert.assertEquals(filteredAttributes.get("email").getValues().size(), 2);
+
+        Assert.assertTrue(filteredAttributes.get("email").getValues()
+                .contains(new StringAttributeValue("jsmith at example.edu")));
+
+        Assert.assertTrue(filteredAttributes.get("email").getValues()
+                .contains(new StringAttributeValue("john.smith at example.edu")));
+
+        Assert.assertNull(filteredAttributes.get("affiliation"));
+    }
+
+
     private void common45(String file) throws ServiceException, AttributeFilterException,
             ComponentInitializationException {
 

Modified: trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml?rev=7011&r1=7010&r2=7011&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml (original)
+++ trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml Tue Nov 25 12:38:30 2014
@@ -6,7 +6,6 @@
         xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
                             urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
 
-    <!-- Release affiliation to anyone in the InCommon group -->
     <afp:AttributeFilterPolicy >
         <afp:PolicyRequirementRule xsi:type="basic:ANY"/>