From b368bb7248a1fad5dfde7f45f3eac36b3a1ccbf1 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Mon, 4 Jun 2018 17:22:08 -0700 Subject: [PATCH] [SHIBUI-522] Test fixes related to a possible overly enthusiastic IDE refactor of EntityAttributesFilterTarget.setValue/.setSingleValue. Also fixed the MetadataFiltersControllerTests test that tests for a 409. It was using a representation object to create the posted json. Swapping this for a regular object did the trick. --- .../ui/controller/MetadataFiltersControllerTests.groovy | 3 +-- .../ui/domain/EntityAttributesFilterTargetTests.groovy | 2 +- .../FileBackedHttpMetadataResolverRepositoryTests.groovy | 4 ++-- .../ui/repository/MetadataResolverRepositoryTest.groovy | 6 +++--- .../IncommonJPAMetadataResolverServiceImplTests.groovy | 2 +- .../admin/ui/service/JPAEntityServiceImplTests.groovy | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) 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 e663ca337..802c24b78 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 @@ -203,8 +203,7 @@ class MetadataFiltersControllerTests extends Specification { def randomFilter = testObjectGenerator.entityAttributesFilter() def updatedFilter = testObjectGenerator.entityAttributesFilter() updatedFilter.resourceId = randomFilter.resourceId - def postedJsonBody = mapper.writeValueAsString( - filterService.createRepresentationFromFilter(updatedFilter)) + def postedJsonBody = mapper.writeValueAsString(updatedFilter) def originalMetadataResolver = new MetadataResolver() originalMetadataResolver.setResourceId(randomGenerator.randomId()) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributesFilterTargetTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributesFilterTargetTests.groovy index c75618e41..cf4fd32eb 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributesFilterTargetTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributesFilterTargetTests.groovy @@ -14,7 +14,7 @@ class EntityAttributesFilterTargetTests extends Specification { def stringsList = ["one", "two", "three"] when: - filterTarget.setSingleValue(stringsList) + filterTarget.setValue(stringsList) then: filterTarget.value == stringsList diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepositoryTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepositoryTests.groovy index 219ed60d1..b497a711f 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepositoryTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepositoryTests.groovy @@ -70,8 +70,8 @@ class FileBackedHttpMetadataResolverRepositoryTests extends Specification { item.name == "FileBackedHttpMetadata" item.metadataFilters.size() == 1 item.metadataFilters[0].entityAttributesFilterTarget.entityAttributesFilterTargetType == ENTITY - item.metadataFilters[0].entityAttributesFilterTarget.setSingleValue.size() == 1 - item.metadataFilters[0].entityAttributesFilterTarget.setSingleValue.get(0) == "hola" + item.metadataFilters[0].entityAttributesFilterTarget.value.size() == 1 + item.metadataFilters[0].entityAttributesFilterTarget.value.get(0) == "hola" item.httpMetadataResolverAttributes.connectionRequestTimeout == "PT05" item.httpMetadataResolverAttributes.disregardTLSCertificate item.httpMetadataResolverAttributes.httpCaching == memory diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTest.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTest.groovy index 041e86858..890b79ed5 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTest.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTest.groovy @@ -49,7 +49,7 @@ class MetadataResolverRepositoryTest extends Specification { it.metadataFilters.add(new EntityAttributesFilter().with { it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with { it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY - it.setSingleValue(["hola"]) + it.value = ["hola"] return it } return it @@ -64,8 +64,8 @@ class MetadataResolverRepositoryTest extends Specification { item.name == "testme" item.metadataFilters.size() == 1 item.metadataFilters.get(0).entityAttributesFilterTarget.entityAttributesFilterTargetType == EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY - item.metadataFilters.get(0).entityAttributesFilterTarget.setSingleValue.size() == 1 - item.metadataFilters.get(0).entityAttributesFilterTarget.setSingleValue.get(0) == "hola" + item.metadataFilters.get(0).entityAttributesFilterTarget.value.size() == 1 + item.metadataFilters.get(0).entityAttributesFilterTarget.value.get(0) == "hola" } def "SHIBUI-553"() { diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy index 01ce1f429..a9e5aa638 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy @@ -53,7 +53,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification { mr.metadataFilters.add(new EntityAttributesFilter().with { it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with { it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY - it.singleValue = ['https://sp1.example.org'] + it.value = ['https://sp1.example.org'] it } def attribute = attributeUtility.createAttributeWithArbitraryValues('here', null, 'there') diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImplTests.groovy index 2d457ffa3..8e212bb90 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImplTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImplTests.groovy @@ -80,7 +80,7 @@ class JPAEntityServiceImplTests extends Specification { result.name == expectedAttributeName result.attributeValues.size == listOfStrings.size result.attributeValues.each { - listOfStrings.contains(it.setSingleValue) + listOfStrings.contains(it.value) it.namespaceURI == expectedNamespaceURI it.elementLocalName == expectedElementLocalName it.namespacePrefix == expectedNamespacePrefix