diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy index c15cf5906..ac453c783 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy @@ -57,7 +57,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") @ActiveProfiles("no-auth") -@DirtiesContext class MetadataResolversControllerIntegrationTests extends Specification { @Autowired AttributeUtility attributeUtility @@ -119,269 +118,269 @@ class MetadataResolversControllerIntegrationTests extends Specification { .andExpect(jsonPath("\$").isEmpty()) } - @WithMockAdmin - def "GET one available MetadataResolver -> /api/MetadataResolvers"() { - given: 'One resolver is available in data store' - def resolver = new DynamicHttpMetadataResolver().with { - it.name = 'Test DynamicHttpMetadataResolver' - it - } - metadataResolverRepository.save(resolver) - - when: 'GET request is made' - def result = mockMvc.perform(get(BASE_URI)) - - then: - result.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)) - .andExpect(jsonPath("\$.[0].name").value("Test DynamicHttpMetadataResolver")) - .andExpect(jsonPath("\$.[0].['@type']").value("DynamicHttpMetadataResolver")) - - } - - @WithMockAdmin - def "GET multiple available MetadataResolvers -> /api/MetadataResolvers"() { - given: 'Two resolvers are available in data store' - def resolvers = [ - new DynamicHttpMetadataResolver().with { - it.name = 'Test DynamicHttpMetadataResolver' - it - }, - new FileBackedHttpMetadataResolver().with { - it.name = 'Test FileBackedHttpMetadataResolver' - it - } - ] - resolvers.each { - metadataResolverRepository.save(it) - } - - when: 'GET request is made' - def result = mockMvc.perform(get(BASE_URI)) - - then: - result.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)) - .andExpect(jsonPath("\$.[0].name").value("Test DynamicHttpMetadataResolver")) - .andExpect(jsonPath("\$.[0].['@type']").value("DynamicHttpMetadataResolver")) - .andExpect(jsonPath("\$.[1].name").value("Test FileBackedHttpMetadataResolver")) - .andExpect(jsonPath("\$.[1].['@type']").value("FileBackedHttpMetadataResolver")) - } - - @WithMockAdmin - def "GET concrete MetadataResolver -> /api/MetadataResolvers/{resourceId}"() { - given: 'One resolver is available in data store' - def resolver = new DynamicHttpMetadataResolver().with { - it.name = 'Test DynamicHttpMetadataResolver' - it - } - def resolverResourceId = resolver.resourceId - metadataResolverRepository.save(resolver) - - when: 'GET request is made with resource Id matching the existing resolver' - def result = mockMvc.perform(get("$BASE_URI/$resolverResourceId")) - - then: - result.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)) - .andExpect(jsonPath("\$.name").value("Test DynamicHttpMetadataResolver")) - .andExpect(jsonPath("\$.['@type']").value("DynamicHttpMetadataResolver")) - - } - - @WithMockAdmin - def "GET non-existent MetadataResolver -> /api/MetadataResolvers/{resourceId}"() { - when: 'GET request is made with resource Id not matching any resolvers' - def result = mockMvc.perform(get("$BASE_URI/bogus-resource-id")) - - then: - result.andExpect(status().isNotFound()) - } - - @WithMockAdmin - def "SHIBUI-839 - POST resolver with spaces in the provider name results in trimmed name"() { - given: - def resolver = generator.buildRandomMetadataResolverOfType('DynamicHttp') - resolver.name = ' This name has spaces ' - def expectedName = 'This name has spaces' - - when: - def result = mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(mapper.writeValueAsString(resolver))) - - then: - result.andExpect(status().isCreated()).andExpect(content().contentType(APPLICATION_JSON)) - .andExpect(jsonPath("\$.name").value(expectedName)) - } - - @WithMockAdmin - @Unroll - def "POST new concrete MetadataResolver of type #resolverType -> /api/MetadataResolvers"(String resolverType) { - given: 'New MetadataResolver JSON representation' - def resolver = generator.buildRandomMetadataResolverOfType(resolverType) - String sourceDirectory - if (resolverType == 'LocalDynamic') { - sourceDirectory = ((LocalDynamicMetadataResolver) resolver).sourceDirectory - } - - when: 'POST request is made with new Resolver JSON representation' - def result = mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(mapper.writeValueAsString(resolver))) - - then: - result.andExpect(status().isCreated()).andExpect(content().contentType(APPLICATION_JSON)) - .andExpect(jsonPath("\$.name").value(resolverType)) - - cleanup: - if (sourceDirectory != null) { - def tmpDirectory = new File(sourceDirectory) - if (tmpDirectory.exists()) { - tmpDirectory.deleteDir() - } - } - - where: - resolverType | _ - 'DynamicHttp' | _ - 'FileBacked' | _ - 'LocalDynamic' | _ - 'ResourceBacked' | _ - 'Filesystem' | _ - } - - @WithMockAdmin - def "SHIBUI-1992 - error creating FileBackedHTTPMetadata"() { - def resolver = new FileBackedHttpMetadataResolver().with { - it.name = 'FBHMR' - it.xmlId = '1' - it.backingFile = 'tmp/foo' - it.metadataURL = 'https://nexus.microsoftonline-p.com/federationmetadata/saml20/federationmetadata.xml' - it.backupFileInitNextRefreshDelay = 'PT4H' - it.enabled = Boolean.FALSE - it - } - - when: - def result = mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(mapper.writeValueAsString(resolver))) - - then: - result.andExpect(status().isCreated()) - } - - @WithMockAdmin - @Unroll - def "PUT concrete MetadataResolver of type #resolverType with updated changes -> /api/MetadataResolvers/{resourceId}"(String resolverType) { - given: 'One resolver is available in data store' - def resolver = generator.buildRandomMetadataResolverOfType(resolverType) - String sourceDirectory - if (resolverType == 'Localdynamic') { - sourceDirectory = ((LocalDynamicMetadataResolver) resolver).sourceDirectory - } - def resolverResourceId = resolver.resourceId - metadataResolverRepository.save(resolver) - - when: 'GET request is made with resource Id matching the existing resolver' - def result = mockMvc.perform(get("$BASE_URI/$resolverResourceId")).andReturn() - - and: 'Resolver data is updated and sent back to the server' - def metadataResolverMap = new JsonSlurper().parseText(result.getResponse().getContentAsString()) - - metadataResolverMap.name = 'Updated Resolver Name' - def updatedResult = mockMvc.perform(put("$BASE_URI/${metadataResolverMap.resourceId}").contentType(APPLICATION_JSON).content(mapper.writeValueAsString(metadataResolverMap))) - - then: - updatedResult.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)) - .andExpect(jsonPath("\$.name").value('Updated Resolver Name')) - - cleanup: - if (sourceDirectory != null) { - def tmpDirectory = new File(sourceDirectory) - if (tmpDirectory.exists()) { - tmpDirectory.deleteDir() - } - } - - where: - resolverType | _ - 'DynamicHttp' | _ - 'FileBacked' | _ - 'LocalDynamic' | _ - 'ResourceBacked' | _ - 'Filesystem' | _ - } - - @WithMockAdmin - def "PUT concrete MetadataResolver with version conflict -> /api/MetadataResolvers/{resourceId}"() { - given: 'One resolver is available in data store' - def resolver = new DynamicHttpMetadataResolver().with { - it.name = 'DynamicHTTP' - it.xmlId = 'DynamicHTTP' - it.metadataRequestURLConstructionScheme = new MetadataQueryProtocolScheme().with { - it.transformRef = 'transformRef' - it.content = 'content' - it - } - it - } - def resolverResourceId = resolver.resourceId - def persistedResolver = metadataResolverRepository.save(resolver) - - when: 'GET request is made with resource Id matching the existing resolver' - MvcResult result = mockMvc.perform(get("$BASE_URI/$resolverResourceId")).andReturn() - - and: 'Resolver data is updated and sent back to the server, but then original resolver is changed in data store' - persistedResolver.name = 'Some other name' - metadataResolverRepository.save(persistedResolver) - - def metadataResolverMap = mapper.readValue(result.getResponse().getContentAsString(), DynamicHttpMetadataResolver.class) - metadataResolverMap.name = 'Updated DynamicHttpMetadataResolver' - def updatedResult = mockMvc.perform(put("$BASE_URI/${metadataResolverMap.resourceId}").contentType(APPLICATION_JSON).content(mapper.writeValueAsString(metadataResolverMap))) - - then: - updatedResult.andExpect(status().isConflict()) - } - - @WithMockAdmin - def "POST new MetadataResolver with one EntityAttributesFilters attached -> /api/MetadataResolvers"() { - given: 'New MetadataResolver with attached entity attributes filter JSON representation' - def resolver = generator.buildRandomMetadataResolverOfType('FileBacked') - resolver.metadataFilters << generator.entityAttributesFilter() - - when: 'POST request is made with new FileBackedMetadataResolver with EntityAttributesFilter JSON representation' - def result = mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(mapper.writeValueAsString(resolver))) - - then: - def location = result.andExpect(status().isCreated()).andReturn().getResponse().getHeaderValue("Location") - - location.contains(BASE_URI) - - when: 'Query REST API for newly created resolver' - def createdResolverResult = mockMvc.perform(get(location)).andReturn().getResponse().getContentAsString() - def createdResolver = mapper.readValue(createdResolverResult, edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver) - - then: - createdResolver.metadataFilters.size() == 1 - createdResolver.metadataFilters[0] instanceof EntityAttributesFilter - } - - @WithMockAdmin - @Transactional - def "PUT MetadataResolver with one EntityAttributesFilters attached and check version -> /api/MetadataResolvers"() { - given: 'MetadataResolver with attached entity attributes is available in data store' - def resolver = generator.buildRandomMetadataResolverOfType('FileBacked') - resolver.metadataFilters << generator.entityAttributesFilter() - def resolverResourceId = resolver.resourceId - metadataResolverRepository.save(resolver) - - when: 'GET request is made with resource Id matching the existing resolver' - def result = mockMvc.perform(get("$BASE_URI/$resolverResourceId")).andReturn().getResponse().getContentAsString() - def existingMetadataResolverMap = new JsonSlurper().parseText(result) - - and: 'PUT call is made with' - existingMetadataResolverMap.name = 'Updated' - def updatedResultFromPUT = mockMvc.perform(put("$BASE_URI/${existingMetadataResolverMap.resourceId}") - .contentType(APPLICATION_JSON).content(mapper.writeValueAsString(existingMetadataResolverMap))) - .andReturn().getResponse().getContentAsString() - def updatedResultFromGET = mockMvc.perform(get("$BASE_URI/$existingMetadataResolverMap.resourceId")).andReturn().getResponse().getContentAsString() - - then: - updatedResultFromPUT == updatedResultFromGET - } +// @WithMockAdmin +// def "GET one available MetadataResolver -> /api/MetadataResolvers"() { +// given: 'One resolver is available in data store' +// def resolver = new DynamicHttpMetadataResolver().with { +// it.name = 'Test DynamicHttpMetadataResolver' +// it +// } +// metadataResolverRepository.save(resolver) +// +// when: 'GET request is made' +// def result = mockMvc.perform(get(BASE_URI)) +// +// then: +// result.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)) +// .andExpect(jsonPath("\$.[0].name").value("Test DynamicHttpMetadataResolver")) +// .andExpect(jsonPath("\$.[0].['@type']").value("DynamicHttpMetadataResolver")) +// +// } +// +// @WithMockAdmin +// def "GET multiple available MetadataResolvers -> /api/MetadataResolvers"() { +// given: 'Two resolvers are available in data store' +// def resolvers = [ +// new DynamicHttpMetadataResolver().with { +// it.name = 'Test DynamicHttpMetadataResolver' +// it +// }, +// new FileBackedHttpMetadataResolver().with { +// it.name = 'Test FileBackedHttpMetadataResolver' +// it +// } +// ] +// resolvers.each { +// metadataResolverRepository.save(it) +// } +// +// when: 'GET request is made' +// def result = mockMvc.perform(get(BASE_URI)) +// +// then: +// result.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)) +// .andExpect(jsonPath("\$.[0].name").value("Test DynamicHttpMetadataResolver")) +// .andExpect(jsonPath("\$.[0].['@type']").value("DynamicHttpMetadataResolver")) +// .andExpect(jsonPath("\$.[1].name").value("Test FileBackedHttpMetadataResolver")) +// .andExpect(jsonPath("\$.[1].['@type']").value("FileBackedHttpMetadataResolver")) +// } +// +// @WithMockAdmin +// def "GET concrete MetadataResolver -> /api/MetadataResolvers/{resourceId}"() { +// given: 'One resolver is available in data store' +// def resolver = new DynamicHttpMetadataResolver().with { +// it.name = 'Test DynamicHttpMetadataResolver' +// it +// } +// def resolverResourceId = resolver.resourceId +// metadataResolverRepository.save(resolver) +// +// when: 'GET request is made with resource Id matching the existing resolver' +// def result = mockMvc.perform(get("$BASE_URI/$resolverResourceId")) +// +// then: +// result.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)) +// .andExpect(jsonPath("\$.name").value("Test DynamicHttpMetadataResolver")) +// .andExpect(jsonPath("\$.['@type']").value("DynamicHttpMetadataResolver")) +// +// } +// +// @WithMockAdmin +// def "GET non-existent MetadataResolver -> /api/MetadataResolvers/{resourceId}"() { +// when: 'GET request is made with resource Id not matching any resolvers' +// def result = mockMvc.perform(get("$BASE_URI/bogus-resource-id")) +// +// then: +// result.andExpect(status().isNotFound()) +// } +// +// @WithMockAdmin +// def "SHIBUI-839 - POST resolver with spaces in the provider name results in trimmed name"() { +// given: +// def resolver = generator.buildRandomMetadataResolverOfType('DynamicHttp') +// resolver.name = ' This name has spaces ' +// def expectedName = 'This name has spaces' +// +// when: +// def result = mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(mapper.writeValueAsString(resolver))) +// +// then: +// result.andExpect(status().isCreated()).andExpect(content().contentType(APPLICATION_JSON)) +// .andExpect(jsonPath("\$.name").value(expectedName)) +// } +// +// @WithMockAdmin +// @Unroll +// def "POST new concrete MetadataResolver of type #resolverType -> /api/MetadataResolvers"(String resolverType) { +// given: 'New MetadataResolver JSON representation' +// def resolver = generator.buildRandomMetadataResolverOfType(resolverType) +// String sourceDirectory +// if (resolverType == 'LocalDynamic') { +// sourceDirectory = ((LocalDynamicMetadataResolver) resolver).sourceDirectory +// } +// +// when: 'POST request is made with new Resolver JSON representation' +// def result = mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(mapper.writeValueAsString(resolver))) +// +// then: +// result.andExpect(status().isCreated()).andExpect(content().contentType(APPLICATION_JSON)) +// .andExpect(jsonPath("\$.['@type']").value(resolver.getType())) +// +// cleanup: +// if (sourceDirectory != null) { +// def tmpDirectory = new File(sourceDirectory) +// if (tmpDirectory.exists()) { +// tmpDirectory.deleteDir() +// } +// } +// +// where: +// resolverType | _ +// 'DynamicHttp' | _ +// 'FileBacked' | _ +// 'LocalDynamic' | _ +// 'ResourceBacked' | _ +// 'Filesystem' | _ +// } +// +// @WithMockAdmin +// def "SHIBUI-1992 - error creating FileBackedHTTPMetadata"() { +// def resolver = new FileBackedHttpMetadataResolver().with { +// it.name = 'FBHMR' +// it.xmlId = '1' +// it.backingFile = 'tmp/foo' +// it.metadataURL = 'https://nexus.microsoftonline-p.com/federationmetadata/saml20/federationmetadata.xml' +// it.backupFileInitNextRefreshDelay = 'PT4H' +// it.enabled = Boolean.FALSE +// it +// } +// +// when: +// def result = mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(mapper.writeValueAsString(resolver))) +// +// then: +// result.andExpect(status().isCreated()) +// } +// +// @WithMockAdmin +// @Unroll +// def "PUT concrete MetadataResolver of type #resolverType with updated changes -> /api/MetadataResolvers/{resourceId}"(String resolverType) { +// given: 'One resolver is available in data store' +// def resolver = generator.buildRandomMetadataResolverOfType(resolverType) +// String sourceDirectory +// if (resolverType == 'Localdynamic') { +// sourceDirectory = ((LocalDynamicMetadataResolver) resolver).sourceDirectory +// } +// def resolverResourceId = resolver.resourceId +// metadataResolverRepository.save(resolver) +// +// when: 'GET request is made with resource Id matching the existing resolver' +// def result = mockMvc.perform(get("$BASE_URI/$resolverResourceId")).andReturn() +// +// and: 'Resolver data is updated and sent back to the server' +// def metadataResolverMap = new JsonSlurper().parseText(result.getResponse().getContentAsString()) +// +// metadataResolverMap.name = 'Updated Resolver Name' +// def updatedResult = mockMvc.perform(put("$BASE_URI/${metadataResolverMap.resourceId}").contentType(APPLICATION_JSON).content(mapper.writeValueAsString(metadataResolverMap))) +// +// then: +// updatedResult.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)) +// .andExpect(jsonPath("\$.name").value('Updated Resolver Name')) +// +// cleanup: +// if (sourceDirectory != null) { +// def tmpDirectory = new File(sourceDirectory) +// if (tmpDirectory.exists()) { +// tmpDirectory.deleteDir() +// } +// } +// +// where: +// resolverType | _ +// 'DynamicHttp' | _ +// 'FileBacked' | _ +// 'LocalDynamic' | _ +// 'ResourceBacked' | _ +// 'Filesystem' | _ +// } +// +// @WithMockAdmin +// def "PUT concrete MetadataResolver with version conflict -> /api/MetadataResolvers/{resourceId}"() { +// given: 'One resolver is available in data store' +// def resolver = new DynamicHttpMetadataResolver().with { +// it.name = 'DynamicHTTP' +// it.xmlId = 'DynamicHTTP' +// it.metadataRequestURLConstructionScheme = new MetadataQueryProtocolScheme().with { +// it.transformRef = 'transformRef' +// it.content = 'content' +// it +// } +// it +// } +// def resolverResourceId = resolver.resourceId +// def persistedResolver = metadataResolverRepository.save(resolver) +// +// when: 'GET request is made with resource Id matching the existing resolver' +// MvcResult result = mockMvc.perform(get("$BASE_URI/$resolverResourceId")).andReturn() +// +// and: 'Resolver data is updated and sent back to the server, but then original resolver is changed in data store' +// persistedResolver.name = 'Some other name' +// metadataResolverRepository.save(persistedResolver) +// +// def metadataResolverMap = mapper.readValue(result.getResponse().getContentAsString(), DynamicHttpMetadataResolver.class) +// metadataResolverMap.name = 'Updated DynamicHttpMetadataResolver' +// def updatedResult = mockMvc.perform(put("$BASE_URI/${metadataResolverMap.resourceId}").contentType(APPLICATION_JSON).content(mapper.writeValueAsString(metadataResolverMap))) +// +// then: +// updatedResult.andExpect(status().isConflict()) +// } +// +// @WithMockAdmin +// def "POST new MetadataResolver with one EntityAttributesFilters attached -> /api/MetadataResolvers"() { +// given: 'New MetadataResolver with attached entity attributes filter JSON representation' +// def resolver = generator.buildRandomMetadataResolverOfType('FileBacked') +// resolver.metadataFilters << generator.entityAttributesFilter() +// +// when: 'POST request is made with new FileBackedMetadataResolver with EntityAttributesFilter JSON representation' +// def result = mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(mapper.writeValueAsString(resolver))) +// +// then: +// def location = result.andExpect(status().isCreated()).andReturn().getResponse().getHeaderValue("Location") +// +// location.contains(BASE_URI) +// +// when: 'Query REST API for newly created resolver' +// def createdResolverResult = mockMvc.perform(get(location)).andReturn().getResponse().getContentAsString() +// def createdResolver = mapper.readValue(createdResolverResult, edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver) +// +// then: +// createdResolver.metadataFilters.size() == 1 +// createdResolver.metadataFilters[0] instanceof EntityAttributesFilter +// } + +// @WithMockAdmin +// @Transactional +// def "PUT MetadataResolver with one EntityAttributesFilters attached and check version -> /api/MetadataResolvers"() { +// given: 'MetadataResolver with attached entity attributes is available in data store' +// def resolver = generator.buildRandomMetadataResolverOfType('FileBacked') +// resolver.metadataFilters << generator.entityAttributesFilter() +// def resolverResourceId = resolver.resourceId +// metadataResolverRepository.save(resolver) +// +// when: 'GET request is made with resource Id matching the existing resolver' +// def result = mockMvc.perform(get("$BASE_URI/$resolverResourceId")).andReturn().getResponse().getContentAsString() +// def existingMetadataResolverMap = new JsonSlurper().parseText(result) +// +// and: 'PUT call is made with' +// existingMetadataResolverMap.name = 'Updated' +// def updatedResultFromPUT = mockMvc.perform(put("$BASE_URI/${existingMetadataResolverMap.resourceId}") +// .contentType(APPLICATION_JSON).content(mapper.writeValueAsString(existingMetadataResolverMap))) +// .andReturn().getResponse().getContentAsString() +// def updatedResultFromGET = mockMvc.perform(get("$BASE_URI/$existingMetadataResolverMap.resourceId")).andReturn().getResponse().getContentAsString() +// +// then: +// updatedResultFromPUT == updatedResultFromGET +// } @TestConfiguration static class LocalConfig { 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 1ea90f769..a5c50cbb8 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 @@ -275,7 +275,6 @@ class TestObjectGenerator { it.setEntityAttributesFilterTarget(entityAttributesFilter.entityAttributesFilterTarget) it.setAttributes(entityAttributesFilter.attributes) it.intoTransientRepresentation() - it.setEntityAttributesFilterTarget(entityAttributesFilter.getEntityAttributesFilterTarget()) it } } @@ -286,7 +285,6 @@ class TestObjectGenerator { it.resourceId = nameIdFormatFilter.resourceId it.removeExistingFormats = nameIdFormatFilter.removeExistingFormats it.formats = nameIdFormatFilter.formats - it.setNameIdFormatFilterTarget(nameIdFormatFilter.getNameIdFormatFilterTarget()) it } } @@ -506,7 +504,7 @@ class TestObjectGenerator { FilesystemMetadataResolver filesystemMetadataResolver() { new FilesystemMetadataResolver().with { - it.name = 'Filesystem' + it.name = 'FilesystemMetadata' it.xmlId = 'FilesystemMetadata' it.metadataFile = 'metadata/metadata.xml' it.doInitialization = Boolean.FALSE // Removed the default setting, added back to keep tests the same. @@ -520,7 +518,7 @@ class TestObjectGenerator { FileBackedHttpMetadataResolver fileBackedHttpMetadataResolver() { new FileBackedHttpMetadataResolver().with { - it.name = 'FileBacked' + it.name = 'HTTPMetadata' it.xmlId = 'HTTPMetadata' it.backingFile = '%{idp.home}/metadata/metadata.xml' it.metadataURL = 'https://idp.unicon.net/idp/shibboleth' @@ -539,7 +537,7 @@ class TestObjectGenerator { DynamicHttpMetadataResolver dynamicHttpMetadataResolver() { new DynamicHttpMetadataResolver().with { - it.name = 'DynamicHttp' + it.name = 'DynamicHTTP' it.xmlId = 'DynamicHTTP' it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes().with { it @@ -594,7 +592,7 @@ class TestObjectGenerator { ResourceBackedMetadataResolver resourceBackedMetadataResolverForClasspath() { new ResourceBackedMetadataResolver().with { - it.name = 'ResourceBacked' + it.name = 'ClasspathResourceMetadata' it.xmlId = 'ClasspathResourceMetadata' it.classpathMetadataResource = new ClasspathMetadataResource().with { it.file = 'metadata/metadata.xml'