From 97705469ff1ded2c1d7e59773554f130c3797881 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 20 Aug 2018 15:52:42 -0400 Subject: [PATCH] SHIBUI-754: tests polishing --- .../support/RestControllersSupport.java | 1 + ...tionOrderControllerIntegrationTests.groovy | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java index 764ad58a0..1605b86dd 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java @@ -1,5 +1,6 @@ package edu.internet2.tier.shibboleth.admin.ui.controller.support; +import com.google.common.collect.ImmutableMap; import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver; import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersPositionOrderControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersPositionOrderControllerIntegrationTests.groovy index da525e35b..c1718a0fd 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersPositionOrderControllerIntegrationTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersPositionOrderControllerIntegrationTests.groovy @@ -44,7 +44,7 @@ class MetadataFiltersPositionOrderControllerIntegrationTests extends Specificati def "GET Filter Position Order for non-existent resolver"() { when: 'GET request is made with resolver resource id NOT matching any existing filter' - def result = this.restTemplate.getForEntity(resourceUriFor('non-existent-resolver-id'), String) + def result = getFiltersPositionOrderFor('non-existent-resolver-id', String) then: "Request completed successfully" result.statusCodeValue == 404 @@ -55,7 +55,7 @@ class MetadataFiltersPositionOrderControllerIntegrationTests extends Specificati def resolver = createResolverWithTwoFilters() when: 'GET request is made to retrieve position order of filters' - def result = getFiltersPositionOrderFor(resolver.resourceId) + def result = getFiltersPositionOrderFor(resolver.resourceId, List) then: 'Original filters order is preserved' result.statusCodeValue == 200 @@ -74,13 +74,13 @@ class MetadataFiltersPositionOrderControllerIntegrationTests extends Specificati reorderPOSTResult.statusCodeValue == 204 and: 'GET request is made to retrieve position order of filters' - def positionOrderResult = getFiltersPositionOrderFor(resolver.resourceId) + def positionOrderResult = getFiltersPositionOrderFor(resolver.resourceId, List) then: positionOrderResult.body == reOrderedFiltersPosition and: "Request is made to retrieve the resolver with affected filters" - def resolverResult = this.restTemplate.getForEntity("$BASE_URI/$resolver.resourceId", Map) + def resolverResult = getResolver(resolver.resourceId) then: resolverResult.statusCodeValue == 200 @@ -101,13 +101,13 @@ class MetadataFiltersPositionOrderControllerIntegrationTests extends Specificati reorderPOSTResult.statusCodeValue == 400 and: 'GET request is made to retrieve position order of filters' - def positionOrderResult = getFiltersPositionOrderFor(resolver.resourceId) + def positionOrderResult = getFiltersPositionOrderFor(resolver.resourceId, List) then: 'Original filters position order is retrieved' positionOrderResult.body == originalFiltersPosition and: "Request is made to retrieve the resolver with original filters" - def resolverResult = this.restTemplate.getForEntity("$BASE_URI/$resolver.resourceId", Map) + def resolverResult = getResolver(resolver.resourceId) then: resolverResult.statusCodeValue == 200 @@ -133,14 +133,18 @@ class MetadataFiltersPositionOrderControllerIntegrationTests extends Specificati secondFilterResourceId: secondFilterResourceId] } - private getFiltersPositionOrderFor(String resourceId) { - this.restTemplate.getForEntity(resourceUriFor(resourceId), List) + private getFiltersPositionOrderFor(String resourceId, responseType) { + this.restTemplate.getForEntity(resourceUriFor(resourceId), responseType) } private reorderFilters(String resourceId, List filterIdsPositionOrderList) { this.restTemplate.postForEntity(resourceUriFor(resourceId), filterIdsPositionOrderList, null) } + private getResolver(String resolverResourceId) { + this.restTemplate.getForEntity("$BASE_URI/$resolverResourceId", Object) + } + private static resourceUriFor(String resolverResourceId) { String.format(RESOURCE_URI, resolverResourceId) }