[SHIBUI-723]

Replaced tests using SVN resource with classpath resource. Updated test xml to reflect changes.
TIER · Aug 22, 2018 · a9d46cd · a9d46cd
1 parent 58c6d6b
commit a9d46cd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -140,7 +140,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
                 metadataResolverRepository.save(new TestObjectGenerator(attributeUtility).localDynamicMetadataResolver())
 
                 // Generate and test edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver
-                metadataResolverRepository.save(new TestObjectGenerator(attributeUtility).resourceBackedMetadataResolverForSVN())
+                metadataResolverRepository.save(new TestObjectGenerator(attributeUtility).resourceBackedMetadataResolverForClasspath())
             }
 
             return resolver

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
@@ -47,17 +47,23 @@
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
     </MetadataProvider>
     <MetadataProvider id="LocalDynamic"
-                      initializeFromPersistentCacheInBackground="true"
+                      backgroundInitializationFromCacheDelay="PT2S"
+                      cleanupTaskInterval="PT30M"
+                      maxCacheDuration="PT8H"
+                      maxIdleEntityData="PT8H"
+                      minCacheDuration="PT10M"
+                      refreshDelayFactor="0.75"
                       removeIdleEntityData="true"
+                      sourceDirectory="/tmp"
                       xsi:type="DynamicHttpMetadataProvider">
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
     </MetadataProvider>
-    <MetadataProvider id="SVNResourceMetadata" xsi:type="ResourceBackedMetadataProvider">
+    <MetadataProvider id="ClasspathResourceMetadata"
+                      refreshDelayFactor="0.3"
+                      xsi:type="ResourceBackedMetadataProvider">
         <MetadataResource xmlns:resource="urn:mace:shibboleth:2.0:resource"
-                          xsi:type="resource:SVNResource"
-                          resourceFile="entity.xml"
-                          repositoryURL="https://svn.example.org/repo/path/to.dir"
-                          workingCopyDirectory="%{idp.home}/metadata/svn" />
+                          xsi:type="resource:ClasspathResource"
+                          file="metadata/metadata.xml" />
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
     </MetadataProvider>
 

diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
@@ -40,17 +40,23 @@
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
     </MetadataProvider>
     <MetadataProvider id="LocalDynamic"
-                      initializeFromPersistentCacheInBackground="true"
+                      backgroundInitializationFromCacheDelay="PT2S"
+                      cleanupTaskInterval="PT30M"
+                      maxCacheDuration="PT8H"
+                      maxIdleEntityData="PT8H"
+                      minCacheDuration="PT10M"
+                      refreshDelayFactor="0.75"
                       removeIdleEntityData="true"
+                      sourceDirectory="/tmp"
                       xsi:type="DynamicHttpMetadataProvider">
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
     </MetadataProvider>
-    <MetadataProvider id="SVNResourceMetadata" xsi:type="ResourceBackedMetadataProvider">
+    <MetadataProvider id="ClasspathResourceMetadata"
+                      refreshDelayFactor="0.3"
+                      xsi:type="ResourceBackedMetadataProvider">
         <MetadataResource xmlns:resource="urn:mace:shibboleth:2.0:resource"
-                          xsi:type="resource:SVNResource"
-                          resourceFile="entity.xml"
-                          repositoryURL="https://svn.example.org/repo/path/to.dir"
-                          workingCopyDirectory="%{idp.home}/metadata/svn" />
+                          xsi:type="resource:ClasspathResource"
+                          file="metadata/metadata.xml" />
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
     </MetadataProvider>
 </MetadataProvider>