[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.

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())

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

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

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"() {

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')

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