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

SPR-4700 - Add single checkbox input macro for Velocity and Freemarker

Browse Source
This commit is contained in:
Arjen Poutsma
2009-08-05 12:16:11 +00:00
parent 7043dff97b
commit 93e99556c0
6 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
View File

@@ -140,6 +140,7 @@ public class FreeMarkerMacroTests extends TestCase {
TestBean tb = new TestBean("Darren", 99);
tb.setSpouse(new TestBean("Fred"));
tb.setJedi(true);
request.setAttribute("command", tb);
HashMap names = new HashMap();
@@ -192,6 +193,10 @@ public class FreeMarkerMacroTests extends TestCase {
if (tokens[i].equals("FORM11")) assertEquals("<input type=\"text\" id=\"name\" name=\"name\" value=\"Darren\" >", tokens[i + 1]);
if (tokens[i].equals("FORM12")) assertEquals("<input type=\"hidden\" id=\"name\" name=\"name\" value=\"Darren\" >", tokens[i + 1]);
if (tokens[i].equals("FORM13")) assertEquals("<input type=\"password\" id=\"name\" name=\"name\" value=\"\" >", tokens[i + 1]);
if (tokens[i].equals("FORM15")) assertEquals("<input type=\"hidden\" name=\"_name\" value=\"on\"/>", tokens[i + 1]);
if (tokens[i].equals("FORM15")) assertEquals("<input type=\"checkbox\" id=\"name\" name=\"name\" checked=\"false\" />", tokens[i + 2]);
if (tokens[i].equals("FORM16")) assertEquals("<input type=\"hidden\" name=\"_jedi\" value=\"on\"/>", tokens[i + 1]);
if (tokens[i].equals("FORM16")) assertEquals("<input type=\"checkbox\" id=\"jedi\" name=\"jedi\" checked=\"true\" />", tokens[i + 2]);
}
}

6
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl
View File

@@ -77,3 +77,9 @@ FORM13
FORM14
<@spring.formSingleSelect "command.name", options, ""/>
FORM15
<@spring.formCheckbox "command.name"/>
FORM16
<@spring.formCheckbox "command.jedi"/>

5
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
View File

@@ -133,6 +133,7 @@ public class VelocityMacroTests extends TestCase {
rc.setContextPath("/springtest");
TestBean tb = new TestBean("Darren", 99);
tb.setJedi(true);
request.setAttribute("command", tb);
HashMap names = new HashMap();
@@ -178,6 +179,10 @@ public class VelocityMacroTests extends TestCase {
//TODO verify remaining output (fix whitespace)
if (tokens[i].equals("FORM9")) assertEquals("<input type=\"password\" id=\"name\" name=\"name\" value=\"\" >", tokens[i + 1]);
if (tokens[i].equals("FORM10")) assertEquals("<input type=\"hidden\" id=\"name\" name=\"name\" value=\"Darren\" >", tokens[i + 1]);
if (tokens[i].equals("FORM15")) assertEquals("<input type=\"hidden\" name=\"_name\" value=\"on\"/>", tokens[i + 1]);
if (tokens[i].equals("FORM15")) assertEquals("<input type=\"checkbox\" id=\"name\" name=\"name\" checked=\"false\" />", tokens[i + 2]);
if (tokens[i].equals("FORM16")) assertEquals("<input type=\"hidden\" name=\"_jedi\" value=\"on\"/>", tokens[i + 1]);
if (tokens[i].equals("FORM16")) assertEquals("<input type=\"checkbox\" id=\"jedi\" name=\"jedi\" checked=\"true\" />", tokens[i + 2]);
}
}

7
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/velocity/test.vm
View File

@@ -53,5 +53,12 @@ FORM9
FORM10
#springFormHiddenInput("command.name" "")
FORM15
#springFormCheckbox("command.name" "")
FORM16
#springFormCheckbox("command.jedi" "")
ERRORS
#springShowErrors(" " "")