From 978a676300c083ec65affd1992491c9358a43303 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 12 Sep 2018 11:42:06 -0400 Subject: [PATCH] SHIBUI-836: clean up --- ...TokenPlaceholderValueResolvingServiceTests.groovy | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/TokenPlaceholderValueResolvingServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/TokenPlaceholderValueResolvingServiceTests.groovy index 1046bc9f1..0362d50e2 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/TokenPlaceholderValueResolvingServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/TokenPlaceholderValueResolvingServiceTests.groovy @@ -9,10 +9,6 @@ import org.springframework.test.context.ContextConfiguration import spock.lang.Specification import spock.lang.Subject -import static edu.internet2.tier.shibboleth.admin.ui.service.TestProps.IDP_HOME -import static edu.internet2.tier.shibboleth.admin.ui.service.TestProps.REFRESH_INTERVAL - - /** * @author Dmitriy Kopylenko */ @@ -26,6 +22,9 @@ class TokenPlaceholderValueResolvingServiceTests extends Specification { @Autowired ConfigurableEnvironment environment + static final IDP_HOME = '/tmp/test/idp' + static final REFRESH_INTERVAL = 'PT5M' + def setup() { def propPairs = ["idp.home=$IDP_HOME".toString(), "refresh.interval=$REFRESH_INTERVAL".toString()] TestPropertyValues.of(propPairs).applyTo(environment) @@ -41,8 +40,3 @@ class TokenPlaceholderValueResolvingServiceTests extends Specification { refreshInterval == REFRESH_INTERVAL } } - -class TestProps { - static final IDP_HOME = '/tmp/test/idp' - static final REFRESH_INTERVAL = 'PT5M' -}