[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/test: java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Dec 10 15:58:21 2014
New Revision: 7063

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7063&view=rev
Log:
IDP-516: Parser unit tests.

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signatureValidationRefs-beans.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signatureValidationRefs.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java?rev=7063&r1=7062&r2=7063&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java Wed Dec 10 15:58:21 2014
@@ -23,8 +23,10 @@
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
+import org.opensaml.saml.metadata.resolver.filter.impl.SignatureValidationFilter;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.context.ApplicationContext;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -98,6 +100,24 @@
         Assert.assertTrue(result.iterator().hasNext());
         Assert.assertEquals(Sets.newHashSet(result).size(), 1);
     }
+    
+    @Test public void optionalFilterRefs() throws IOException {
+        ApplicationContext context = 
+                getApplicationContext("optionalFilterRefs", "filter/signatureValidationRefs.xml", "filter/switch.xml", "filter/signatureValidationRefs-beans.xml");
+        
+        SignatureValidationFilter filter = context.getBean(SignatureValidationFilter.class);
+        Assert.assertNotNull(filter);
+        
+        
+        // These beans are defined as singletons, so can just test for reference equality
+        Assert.assertSame(filter.getDefaultCriteria(), context.getBean("test.CriteriaSet"));
+        Assert.assertSame(filter.getSignaturePrevalidator(), context.getBean("test.SignaturePrevalidator"));
+        Assert.assertSame(filter.getDynamicTrustedNamesStrategy(), context.getBean("test.DynamicTrustedNamesStrategy"));
+        
+        // Test the other args just for the hell of it
+        Assert.assertFalse(filter.getRequireSignature());
+        Assert.assertSame(filter.getSignatureTrustEngine(), context.getBean("bean.pem"));
+    }
 
 
     @Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void none() throws IOException, ResolverException {