From 640423aad9c2ad6e56e796bf43af9e74c29132a5 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Wed, 12 Sep 2018 09:16:49 -0700
Subject: [PATCH 1/2] [SHIBUI-570]

Dropped min refresh down to 30S.
---
 .../tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
index 7510f9929..7c3eef273 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -460,7 +460,7 @@ class TestObjectGenerator {
             it.metadataURL = 'https://idp.unicon.net/idp/shibboleth'
 
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
-                it.minRefreshDelay = 'PT5M'
+                it.minRefreshDelay = 'PT30S'
                 it.maxRefreshDelay = 'PT1H'
                 it.refreshDelayFactor = 0.75
                 it

From 0721845e81fe808af2b82bb3a607a3b57ecac085 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Wed, 12 Sep 2018 09:38:20 -0700
Subject: [PATCH 2/2] [SHIBUI-570]

Removed specifying delay, opting for defaults instead.
---
 .../tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy | 3 ---
 backend/src/test/resources/conf/278.2.xml                    | 5 +----
 backend/src/test/resources/conf/278.xml                      | 5 +----
 backend/src/test/resources/conf/532.xml                      | 5 +----
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
index 7c3eef273..6a7d0e1cf 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -460,9 +460,6 @@ class TestObjectGenerator {
             it.metadataURL = 'https://idp.unicon.net/idp/shibboleth'
 
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
-                it.minRefreshDelay = 'PT30S'
-                it.maxRefreshDelay = 'PT1H'
-                it.refreshDelayFactor = 0.75
                 it
             }
             it
diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
index 2b71b5ed1..5a34f756b 100644
--- a/backend/src/test/resources/conf/278.2.xml
+++ b/backend/src/test/resources/conf/278.2.xml
@@ -39,10 +39,7 @@
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
                       backingFile="unicon.xml"
-                      metadataURL="https://idp.unicon.net/idp/shibboleth"
-                      minRefreshDelay="PT5M"
-                      maxRefreshDelay="PT1H"
-                      refreshDelayFactor="0.75">
+                      metadataURL="https://idp.unicon.net/idp/shibboleth">
         <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
     </MetadataProvider>
diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
index b244bf6b6..a337f72d7 100644
--- a/backend/src/test/resources/conf/278.xml
+++ b/backend/src/test/resources/conf/278.xml
@@ -32,10 +32,7 @@
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
                       backingFile="unicon.xml"
-                      metadataURL="https://idp.unicon.net/idp/shibboleth"
-                      minRefreshDelay="PT5M"
-                      maxRefreshDelay="PT1H"
-                      refreshDelayFactor="0.75">
+                      metadataURL="https://idp.unicon.net/idp/shibboleth">
         <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
     </MetadataProvider>
diff --git a/backend/src/test/resources/conf/532.xml b/backend/src/test/resources/conf/532.xml
index bf4ce340b..85fead908 100644
--- a/backend/src/test/resources/conf/532.xml
+++ b/backend/src/test/resources/conf/532.xml
@@ -8,8 +8,5 @@
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
                       backingFile="unicon.xml"
-                      metadataURL="https://idp.unicon.net/idp/shibboleth"
-                      minRefreshDelay="PT5M"
-                      maxRefreshDelay="PT1H"
-                      refreshDelayFactor="0.75" />
+                      metadataURL="https://idp.unicon.net/idp/shibboleth" />
 </MetadataProvider>