Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed JSP EvalTag to render null result as empty String instead of "null" String (SPR-7459)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-08-12 18:41:24 +00:00
parent 9bd0bd9c3a
commit 34ebad5fff
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
View File

@@ -52,9 +52,18 @@ public class EvalTagTests extends AbstractTagTests {
assertEquals(Tag.EVAL_BODY_INCLUDE, action);
action = tag.doEndTag();
assertEquals(Tag.EVAL_PAGE, action);
assertEquals("foo", ((MockHttpServletResponse)context.getResponse()).getContentAsString());
assertEquals("foo", ((MockHttpServletResponse) context.getResponse()).getContentAsString());
}
public void testPrintNullAsEmptyString() throws Exception {
tag.setExpression("bean.null");
int action = tag.doStartTag();
assertEquals(Tag.EVAL_BODY_INCLUDE, action);
action = tag.doEndTag();
assertEquals(Tag.EVAL_PAGE, action);
assertEquals("", ((MockHttpServletResponse) context.getResponse()).getContentAsString());
}
public void testPrintFormattedScopedAttributeResult() throws Exception {
tag.setExpression("bean.formattable");
int action = tag.doStartTag();
@@ -63,7 +72,7 @@ public class EvalTagTests extends AbstractTagTests {
assertEquals(Tag.EVAL_PAGE, action);
assertEquals("25%", ((MockHttpServletResponse) context.getResponse()).getContentAsString());
}
public void testPrintHtmlEscapedAttributeResult() throws Exception {
tag.setExpression("bean.html()");
tag.setHtmlEscape("true");
@@ -71,7 +80,7 @@ public class EvalTagTests extends AbstractTagTests {
assertEquals(Tag.EVAL_BODY_INCLUDE, action);
action = tag.doEndTag();
assertEquals(Tag.EVAL_PAGE, action);
assertEquals("<p>", ((MockHttpServletResponse)context.getResponse()).getContentAsString());
assertEquals("<p>", ((MockHttpServletResponse) context.getResponse()).getContentAsString());
}
public void testPrintJavaScriptEscapedAttributeResult() throws Exception {
@@ -133,10 +142,15 @@ public class EvalTagTests extends AbstractTagTests {
public String html() {
return "<p>";
}
public String getBean() {
return "not the bean object";
}
public Object getNull() {
return null;
}
public String js() {
return "function foo() { alert(\"hi\") }";
}