[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:26:21 2015
New Revision: 7682

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

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

Fix previous.  Its @AfterMethod, not @AfterTest

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

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=7682&r1=7681&r2=7682&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:26:21 2015
@@ -38,7 +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.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -53,7 +53,7 @@
     
     private GenericApplicationContext testContext = null;
     
-    @AfterTest public void tearDownTestContext() {
+    @AfterMethod public void tearDownTestContext() {
         if (null == testContext) {
             return;
         }

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=7682&r1=7681&r2=7682&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:26:21 2015
@@ -41,7 +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 org.testng.annotations.AfterMethod;
 
 import com.google.common.base.Function;
 
@@ -58,7 +58,7 @@
     
     private GenericApplicationContext pendingTeardownContext = null;
     
-    @AfterTest public void tearDownTestContext() {
+    @AfterMethod public void tearDownTestContext() {
         if (null == pendingTeardownContext ) {
             return;
         }