From 2f05db0ba0089d0c55cf9ea2c606e76ec08a8909 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 1 Jun 2018 20:21:36 -0400 Subject: [PATCH] SHIBUI-522 WIP --- .../ui/controller/MetadataFiltersController.java | 1 - .../controller/MetadataFiltersControllerTests.groovy | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java index af370ccc6..cb2d4b791 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java @@ -54,7 +54,6 @@ public ResponseEntity getOne(@PathVariable String metadataResolverId, @PathVa // TODO: should we check that we found exactly one filter (as in the update method below)? If not, error? return ResponseEntity.ok(repository.findAll().iterator().next().getMetadataFilters().stream() .filter(eaf -> eaf.getResourceId().equals(resourceId)) - .map(eaf -> filterService.createRepresentationFromFilter((EntityAttributesFilter) eaf)) .collect(Collectors.toList()).get(0)); } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy index 80a614a9d..5243de4ce 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy @@ -107,18 +107,16 @@ class MetadataFiltersControllerTests extends Specification { def "FilterController.getOne gets the desired filter"() { given: def metadataResolver = new MetadataResolver() - metadataResolver.setMetadataFilters(testObjectGenerator.buildAllTypesOfFilterList()) - List metadataResolverList = [metadataResolver] - 1 * metadataResolverRepository.findAll() >> metadataResolverList + def expectedFilter = testObjectGenerator.entityAttributesFilter() + metadataResolver.metadataFilters = [expectedFilter] + 1 * metadataResolverRepository.findAll() >> [metadataResolver] - def expectedFilter = filterService.createRepresentationFromFilter( - chooseRandomFilterFromList(metadataResolver.metadataFilters)) - def expectedFilterId = expectedFilter.id + def expectedResourceId = expectedFilter.resourceId def expectedHttpResponseStatus = status().isOk() def expectedResponseContentType = APPLICATION_JSON_UTF8 when: - def result = mockMvc.perform(get("/api/MetadataResolver/foo/Filter/$expectedFilterId")) + def result = mockMvc.perform(get("/api/MetadataResolver/foo/Filter/$expectedResourceId")) then: result.andExpect(expectedHttpResponseStatus)