[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 Jul  9 06:57:27 2014
New Revision: 6252

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6252&view=rev
Log:
IDP-429 Fix tests

Modified:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceStrategy.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/SVNAndPropertiesTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service2.xml
    trunk/idp-conf/src/test/resources/c14n/attribute-resolver-legacy.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java

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=6252&r1=6251&r2=6252&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 Jul  9 06:57:27 2014
@@ -28,6 +28,7 @@
 import net.shibboleth.idp.attribute.filter.AttributeFilterException;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
 import net.shibboleth.idp.service.ServiceException;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.support.GenericApplicationContext;
@@ -56,12 +57,17 @@
      * @param resources configuration resources
      * @return the service
      * @throws ServiceException if an error occurs loading the service
+     * @throws ComponentInitializationException 
      */
-    public static AttributeFilter getFilter(String name) throws ServiceException {
+    private static AttributeFilter getFilter(String name) throws ServiceException, ComponentInitializationException {
         final Resource resource = new ClassPathResource(SERVICE_CONFIG_DIR + name);
-        final GenericApplicationContext context = SpringSupport.newContext(name, Collections.singletonList(resource),
-                Collections.<BeanPostProcessor>emptyList(), null);
-        return context.getBean(AttributeFilter.class);
+        final GenericApplicationContext context =
+                SpringSupport.newContext(name, Collections.singletonList(resource),
+                        Collections.<BeanPostProcessor> emptyList(), null);
+        final AttributeFilterServiceStrategy strategy = new AttributeFilterServiceStrategy();
+        strategy.setId("ID");
+        strategy.initialize();
+        return (AttributeFilter) strategy.apply(context);
     }
 
     @BeforeClass protected void setUp() throws Exception {
@@ -88,7 +94,7 @@
         attributesToBeFiltered.put(affiliation.getId(), affiliation);
     }
 
-    @Test public void testPolicy2() throws ServiceException, AttributeFilterException {
+    @Test public void testPolicy2() throws ServiceException, AttributeFilterException, ComponentInitializationException {
 
         final AttributeFilter filter = getFilter("policy2.xml");
 
@@ -116,7 +122,7 @@
 
     }
 
-    @Test public void testPolicy3() throws ServiceException, AttributeFilterException {
+    @Test public void testPolicy3() throws ServiceException, AttributeFilterException, ComponentInitializationException {
 
         final AttributeFilter filter = getFilter("policy3.xml");
 
@@ -143,7 +149,7 @@
         Assert.assertNull(filteredAttributes.get("affiliation"));
     }
 
-    @Test public void testPolicy4() throws ServiceException, AttributeFilterException {
+    @Test public void testPolicy4() throws ServiceException, AttributeFilterException, ComponentInitializationException {
 
         final AttributeFilter filter = getFilter("policy4.xml");
 


[... 391 lines stripped ...]