SHIBUI-2596

Fixing unit tests
TIER · Jul 12, 2023 · 4b59d26 · 4b59d26
1 parent 5991dba
commit 4b59d26
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 8 deletions.
diff --git a/...h/admin/ui/controller/BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy b/...h/admin/ui/controller/BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy
@@ -26,7 +26,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaResour
 /**
  * @author Dmitriy Kopylenko
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName"])
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName", "shibui.beacon.cron=0 3 3 * * ?"])
 @ActiveProfiles(["no-auth", "badjson"])
 class BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests extends Specification {
 
@@ -48,6 +48,11 @@ class BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests extends Speci
     @TestConfiguration
     @Profile('badjson')
     static class Config {
+        @Bean
+        public String getBeaconCronValue() {
+            return "0 3 3 * * ?";
+        }
+
         @Bean
         JsonSchemaResourceLocationRegistry jsonSchemaResourceLocationRegistry(ResourceLoader resourceLoader, ObjectMapper jacksonMapper) {
 

diff --git a/...eth/admin/ui/controller/EntityDescriptorControllerSchemaValidationIntegrationTests.groovy b/...eth/admin/ui/controller/EntityDescriptorControllerSchemaValidationIntegrationTests.groovy
@@ -3,12 +3,15 @@ package edu.internet2.tier.shibboleth.admin.ui.controller
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Import
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName"])
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName", "shibui.beacon.cron=0 3 3 * * ?"])
+@Import([LocalConfig.class])
 @ActiveProfiles(["no-auth", "dev"])
 class EntityDescriptorControllerSchemaValidationIntegrationTests extends Specification {
 
@@ -51,4 +54,13 @@ class EntityDescriptorControllerSchemaValidationIntegrationTests extends Specifi
     private static HttpEntity<String> createRequestHttpEntityFor(Closure jsonBodySupplier) {
         new HttpEntity<String>(jsonBodySupplier(), ['Content-Type': 'application/json'] as HttpHeaders)
     }
+
+    @org.springframework.boot.test.context.TestConfiguration
+    private static class LocalConfig {
+        @Bean
+        public String getBeaconCronValue() {
+            return "0 3 3 * * ?";
+        }
+    }
+
 }
diff --git a/.../admin/ui/controller/GoodJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy b/.../admin/ui/controller/GoodJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy
@@ -3,13 +3,16 @@ package edu.internet2.tier.shibboleth.admin.ui.controller
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Import
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
 /**
  * @author Dmitriy Kopylenko
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName"])
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName", "shibui.beacon.cron=0 3 3 * * ?"])
+@Import([LocalConfig.class])
 @ActiveProfiles("no-auth")
 class GoodJSONMetadataSourcesUiDefinitionControllerIntegrationTests extends Specification {
 
@@ -26,4 +29,12 @@ class GoodJSONMetadataSourcesUiDefinitionControllerIntegrationTests extends Spec
         result.statusCodeValue == 200
         result.body.properties.entityId.title == 'label.entity-id'
     }
+
+    @org.springframework.boot.test.context.TestConfiguration
+    private static class LocalConfig {
+        @Bean
+        public String getBeaconCronValue() {
+            return "0 3 3 * * ?";
+        }
+    }
 }
diff --git a/...net2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerIntegrationTests.groovy b/...net2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerIntegrationTests.groovy
@@ -36,7 +36,8 @@ import static org.springframework.http.HttpMethod.PUT
  * @author Dmitriy Kopylenko
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health",
-                                                                                          "shibui.beacon.productName=shibuiProdName"])
+                                                                                          "shibui.beacon.productName=shibuiProdName",
+                                                                                          "shibui.beacon.cron=0 3 3 * * ?"])
 @ActiveProfiles(["no-auth", "mfci-test"])
 class MetadataFiltersControllerIntegrationTests extends Specification {
 
@@ -279,5 +280,10 @@ class MetadataFiltersControllerIntegrationTests extends Specification {
                 return it
             }
         }
+
+        @Bean
+        public String getBeaconCronValue() {
+            return "0 3 3 * * ?";
+        }
     }
 }
diff --git a/...leth/admin/ui/controller/MetadataFiltersControllerSchemaValidationIntegrationTests.groovy b/...leth/admin/ui/controller/MetadataFiltersControllerSchemaValidationIntegrationTests.groovy
@@ -6,12 +6,15 @@ import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverReposit
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Import
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName"])
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName", "shibui.beacon.cron=0 3 3 * * ?"])
+@Import([LocalConfig.class])
 @ActiveProfiles(["no-auth", "dev"])
 class MetadataFiltersControllerSchemaValidationIntegrationTests extends Specification {
 
@@ -99,4 +102,12 @@ class MetadataFiltersControllerSchemaValidationIntegrationTests extends Specific
     private static resourceUriFor(String uriTemplate, String resourceId) {
         String.format(uriTemplate, resourceId)
     }
+
+    @org.springframework.boot.test.context.TestConfiguration
+    private static class LocalConfig {
+        @Bean
+        public String getBeaconCronValue() {
+            return "0 3 3 * * ?";
+        }
+    }
 }
diff --git a/...bboleth/admin/ui/controller/MetadataFiltersPositionOrderControllerIntegrationTests.groovy b/...bboleth/admin/ui/controller/MetadataFiltersPositionOrderControllerIntegrationTests.groovy
@@ -1,18 +1,22 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller
 
+
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
 import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator
 import edu.internet2.tier.shibboleth.admin.util.AttributeUtility
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Import
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
 /**
  * @author Dmitriy Kopylenko
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName"])
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health", "shibui.beacon.productName=shibuiProdName", "shibui.beacon.cron=0 3 3 * * ?"])
+@Import([LocalConfig.class])
 @ActiveProfiles("no-auth")
 class MetadataFiltersPositionOrderControllerIntegrationTests extends Specification {
 
@@ -145,4 +149,12 @@ class MetadataFiltersPositionOrderControllerIntegrationTests extends Specificati
     private static resourceUriFor(String resolverResourceId) {
         String.format(RESOURCE_URI, resolverResourceId)
     }
+
+    @org.springframework.boot.test.context.TestConfiguration
+    private static class LocalConfig {
+        @Bean
+        public String getBeaconCronValue() {
+            return "0 3 3 * * ?";
+        }
+    }
 }
diff --git a/...eth/admin/ui/controller/MetadataResolverControllerSchemaValidationIntegrationTests.groovy b/...eth/admin/ui/controller/MetadataResolverControllerSchemaValidationIntegrationTests.groovy
@@ -3,13 +3,17 @@ package edu.internet2.tier.shibboleth.admin.ui.controller
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Import
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = ["management.endpoints.web.exposure.include=info, health",
-                                                                                          "shibui.beacon.productName=shibuiProdName"])
+                                                                                          "shibui.beacon.productName=shibuiProdName",
+                                                                                          "shibui.beacon.cron=0 3 3 * * ?"])
+@Import([LocalConfig.class])
 @ActiveProfiles(["no-auth", "dev"])
 class MetadataResolverControllerSchemaValidationIntegrationTests extends Specification {
 
@@ -148,5 +152,11 @@ class MetadataResolverControllerSchemaValidationIntegrationTests extends Specifi
         new HttpEntity<String>(jsonBody, ['Content-Type': 'application/json'] as HttpHeaders)
     }
 
-
+    @org.springframework.boot.test.context.TestConfiguration
+    private static class LocalConfig {
+        @Bean
+        public String getBeaconCronValue() {
+            return "0 3 3 * * ?";
+        }
+    }
 }