From 34b084e1e96cfcbedea58c8a13e04ce6f7aef478 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 23 Aug 2018 09:59:04 -0700 Subject: [PATCH] [NOJIRA] Replaced /tmp with /groovytest --- ...adataResolversControllerIntegrationTests.groovy | 14 ++++++++++++++ .../admin/ui/util/TestObjectGenerator.groovy | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy index f90b85146..f88df2d1b 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy @@ -160,6 +160,13 @@ class MetadataResolversControllerIntegrationTests extends Specification { result.statusCodeValue == 201 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() + } + where: resolverType | _ 'DynamicHttp' | _ @@ -196,6 +203,13 @@ class MetadataResolversControllerIntegrationTests extends Specification { then: updatedResolverMap.name == 'Updated DynamicHttpMetadataResolver' + cleanup: + def userHome = System.getProperty("user.home") + def tmpDirectory = new File(userHome + File.separator + 'groovytest') + if (tmpDirectory.exists()) { + tmpDirectory.deleteDir() + } + where: resolverType | _ 'DynamicHttp' | _ diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy index eea2bbbec..187ec50f8 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy @@ -483,10 +483,15 @@ class TestObjectGenerator { } LocalDynamicMetadataResolver localDynamicMetadataResolver() { + def userHome = System.getProperty("user.home") + def tmpDirectory = new File(userHome + File.separator + 'groovytest') + if (!tmpDirectory.exists()) { + tmpDirectory.mkdir() + } new LocalDynamicMetadataResolver().with { it.name = 'LocalDynamic' it.xmlId = 'LocalDynamic' - it.sourceDirectory = '/tmp' + it.sourceDirectory = userHome + File.separator + 'groovytest' it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes().with { it }