[NOJIRA]

Replaced sourceDirectory <userhome>/groovytest with Files.createTempDirectory
TIER · Aug 23, 2018 · 4f29233 · 4f29233
1 parent 34b084e
commit 4f29233
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/...t2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/...t2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver
 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
@@ -152,6 +153,10 @@ class MetadataResolversControllerIntegrationTests extends Specification {
     def "POST new concrete MetadataResolver of type #resolverType -> /api/MetadataResolvers"(String resolverType) {
         given: 'New MetadataResolver JSON representation'
         def resolver = generator.buildRandomMetadataResolverOfType(resolverType)
+        String sourceDirectory
+        if (resolverType.equals('Localdynamic')) {
+            sourceDirectory = ((LocalDynamicMetadataResolver) resolver).sourceDirectory
+        }
 
         when: 'POST request is made with new DynamicHttpMetadataResolver JSON representation'
         def result = this.restTemplate.postForEntity(BASE_URI, createRequestHttpEntityFor { mapper.writeValueAsString(resolver) }, String)
@@ -161,10 +166,11 @@ class MetadataResolversControllerIntegrationTests extends Specification {
         result.headers.Location[0].contains(BASE_URI)
 
         cleanup:
-        def userHome = System.getProperty("user.home")
-        def tmpDirectory = new File(userHome + File.separator + 'groovytest')
-        if (tmpDirectory.exists()) {
-            tmpDirectory.deleteDir()
+        if (sourceDirectory != null) {
+            def tmpDirectory = new File(sourceDirectory)
+            if (tmpDirectory.exists()) {
+                tmpDirectory.deleteDir()
+            }
         }
 
         where:
@@ -180,6 +186,10 @@ class MetadataResolversControllerIntegrationTests extends Specification {
     def "PUT concrete MetadataResolver of type #resolverType with updated changes -> /api/MetadataResolvers/{resourceId}"(String resolverType) {
         given: 'One resolver is available in data store'
         def resolver = generator.buildRandomMetadataResolverOfType(resolverType)
+        String sourceDirectory
+        if (resolverType.equals('Localdynamic')) {
+            sourceDirectory = ((LocalDynamicMetadataResolver) resolver).sourceDirectory
+        }
         def resolverResourceId = resolver.resourceId
         metadataResolverRepository.save(resolver)
 
@@ -204,10 +214,11 @@ class MetadataResolversControllerIntegrationTests extends Specification {
         updatedResolverMap.name == 'Updated DynamicHttpMetadataResolver'
 
         cleanup:
-        def userHome = System.getProperty("user.home")
-        def tmpDirectory = new File(userHome + File.separator + 'groovytest')
-        if (tmpDirectory.exists()) {
-            tmpDirectory.deleteDir()
+        if (sourceDirectory != null) {
+            def tmpDirectory = new File(sourceDirectory)
+            if (tmpDirectory.exists()) {
+                tmpDirectory.deleteDir()
+            }
         }
 
         where:

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
@@ -10,6 +10,7 @@ import edu.internet2.tier.shibboleth.admin.util.AttributeUtility
 import edu.internet2.tier.shibboleth.admin.util.MDDCConstants
 import org.opensaml.saml.saml2.metadata.Organization
 
+import java.nio.file.Files
 import java.util.function.Supplier
 
 /**
@@ -483,15 +484,11 @@ class TestObjectGenerator {
     }
 
     LocalDynamicMetadataResolver localDynamicMetadataResolver() {
-        def userHome = System.getProperty("user.home")
-        def tmpDirectory = new File(userHome + File.separator + 'groovytest')
-        if (!tmpDirectory.exists()) {
-            tmpDirectory.mkdir()
-        }
+        def tmpDirectory = Files.createTempDirectory("groovy")
         new LocalDynamicMetadataResolver().with {
             it.name = 'LocalDynamic'
             it.xmlId = 'LocalDynamic'
-            it.sourceDirectory = userHome + File.separator + 'groovytest'
+            it.sourceDirectory = tmpDirectory
             it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes().with {
                 it
             }