From 1638c4ee5e619b99b89efea470c17e1d59ded92b Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 7 Jul 2023 13:50:17 -0700
Subject: [PATCH] SHIBUI-2591

Corrections to unit tests for merge to develop
---
 .../admin/ui/BaseDataJpaTestConfiguration.groovy   |  3 ++-
 ...etadataFiltersControllerIntegrationTests.groovy | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy
index 7bb1f209d..0a3ad3451 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy
@@ -52,6 +52,7 @@ import org.springframework.context.annotation.Import
 import org.springframework.context.annotation.Primary
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
 
+import java.time.Duration
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
@@ -162,7 +163,7 @@ class BaseDataJpaTestConfiguration {
             @Override Set<String> getNames() { return null }
 
             @Override HealthEndpointGroup get(String name) { return null }
-        }) {
+        }, Duration.ZERO) {
             @Override
             HealthComponent healthForPath(@Selector(match = Selector.Match.ALL_REMAINING) String... path) {
                 return new Health(new Status(""), new HashMap<String, Object>());
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerIntegrationTests.groovy
index 8567362b0..6849d0448 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerIntegrationTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerIntegrationTests.groovy
@@ -5,6 +5,10 @@ import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import edu.internet2.tier.shibboleth.admin.ui.AbstractBaseDataJpaTest
 import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.MetadataResolverValidationConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.PlaceholderResolverComponentsConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.TestMetadataResolverControllerConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.domain.beacon.BeaconEventType
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
@@ -30,13 +34,22 @@ import org.springframework.boot.test.context.TestConfiguration
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Import
 import org.springframework.context.annotation.Profile
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
 import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.web.servlet.setup.MockMvcBuilders
 import org.springframework.transaction.annotation.EnableTransactionManagement
 import spock.lang.Subject
 
 import java.lang.reflect.UndeclaredThrowableException
 
 import static edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget.EntityAttributesFilterTargetType.CONDITION_SCRIPT
+import static org.springframework.http.MediaType.APPLICATION_JSON
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
 @Import([PlaceholderResolverComponentsConfiguration.class, EntitiesVersioningConfiguration.class, TestMetadataResolverControllerConfiguration.class,
          MetadataResolverValidationConfiguration.class, MFCILocalConfig.class])
@@ -293,7 +306,6 @@ class MetadataFiltersControllerIntegrationTests extends AbstractBaseDataJpaTest
             it
         }
 
-        expect:
         beaconDataService.getBeaconEvents().get(BeaconEventType.METADATA_FILTER_CREATED.name()) == null
 
         when: