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

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jul 13 13:29:57 2014
New Revision: 6284

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6284&view=rev
Log:
IDP-283 Better tests for AFC.  Tests for DenyRules and Permit/Deny Rule reference

Added:
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny1.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny2.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy5.xml
Modified:
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java

Modified: trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java?rev=6284&r1=6283&r2=6284&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java (original)
+++ trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java Sun Jul 13 13:29:57 2014
@@ -21,6 +21,8 @@
 
 import net.shibboleth.idp.attribute.IdPAttribute;
 
+import org.opensaml.messaging.context.navigate.ChildContextLookup;
+import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -167,4 +169,36 @@
         Assert.assertNotNull(context.getFilteredIdPAttributes());
         Assert.assertTrue(context.getFilteredIdPAttributes().isEmpty());
     }
+
+    @Test public void fields() {
+        AttributeFilterContext context = new AttributeFilterContext();
+        Assert.assertNull(context.getAttributeIssuerID());
+        Assert.assertNull(context.getAttributeRecipientID());
+        Assert.assertNull(context.getPrincipal());
+        Assert.assertNull(context.getPrincipalAuthenticationMethod());
+
+        context.setAttributeIssuerID("aiid");
+        Assert.assertEquals(context.getAttributeIssuerID(), "aiid");
+
+        context.setAttributeRecipientID("arid");
+        Assert.assertEquals(context.getAttributeRecipientID(), "arid");
+
+        context.setPrincipal("princ");
+        Assert.assertEquals(context.getPrincipal(), "princ");
+
+        context.setPrincipalAuthenticationMethod("princam");
+        Assert.assertEquals(context.getPrincipalAuthenticationMethod(), "princam");
+
+    }
+
+    @Test public void strategies() {
+        AttributeFilterContext context = new AttributeFilterContext();
+        Assert.assertNull(context.getRequesterMetadataContext());
+
+        final SAMLMetadataContext mas = context.getSubcontext(SAMLMetadataContext.class, true);
+        context.setRequesterMetadataContextLookupStrategy(new ChildContextLookup<AttributeFilterContext, SAMLMetadataContext>(
+                SAMLMetadataContext.class));
+
+        Assert.assertSame(context.getRequesterMetadataContext(), mas);
+    }
 }

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=6284&r1=6283&r2=6284&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 Sun Jul 13 13:29:57 2014
@@ -57,7 +57,7 @@
      * @param resources configuration resources
      * @return the service
      * @throws ServiceException if an error occurs loading the service
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException
      */
     private static AttributeFilter getFilter(String name) throws ServiceException, ComponentInitializationException {
         final Resource resource = new ClassPathResource(SERVICE_CONFIG_DIR + name);
@@ -151,7 +151,18 @@
 
     @Test public void testPolicy4() throws ServiceException, AttributeFilterException, ComponentInitializationException {
 
-        final AttributeFilter filter = getFilter("policy4.xml");
+        common45("policy4.xml");
+    }
+
+    @Test public void testPolicy5() throws ServiceException, AttributeFilterException, ComponentInitializationException {
+
+        common45("policy5.xml");
+    }
+
+    private void common45(String file) throws ServiceException, AttributeFilterException,

[... 46 lines stripped ...]