[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/R...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug 17 06:56:03 2015
New Revision: 7685

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7685&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.  Final checkin in this repository

Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResourceConfigurationTests.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InlineMetadataParserTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/AbstractSecurityParserTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/NativeSpringTest.java

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java?rev=7685&r1=7684&r2=7685&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java	(original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java	Mon Aug 17 06:56:03 2015
@@ -43,44 +43,47 @@
     @Test
     public void constructors() {
         GenericApplicationContext context = new FilesystemGenericApplicationContext();
-        context.setDisplayName("ApplicationContext: Matcher");
-        SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
-                new SchemaTypeAwareXMLBeanDefinitionReader(context);
-
-        beanDefinitionReader.loadBeanDefinitions("net/shibboleth/idp/profile/spring/logic/relyingPartyIdPredicates.xml");
-
-        context.refresh();
-        
-        RelyingPartyIdPredicate bean = context.getBean("candidate", RelyingPartyIdPredicate.class);
-        Assert.assertTrue(testCandidate(bean, "Single"));
-        Assert.assertFalse(testCandidate(bean, "Double"));
-        Assert.assertFalse(testCandidate(bean, "Elephant"));
-        
-        bean = context.getBean("candidates", RelyingPartyIdPredicate.class);
-        Assert.assertTrue(testCandidate(bean, "Single"));
-        Assert.assertTrue(testCandidate(bean, "Double"));
-        Assert.assertFalse(testCandidate(bean, "Elephant"));
-        
-        bean = context.getBean("pred", RelyingPartyIdPredicate.class);
-        Assert.assertTrue(testCandidate(bean, "Single"));
-        Assert.assertTrue(testCandidate(bean, "Double"));
-        Assert.assertTrue(testCandidate(bean, "Elephant"));
-
-        bean = context.getBean("candidate_0", RelyingPartyIdPredicate.class);
-        Assert.assertTrue(testCandidate(bean, "Single"));
-        Assert.assertFalse(testCandidate(bean, "Double"));
-        Assert.assertFalse(testCandidate(bean, "Elephant"));
-        
-        bean = context.getBean("candidates_0", RelyingPartyIdPredicate.class);
-        Assert.assertTrue(testCandidate(bean, "Single"));
-        Assert.assertTrue(testCandidate(bean, "Double"));
-        Assert.assertFalse(testCandidate(bean, "Elephant"));
-        
-        bean = context.getBean("pred_0", RelyingPartyIdPredicate.class);
-        Assert.assertTrue(testCandidate(bean, "Single"));
-        Assert.assertTrue(testCandidate(bean, "Double"));
-        Assert.assertTrue(testCandidate(bean, "Elephant"));
-
+        try {
+            context.setDisplayName("ApplicationContext: Matcher");
+            SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
+                    new SchemaTypeAwareXMLBeanDefinitionReader(context);
+    
+            beanDefinitionReader.loadBeanDefinitions("net/shibboleth/idp/profile/spring/logic/relyingPartyIdPredicates.xml");
+    
+            context.refresh();
+            
+            RelyingPartyIdPredicate bean = context.getBean("candidate", RelyingPartyIdPredicate.class);
+            Assert.assertTrue(testCandidate(bean, "Single"));
+            Assert.assertFalse(testCandidate(bean, "Double"));
+            Assert.assertFalse(testCandidate(bean, "Elephant"));
+            
+            bean = context.getBean("candidates", RelyingPartyIdPredicate.class);

[... 372 lines stripped ...]