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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Nov  8 06:11:48 2014
New Revision: 6865

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6865&view=rev
Log:
Extra tests for multiple file input

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/MultiSourceFileTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntity2.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/serviceBeans.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java?rev=6865&r1=6864&r2=6865&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java Sat Nov  8 06:11:48 2014
@@ -105,19 +105,25 @@
     @AfterTest public void teardownDataConnectors() {
         directoryServer.shutDown(true);
     }
-
-    @Test public void one() throws ComponentInitializationException, ServiceException, ResolutionException {
-
+    
+    private ReloadableService<AttributeResolver> getResolver(String file) {
         GenericApplicationContext context = new GenericApplicationContext();
         context.setDisplayName("ApplicationContext: " + AttributeResolverTest.class);
 
         SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
                 new SchemaTypeAwareXMLBeanDefinitionReader(context);
 
-        beanDefinitionReader.loadBeanDefinitions("net/shibboleth/idp/attribute/resolver/spring/service.xml");
+        beanDefinitionReader.loadBeanDefinitions(file);
         context.refresh();
 
-        final ReloadableService<AttributeResolver> attributeResolverService = context.getBean(ReloadableService.class);
+        return context.getBean(ReloadableService.class);
+
+        
+    }
+
+    @Test public void one() throws ComponentInitializationException, ServiceException, ResolutionException {
+
+        final ReloadableService<AttributeResolver> attributeResolverService = getResolver("net/shibboleth/idp/attribute/resolver/spring/service.xml");
 
         attributeResolverService.initialize();
 
@@ -249,16 +255,7 @@
 
     @Test public void id() throws ComponentInitializationException, ServiceException, ResolutionException {
 
-        GenericApplicationContext context = new GenericApplicationContext();
-        context.setDisplayName("ApplicationContext: " + AttributeResolverTest.class);
-
-        SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
-                new SchemaTypeAwareXMLBeanDefinitionReader(context);
-
-        beanDefinitionReader.loadBeanDefinitions("net/shibboleth/idp/attribute/resolver/spring/service2.xml");
-        context.refresh();
-
-        final ReloadableService<AttributeResolver> attributeResolverService = context.getBean(ReloadableService.class);
+        final ReloadableService<AttributeResolver> attributeResolverService = getResolver("net/shibboleth/idp/attribute/resolver/spring/service2.xml");
 
         attributeResolverService.initialize();
 
@@ -370,6 +367,28 @@
         Assert.assertTrue(resolutionContext.getResolvedIdPAttributes().isEmpty());
     }
     
+    @Test(enabled=false) public void multiFile() throws ResolutionException {
+        final ReloadableService<AttributeResolver> attributeResolverService = getResolver("net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml");
+        
+        final AttributeResolutionContext resolutionContext =
+                TestSources.createResolutionContext("PETER_THE_PRINCIPAL", "issuer", "recipient");
+
+        ServiceableComponent<AttributeResolver> serviceableComponent = null;
+        try {
+            serviceableComponent = attributeResolverService.getServiceableComponent();
+
+            final AttributeResolver resolver = serviceableComponent.getComponent();
+            Assert.assertEquals(resolver.getId(), "MultiFileResolver");
+            resolver.resolveAttributes(resolutionContext);
+        } finally {

[... 12 lines stripped ...]