[java-identity-provider] 02/02: IDP-1423 More deprecation work in idp-profile-spring

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d7b807f87ec9b69da6fe770ba02ba50f7acc1f0c

commit d7b807f87ec9b69da6fe770ba02ba50f7acc1f0c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 29 17:13:40 2019 +0000

    IDP-1423 More deprecation work in idp-profile-spring
    
    https://issues.shibboleth.net/jira/browse/IDP-1423
---
 .../metadata/HTTPResourceConfigurationTests.java             |  5 ++---
 .../metadata/filter/SignatureValidationParserTest.java       | 12 +++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResourceConfigurationTests.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResourceConfigurationTests.java
index ae59927..28e307d 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResourceConfigurationTests.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResourceConfigurationTests.java
@@ -81,16 +81,15 @@ public class HTTPResourceConfigurationTests {
         theContext.refresh();
     }
     
-    @SuppressWarnings("deprecation")
     @AfterSuite public void tearDown() {
         if (null != theDir) {
             emptyDir(theDir);
         }
         if (null != theContext) {
-            theContext.destroy();
+            theContext.close();
         }
         if (null != globalContext) {
-            globalContext.destroy();
+            globalContext.close();
         }
     }
     
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
index 321b433..b6ffc7d 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
@@ -19,29 +19,23 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter;
 
 import java.io.IOException;
 
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataParserTest;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.opensaml.saml.metadata.resolver.filter.impl.SignatureValidationFilter;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.context.ApplicationContext;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataParserTest;
+import net.shibboleth.utilities.java.support.resolver.ResolverException;
+
 
 /**
  * test for parser for SignatureValidation filter
  */
 public class SignatureValidationParserTest extends AbstractMetadataParserTest {
 
-    @BeforeMethod public void clearDeprecateWarn() {
-        DeprecationSupport.clearWarningState();
-    }
-    
     @Test public void correctSig() throws IOException, ResolverException {
         MetadataResolver resolver =
                 getBean(MetadataResolver.class, "filter/switch-metadata.xml", "filter/switch.xml", "beans.xml");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.