[java-identity-provider COMMIT] /trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingpart...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 15 16:38:53 2016
New Revision: 8159

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8159&view=rev
Log:
IDP-948 - Dynamic determination of profile and relying party configuration settings

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

Fix tests caused by change to deprecated allowDelegation getter.

Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java?rev=8159&r1=8158&r2=8159&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java	(original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java	Tue Mar 15 16:38:53 2016
@@ -55,7 +55,7 @@
         Assert.assertEquals(profile.getAssertionLifetime(), 5 * 60 * 1000);
         Assert.assertTrue(profile.getAdditionalAudiencesForAssertion().isEmpty());
         Assert.assertTrue(profile.includeConditionsNotBefore());
-        Assert.assertNull(profile.getAllowingDelegation());
+        Assert.assertFalse(profile.getAllowingDelegation());
         Assert.assertNotNull(profile.getAllowDelegation());
         assertFalsePredicate(profile.getAllowDelegation());
         Assert.assertEquals(profile.getMaximumTokenDelegationChainLength(), 1);
@@ -80,7 +80,7 @@
         assertConditionalPredicate(profile.getEncryptAssertions());
         assertFalsePredicate(profile.getEncryptNameIDs());
         Assert.assertTrue(profile.isEncryptionOptional());
-        Assert.assertNull(profile.getAllowingDelegation());
+        Assert.assertTrue(profile.getAllowingDelegation());
         Assert.assertNotNull(profile.getAllowDelegation());
         assertTruePredicate(profile.getAllowDelegation());
         Assert.assertEquals(profile.getMaximumTokenDelegationChainLength(), 3);
@@ -124,7 +124,7 @@
         BrowserSSOProfileConfiguration profile =
                 getBean(BrowserSSOProfileConfiguration.class, "beans.xml", "saml/saml2SSOAllowDelegationPredicate.xml");
 
-        Assert.assertNull(profile.getAllowingDelegation());
+        Assert.assertFalse(profile.getAllowingDelegation());
         Assert.assertNotNull(profile.getAllowDelegation());
         Assert.assertTrue(profile.getAllowDelegation() instanceof DummyPredicate);
     }
@@ -133,7 +133,7 @@
         BrowserSSOProfileConfiguration profile =
                 getBean(BrowserSSOProfileConfiguration.class, "beans.xml", "saml/saml2SSOAllowDelegationPropertyReplacement.xml");
 
-        Assert.assertNull(profile.getAllowingDelegation());
+        Assert.assertTrue(profile.getAllowingDelegation());
         Assert.assertNotNull(profile.getAllowDelegation());
         assertTruePredicate(profile.getAllowDelegation());
     }