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

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Dec 10 17:33:23 2014
New Revision: 7068

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7068&view=rev
Log:
Update unit tests.

Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.java

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.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/SignatureValidationCriteriaSetFactoryBeanTest.java?rev=7068&r1=7067&r2=7068&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.java Wed Dec 10 17:33:23 2014
@@ -50,6 +50,16 @@
     public void testNoInputs() throws Exception {
         CriteriaSet criteriaSet = factoryBean.getObject();
         Assert.assertNotNull(criteriaSet);
+        Assert.assertFalse(criteriaSet.isEmpty());
+        Assert.assertEquals(criteriaSet.size(), 1);
+        Assert.assertTrue(criteriaSet.contains(SignatureValidationParametersCriterion.class));
+    }
+    
+    @Test
+    public void testNoOpenSAMLGlobal() throws Exception {
+        factoryBean.setIncludeOpenSAMLGlobalConfig(false);
+        CriteriaSet criteriaSet = factoryBean.getObject();
+        Assert.assertNotNull(criteriaSet);
         Assert.assertTrue(criteriaSet.isEmpty());
     }
     
@@ -81,6 +91,7 @@
     public void testOtherCriteriaOnly() throws Exception {
         HashSet<Criterion> otherCriteria = Sets.newHashSet(new UsageCriterion(UsageType.SIGNING), new EntityIdCriterion("foo"));
         factoryBean.setOtherCriteria(otherCriteria);
+        factoryBean.setIncludeOpenSAMLGlobalConfig(false);
         
         CriteriaSet criteriaSet = factoryBean.getObject();
         Assert.assertNotNull(criteriaSet);