SHIBUI-522

TIER · Jun 18, 2018 · 0e5cc66 · 0e5cc66
1 parent a126955
commit 0e5cc66
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -100,17 +100,14 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                                 'requireSignedRoot': 'true',
                                 'certificateFile': '%{idp.home}/credentials/inc-md-cert.pem'
                         )
-                        MetadataFilter(
-                                'xsi:type': 'RequiredValidUntil',
-                                'maxValidityInterval': 'P14D'
-                        )
                         //TODO: enhance
                         mr.metadataFilters.each { edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter filter ->
                             constructXmlNodeForFilter(filter, delegate)
                         }
                     }
                 }
             }
+            println writer.toString()
             return DOMBuilder.newInstance().parseText(writer.toString())
         }
     }

diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -5,6 +5,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteListFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.RequiredValidUntilFilter
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
 import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator
@@ -43,18 +44,20 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
     def 'simple test generation of metadata-providers.xml'() {
         when:
         def mr = metadataResolverRepository.findAll().iterator().next()
+        mr.metadataFilters << requiredValidUntilFilterForXmlGenerationTests()
         mr.metadataFilters << entityRoleWhiteListFilterForXmlGenerationTests()
         metadataResolverRepository.save(mr)
         def output = metadataResolverService.generateConfiguration()
 
         then:
-        assert generatedXmlIsTheSameAsExpectedXml('/conf/278.xml', output)
+        generatedXmlIsTheSameAsExpectedXml('/conf/278.xml', output)
     }
 
     def 'test generation of metadata-providers.xml with filters'() {
         when:
         //TODO: this might break later
         def mr = metadataResolverRepository.findAll().iterator().next()
+        mr.metadataFilters << requiredValidUntilFilterForXmlGenerationTests()
         mr.metadataFilters.add(new EntityAttributesFilter().with {
             it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with {
                 it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY
@@ -76,7 +79,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
         def output = metadataResolverService.generateConfiguration()
 
         then:
-        assert generatedXmlIsTheSameAsExpectedXml('/conf/278.2.xml', output)
+        generatedXmlIsTheSameAsExpectedXml('/conf/278.2.xml', output)
     }
 
     EntityRoleWhiteListFilter entityRoleWhiteListFilterForXmlGenerationTests() {
@@ -86,6 +89,13 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
         }
     }
 
+    RequiredValidUntilFilter requiredValidUntilFilterForXmlGenerationTests() {
+        new RequiredValidUntilFilter().with {
+            it.maxValidityInterval = 'P14D'
+            it
+        }
+    }
+
     //TODO: check that this configuration is sufficient
     @TestConfiguration
     static class TestConfig {