[NOJIRA]

Various test fixes. Updated backing files and references to them to use things that are actually creatable/writeable.
TIER · Aug 30, 2018 · 9caacdc · 9caacdc
1 parent 0505bae
commit 9caacdc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.../edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java b/.../edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
@@ -26,6 +26,7 @@
 import javax.validation.ConstraintViolationException;
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 
 /**
  * @author Bill Smith (wsmith@unicon.net)
@@ -59,7 +60,8 @@ private OpenSamlFileBackedHTTPMetadataResolver convertToOpenSamlRepresentation(F
 
     private OpenSamlFilesystemMetadataResolver convertToOpenSamlRepresentation(FilesystemMetadataResolver resolver) throws IOException, ResolverException, ComponentInitializationException {
         IndexWriter indexWriter = indexWriterService.getIndexWriter(resolver.getResourceId());
-        File metadataFile = new File(resolver.getMetadataFile());
+        URL url = Thread.currentThread().getContextClassLoader().getResource(resolver.getMetadataFile());
+        File metadataFile = new File(url.getPath());
 
         OpenSamlFilesystemMetadataResolver openSamlResolver = new OpenSamlFilesystemMetadataResolver(openSamlObjects.getParserPool(),
                                                       indexWriter,

diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -443,7 +443,7 @@ class TestObjectGenerator {
         new FilesystemMetadataResolver().with {
             it.name = 'FilesystemMetadata'
             it.xmlId = 'FilesystemMetadata'
-            it.metadataFile = 'some metadata filename'
+            it.metadataFile = 'metadata.xml'
 
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
                 it.minRefreshDelay = 'PT5M'
@@ -459,7 +459,7 @@ class TestObjectGenerator {
         new FileBackedHttpMetadataResolver().with {
             it.name = 'HTTPMetadata'
             it.xmlId = 'HTTPMetadata'
-            it.backingFile = '%{idp.home}/metadata/incommonmd.xml'
+            it.backingFile = 'incommonmd.xml'
             it.metadataURL = 'http://md.incommon.org/InCommon/InCommon-metadata.xml'
 
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
@@ -38,7 +38,7 @@
     </MetadataProvider>
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
-                      backingFile="%{idp.home}/metadata/incommonmd.xml"
+                      backingFile="incommonmd.xml"
                       metadataURL="http://md.incommon.org/InCommon/InCommon-metadata.xml"
                       minRefreshDelay="PT5M"
                       maxRefreshDelay="PT1H"

diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
@@ -31,7 +31,7 @@
     </MetadataProvider>
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
-                      backingFile="%{idp.home}/metadata/incommonmd.xml"
+                      backingFile="incommonmd.xml"
                       metadataURL="http://md.incommon.org/InCommon/InCommon-metadata.xml"
                       minRefreshDelay="PT5M"
                       maxRefreshDelay="PT1H"

diff --git a/backend/src/test/resources/conf/520.xml b/backend/src/test/resources/conf/520.xml
@@ -7,7 +7,7 @@
                   xsi:type="ChainingMetadataProvider">
     <MetadataProvider id="FilesystemMetadata"
                       maxRefreshDelay="PT1H"
-                      metadataFile="some metadata filename"
+                      metadataFile="metadata.xml"
                       minRefreshDelay="PT5M"
                       refreshDelayFactor="0.75"
                       xsi:type="FilesystemMetadataProvider"/>

diff --git a/backend/src/test/resources/conf/532.xml b/backend/src/test/resources/conf/532.xml
@@ -7,7 +7,7 @@
                   xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd">
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
-                      backingFile="%{idp.home}/metadata/incommonmd.xml"
+                      backingFile="incommonmd.xml"
                       metadataURL="http://md.incommon.org/InCommon/InCommon-metadata.xml"
                       minRefreshDelay="PT5M"
                       maxRefreshDelay="PT1H"