From 9caacdc68564bf2c0d55e01d4b6471c4feda90d9 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 30 Aug 2018 12:45:05 -0700 Subject: [PATCH] [NOJIRA] Various test fixes. Updated backing files and references to them to use things that are actually creatable/writeable. --- .../ui/service/MetadataResolverConverterServiceImpl.java | 4 +++- .../tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy | 4 ++-- backend/src/test/resources/conf/278.2.xml | 2 +- backend/src/test/resources/conf/278.xml | 2 +- backend/src/test/resources/conf/520.xml | 2 +- backend/src/test/resources/conf/532.xml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java index 27b9c7233..4ae0d07d2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java +++ b/backend/src/main/java/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/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 e7d227160..f3add1fea 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 @@ -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 index 42c21c122..421b5d2be 100644 --- a/backend/src/test/resources/conf/278.2.xml +++ b/backend/src/test/resources/conf/278.2.xml @@ -38,7 +38,7 @@ diff --git a/backend/src/test/resources/conf/532.xml b/backend/src/test/resources/conf/532.xml index cdfd93301..a3598b020 100644 --- 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">