[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: Wed Sep  2 10:59:14 2015
New Revision: 7720

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7720&view=rev
Log:
An attempt to investigate using native spring to configure attribute filters

Added:
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny1.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny2.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy2.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy3.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy4.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy5.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policyAll.xml
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/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-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=7720&r1=7719&r2=7720&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	Wed Sep  2 10:59:14 2015
@@ -22,6 +22,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -50,9 +51,9 @@
 
     /** The service configuration dir. */
     private final static String SERVICE_CONFIG_DIR = "net/shibboleth/idp/attribute/filter/spring/";
-    
+
     private GenericApplicationContext testContext = null;
-    
+
     @AfterMethod public void tearDownTestContext() {
         if (null == testContext) {
             return;
@@ -70,15 +71,17 @@
      * @throws ServiceException if an error occurs loading the service
      * @throws ComponentInitializationException
      */
-    private AttributeFilter getFilter(String name) throws ServiceException, ComponentInitializationException {
-        final Resource resource = new ClassPathResource(SERVICE_CONFIG_DIR + name);
+    private AttributeFilter getFilter(String name, boolean nativeSpring) throws ServiceException,
+            ComponentInitializationException {
+        final Resource resource = new ClassPathResource(SERVICE_CONFIG_DIR + (nativeSpring ? "native/" : "") + name);
         if (null != testContext) {
             tearDownTestContext();
         }
         final GenericApplicationContext context =
                 SpringSupport.newContext(name, Collections.singletonList(resource),
-                        Collections.<BeanFactoryPostProcessor>emptyList(), Collections.<BeanPostProcessor>emptyList(),
-                        Collections.<ApplicationContextInitializer>emptyList(), null);
+                        Collections.<BeanFactoryPostProcessor> emptyList(),
+                        Collections.<BeanPostProcessor> singletonList(new IdentifiableBeanPostProcessor()),
+                        Collections.<ApplicationContextInitializer> emptyList(), null);
         testContext = context;
         final AttributeFilterServiceStrategy strategy = new AttributeFilterServiceStrategy();
         strategy.setId("ID");
@@ -111,8 +114,13 @@
     }
 
     @Test public void testPolicy2() throws ServiceException, AttributeFilterException, ComponentInitializationException {
-
-        final AttributeFilter filter = getFilter("policy2.xml");
+        testPolicy2(true);
+        testPolicy2(false);
+    }
+
+    public void testPolicy2(boolean nativeSpring) throws ServiceException, AttributeFilterException,
+            ComponentInitializationException {
+        final AttributeFilter filter = getFilter("policy2.xml", nativeSpring);
 
         AttributeFilterContext filterContext = new AttributeFilterContext();

[... 136 lines stripped ...]