[SHIBUI-517]

Continuing unit tests WIP. Investigating recursion.
TIER · Jun 11, 2018 · cccd222 · cccd222
1 parent 8c4221c
commit cccd222
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 43 deletions.
diff --git a/...u/internet2/tier/shibboleth/admin/ui/domain/resolvers/HttpMetadataResolverAttributes.java b/...u/internet2/tier/shibboleth/admin/ui/domain/resolvers/HttpMetadataResolverAttributes.java
@@ -52,7 +52,7 @@ public class HttpMetadataResolverAttributes {
 
     private Integer httpMaxCacheEntrySize;
 
-    private enum HttpCachingType {
+    public enum HttpCachingType {
         none,file,memory
     }
 }
diff --git a/.../tier/shibboleth/admin/ui/controller/FileBackedHttpMetadataProviderControllerTests.groovy b/.../tier/shibboleth/admin/ui/controller/FileBackedHttpMetadataProviderControllerTests.groovy
@@ -272,48 +272,11 @@ class FileBackedHttpMetadataProviderControllerTests extends Specification {
 
     def "GET by resolver name returns the desired persisted resolver"() {
         given:
-        def randomResolverName = randomGenerator.randomString(10)
-        def resolverJson = """{
-	"name": "$randomResolverName",
-	"requireValidMetadata": true,
-	"failFastInitialization": true,
-	"sortKey": 7,
-	"criterionPredicateRegistryRef": "criterionPredicateRegistryRef",
-	"useDefaultPredicateRegistry": true,
-	"satisfyAnyPredicates": true,
-	"metadataFilters": [],
-	"reloadableMetadataResolverAttributes": {
-	    "parserPoolRef": "parserPoolRef",
-        "taskTimerRef": "taskTimerRef",
-        "minRefreshDelay": "minRefreshDelay",
-        "maxRefreshDelay": "maxRefreshDelay",
-        "refreshDelayFactor": 1.0,
-        "indexesRef": "indexesRef",
-        "resolveViaPredicatesOnly": true,
-        "expirationWarningThreshold": "expirationWarningThreshold"
-	},
-	"httpMetadataResolverAttributes": {
-		"httpClientRef": "httpClientRef",
-		"connectionRequestTimeout": "connectionRequestTimeout",
-		"requestTimeout": "requestTimeout",
-		"socketTimeout": "socketTimeout",
-		"disregardTLSCertificate": true,
-		"tlsTrustEngineRef": "tlsTrustEngineRef",
-		"httpClientSecurityParametersRef": "httpClientSecurityParametersRef",
-		"proxyHost": "proxyHost",
-		"proxyPort": "proxyPort",
-		"proxyUser": "proxyUser",
-		"proxyPassword": "proxyPassword",
-		"httpCaching": "none",
-		"httpCacheDirectory": "httpCacheDirectory",
-	    "httpMaxCacheEntries": 1,
-		"httpMaxCacheEntrySize": 2
-	}
-}"""
+        def randomResolver = testObjectGenerator.buildFileBackedHttpMetadataResolver()
+        def randomResolverName = randomResolver.name
+        def resolverJson = mapper.writeValueAsString(randomResolver)
 
-        def resolver = new ObjectMapper().readValue(resolverJson.bytes, FileBackedHttpMetadataResolver)
-
-        1 * repository.findByName(randomResolverName) >> resolver
+        1 * repository.findByName(randomResolverName) >> randomResolver
 
         def expectedResponseContentType = APPLICATION_JSON_UTF8
 

diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -49,9 +49,9 @@ class TestObjectGenerator {
             it.proxyPassword = generator.randomString(10)
             it.proxyPort = generator.randomString(5)
             it.proxyUser = generator.randomString(10)
-            it.requestTimeout = generator.randomString(10)
             it.socketTimeout = generator.randomString(10)
             it.tlsTrustEngineRef = generator.randomString(10)
+            it.connectionTimeout = generator.randomString(10)
             it
         }
         return attributes
@@ -262,6 +262,10 @@ class TestObjectGenerator {
         return attributes
     }
 
+    HttpMetadataResolverAttributes.HttpCachingType randomHttpCachingType() {
+        HttpMetadataResolverAttributes.HttpCachingType.values()[generator.randomInt(0, 2)]
+    }
+
     /**
      * This method takes a type and a size and builds a List of that size containing objects of that type. This is
      * intended to be used with things that extend LocalizedName such as {@link OrganizationName}, {@link OrganizationDisplayName},