From 594ee9515ece1da62c97b37e96fb802a65834357 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Thu, 11 Aug 2011 23:44:01 +0100 Subject: [PATCH] Taglib test fixes to take latest SFW changes into account. --- .../security/taglibs/authz/AuthenticationTag.java | 1 - .../taglibs/authz/AuthenticationTagTests.java | 3 +++ .../taglibs/authz/AuthorizeTagAttributeTests.java | 14 ++++++-------- .../AuthorizeTagCustomGrantedAuthorityTests.java | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java index 04a286be29..660c70ae6f 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java @@ -150,7 +150,6 @@ public class AuthenticationTag extends TagSupport { /** * Return the HTML escaping setting for this tag, * or the default setting if not overridden. - * @see #isDefaultHtmlEscape() */ protected boolean isHtmlEscape() { return htmlEscape; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java index 518a4ba188..e383aad5f8 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java @@ -22,6 +22,8 @@ import javax.servlet.jsp.tagext.Tag; import org.junit.After; import org.junit.Test; +import org.springframework.mock.web.MockPageContext; +import org.springframework.mock.web.MockServletContext; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.authority.AuthorityUtils; @@ -131,6 +133,7 @@ public class AuthenticationTagTests { @Test public void settingHtmlEscapeToFalsePreventsEscaping() throws Exception { SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("<>& ", "")); + authenticationTag.setPageContext(new MockPageContext(new MockServletContext())); authenticationTag.setProperty("name"); authenticationTag.setHtmlEscape("false"); authenticationTag.doStartTag(); diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java index 22c02f8b3b..858282e0a3 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java @@ -18,6 +18,8 @@ package org.springframework.security.taglibs.authz; import junit.framework.TestCase; +import org.springframework.mock.web.MockPageContext; +import org.springframework.mock.web.MockServletContext; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.GrantedAuthorityImpl; @@ -29,7 +31,6 @@ import javax.servlet.jsp.tagext.Tag; /** - * DOCUMENT ME! * * @author Francois Beausoleil */ @@ -42,7 +43,7 @@ public class AuthorizeTagAttributeTests extends TestCase { //~ Methods ======================================================================================================== protected void setUp() throws Exception { - super.setUp(); + authorizeTag.setPageContext(new MockPageContext(new MockServletContext())); currentUser = new TestingAuthenticationToken("abc", "123", new GrantedAuthority[] { @@ -75,21 +76,18 @@ public class AuthorizeTagAttributeTests extends TestCase { assertEquals("prevents request - principal has ROLE_RESTRICTED", Tag.SKIP_BODY, authorizeTag.doStartTag()); } - public void testAssertsIfNotGrantedIgnoresWhitespaceInAttribute() - throws JspException { + public void testAssertsIfNotGrantedIgnoresWhitespaceInAttribute() throws JspException { authorizeTag.setIfAnyGranted("\tROLE_SUPERVISOR \t, \r\n\t ROLE_TELLER "); assertEquals("allows request - principal has ROLE_SUPERVISOR", Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag()); } - public void testIfAllGrantedIgnoresWhitespaceInAttribute() - throws JspException { + public void testIfAllGrantedIgnoresWhitespaceInAttribute() throws JspException { authorizeTag.setIfAllGranted("\nROLE_SUPERVISOR\t,ROLE_RESTRICTED\t\n\r "); assertEquals("allows request - principal has ROLE_RESTRICTED " + "and ROLE_SUPERVISOR", Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag()); } - public void testIfNotGrantedIgnoresWhitespaceInAttribute() - throws JspException { + public void testIfNotGrantedIgnoresWhitespaceInAttribute() throws JspException { authorizeTag.setIfNotGranted(" \t ROLE_TELLER \r"); assertEquals("allows request - principal does not have ROLE_TELLER", Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag()); diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java index 13c2950ebb..7be41b1122 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java @@ -18,6 +18,8 @@ package org.springframework.security.taglibs.authz; import junit.framework.TestCase; +import org.springframework.mock.web.MockPageContext; +import org.springframework.mock.web.MockServletContext; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; @@ -41,7 +43,7 @@ public class AuthorizeTagCustomGrantedAuthorityTests extends TestCase { protected void setUp() throws Exception { super.setUp(); - + authorizeTag.setPageContext(new MockPageContext(new MockServletContext())); currentUser = new TestingAuthenticationToken("abc", "123", new GrantedAuthority[] {new CustomGrantedAuthority("ROLE_TELLER")}); @@ -52,14 +54,12 @@ public class AuthorizeTagCustomGrantedAuthorityTests extends TestCase { SecurityContextHolder.clearContext(); } - public void testAllowsRequestWhenCustomAuthorityPresentsCorrectRole() - throws JspException { + public void testAllowsRequestWhenCustomAuthorityPresentsCorrectRole() throws JspException { authorizeTag.setIfAnyGranted("ROLE_TELLER"); assertEquals("authorized - ROLE_TELLER in both sets", Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag()); } - public void testRejectsRequestWhenCustomAuthorityReturnsNull() - throws JspException { + public void testRejectsRequestWhenCustomAuthorityReturnsNull() throws JspException { authorizeTag.setIfAnyGranted("ROLE_TELLER"); SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("abc", "123",