[NOISSUE]

tighten test allow default for refresh delay
TIER · Aug 29, 2018 · 2114272 · 2114272
1 parent 6726242
commit 2114272
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/...bboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverConstructorHelper.java b/...bboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverConstructorHelper.java
@@ -59,8 +59,12 @@ public static void updateOpenSamlMetadataResolverFromReloadableMetadataResolverA
         AbstractReloadingMetadataResolver reloadingMetadataResolver = (AbstractReloadingMetadataResolver) metadataResolver;
 
         reloadingMetadataResolver.setExpirationWarningThreshold(toMillis(attributes.getExpirationWarningThreshold()));
-        reloadingMetadataResolver.setMaxRefreshDelay(toMillis(attributes.getMaxRefreshDelay()));
-        reloadingMetadataResolver.setMinRefreshDelay(toMillis(attributes.getMinRefreshDelay()));
+        if (attributes.getMaxRefreshDelay() != null) {
+            reloadingMetadataResolver.setMaxRefreshDelay(toMillis(attributes.getMaxRefreshDelay()));
+        }
+        if (attributes.getMinRefreshDelay() != null) {
+            reloadingMetadataResolver.setMinRefreshDelay(toMillis(attributes.getMinRefreshDelay()));
+        }
 
         //TODO: I think we may need to take another look at setting the defaults properly on our attributes.
         reloadingMetadataResolver.setRefreshDelayFactor(attributes.getRefreshDelayFactor() == null ? 0.75f : attributes.getRefreshDelayFactor().floatValue());

diff --git a/...src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptorTest.groovy b/...src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptorTest.groovy
@@ -3,7 +3,6 @@ package edu.internet2.tier.shibboleth.admin.ui.domain
 import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes
@@ -13,16 +12,14 @@ import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.service.IndexWriterService
 import edu.internet2.tier.shibboleth.admin.ui.util.RandomGenerator
 import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator
-import org.apache.http.impl.client.HttpClients
-import org.apache.lucene.index.IndexWriter
 import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver
 import org.opensaml.saml.metadata.resolver.MetadataResolver
 import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver
-import org.opensaml.saml.metadata.resolver.impl.AbstractReloadingMetadataResolver
-import org.opensaml.saml.metadata.resolver.impl.FileBackedHTTPMetadataResolver
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.context.annotation.Bean
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ContextConfiguration
@@ -34,7 +31,7 @@ import java.nio.file.Files
  * @author Bill Smith (wsmith@unicon.net)
  */
 @DataJpaTest
-@ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, TestConfiguration, InternationalizationConfiguration])
+@ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, InternationalizationConfiguration, MyConfig])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@@ -62,8 +59,7 @@ class EntityDescriptorTest extends Specification {
     def "entity descriptors properly marshall to xml"() {
         given:
         def tempDir = Files.createTempDirectory('test')
-        ((OpenSamlChainingMetadataResolver)metadataResolver).resolvers.remove(0)
-        ((OpenSamlChainingMetadataResolver)metadataResolver).resolvers.add(
+        ((OpenSamlChainingMetadataResolver)metadataResolver).resolvers = [
                 new OpenSamlFileBackedHTTPMetadataResolver(
                         openSamlObjects.parserPool,
                         indexWriterService.getIndexWriter('testme'),
@@ -76,8 +72,7 @@ class EntityDescriptorTest extends Specification {
                 ).with {
                     it.initialize()
                     it
-                }
-        )
+                }]
 
         when:
         ((RefreshableMetadataResolver)metadataResolver).refresh()
@@ -86,4 +81,16 @@ class EntityDescriptorTest extends Specification {
         println("We didn't explode .. hopefully.")
 
     }
+
+    @TestConfiguration
+    static class MyConfig {
+        @Bean
+        MetadataResolver metadataResolver() {
+            ChainingMetadataResolver metadataResolver = new OpenSamlChainingMetadataResolver()
+            metadataResolver.setId("chain")
+            metadataResolver.resolvers = new ArrayList<>()
+            metadataResolver.initialize()
+            return metadataResolver
+        }
+    }
 }