[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/metadata/resolver/impl/DOMMetada...

[noreply at shibboleth.net]

Author: putmanb
Date: Sat Jun 21 01:12:08 2014
New Revision: 3938

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3938&view=rev
Log:
Add missed call to super.initMetadataResolver() in DOM resolver.

Added:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/MockFailureFilter.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolver.java?rev=3938&r1=3937&r2=3938&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolver.java Sat Jun 21 01:12:08 2014
@@ -61,6 +61,8 @@
     
     /** {@inheritDoc} */
     protected void initMetadataResolver() throws ComponentInitializationException {
+        super.initMetadataResolver();
+        
         try {
             Unmarshaller unmarshaller = getUnmarshallerFactory().getUnmarshaller(metadataElement);
             XMLObject metadataTemp = unmarshaller.unmarshall(metadataElement);

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java?rev=3938&r1=3937&r2=3938&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java Sat Jun 21 01:12:08 2014
@@ -19,10 +19,15 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
+import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
@@ -68,4 +73,26 @@
         Assert.assertEquals(descriptor.getEntityID(), entityID, "Entity's ID does not match requested ID");
     }
     
+    @Test
+    public void testFilterFailureAndNoFailFast() throws URISyntaxException, XMLParserException, IOException, ResolverException {
+        FileInputStream fis = new FileInputStream(mdFile);
+        Document document = parserPool.parse(fis);
+        fis.close();
+        
+        try {
+            metadataProvider = new DOMMetadataResolver(document.getDocumentElement());
+            metadataProvider.setMetadataFilter(new MockFailureFilter());
+            metadataProvider.setFailFastInitialization(false);
+            metadataProvider.setRequireValidMetadata(true);
+            metadataProvider.setParserPool(parserPool);
+            metadataProvider.initialize();
+        } catch (ComponentInitializationException e) {
+            Assert.fail("DOM metadata provider init failed due to filter exception and fail fast = false");
+        }
+        
+        EntityDescriptor entity = metadataProvider.resolveSingle(new CriteriaSet(new EntityIdCriterion("https://idp.example.org")));
+        Assert.assertNull(entity);
+    }
+    
+    
 }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java?rev=3938&r1=3937&r2=3938&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java Sat Jun 21 01:12:08 2014
@@ -227,7 +227,7 @@
             metadataProvider.setParserPool(parserPool);
             metadataProvider.initialize();
         } catch (ComponentInitializationException | ResolverException e) {

[... 6 lines stripped ...]