[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filt...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Aug 16 11:19:01 2015
New Revision: 7681

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7681&view=rev
Log:
IDP-542 Teardown application contexts after tests

https://issues.shibboleth.net/jira/browse/IDP-542

Good for hygiene, but can also impact other tests.  This checkin does the attribute filters.

Modified:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java?rev=7681&r1=7680&r2=7681&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java	(original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java	Sun Aug 16 11:19:01 2015
@@ -38,6 +38,7 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.testng.Assert;
+import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -49,6 +50,16 @@
 
     /** The service configuration dir. */
     private final static String SERVICE_CONFIG_DIR = "net/shibboleth/idp/attribute/filter/spring/";
+    
+    private GenericApplicationContext testContext = null;
+    
+    @AfterTest public void tearDownTestContext() {
+        if (null == testContext) {
+            return;
+        }
+        testContext.close();
+        testContext = null;
+    }
 
     /**
      * Instantiate a new service.
@@ -59,12 +70,16 @@
      * @throws ServiceException if an error occurs loading the service
      * @throws ComponentInitializationException
      */
-    private static AttributeFilter getFilter(String name) throws ServiceException, ComponentInitializationException {
+    private AttributeFilter getFilter(String name) throws ServiceException, ComponentInitializationException {
         final Resource resource = new ClassPathResource(SERVICE_CONFIG_DIR + name);
+        if (null != testContext) {
+            tearDownTestContext();
+        }
         final GenericApplicationContext context =
                 SpringSupport.newContext(name, Collections.singletonList(resource),
                         Collections.<BeanFactoryPostProcessor>emptyList(), Collections.<BeanPostProcessor>emptyList(),
                         Collections.<ApplicationContextInitializer>emptyList(), null);
+        testContext = context;
         final AttributeFilterServiceStrategy strategy = new AttributeFilterServiceStrategy();
         strategy.setId("ID");
         strategy.initialize();

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java?rev=7681&r1=7680&r2=7681&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java	(original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java	Sun Aug 16 11:19:01 2015
@@ -41,6 +41,7 @@
 import org.opensaml.saml.saml2.core.Attribute;
 import org.springframework.context.support.GenericApplicationContext;
 import org.testng.Assert;
+import org.testng.annotations.AfterTest;
 
 import com.google.common.base.Function;
 
@@ -54,6 +55,21 @@
     protected static final String MATCHER_PATH = "/net/shibboleth/idp/attribute/filter/matcher/";
 
     protected static final String POLICY_RULE_PATH = "/net/shibboleth/idp/attribute/filter/policyrule/";
+    
+    private GenericApplicationContext pendingTeardownContext = null;
+    
+    @AfterTest public void tearDownTestContext() {
+        if (null == pendingTeardownContext ) {
+            return;
+        }
+        pendingTeardownContext .close();
+        pendingTeardownContext  = null;
+    }
+    

[... 88 lines stripped ...]