diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl b/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl index bfb41221f7..00ef2e122d 100644 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl +++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl @@ -202,7 +202,8 @@ --> <#macro formTextarea path attributes=""> <@bind path/> - + <#-- diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity/spring.vm b/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity/spring.vm index 91936429ad..8ae5fe2aa6 100644 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity/spring.vm +++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity/spring.vm @@ -161,7 +161,8 @@ *# #macro( springFormTextarea $path $attributes ) #springBind($path) - + #end #** diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java index 36593225a9..f462250618 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java @@ -211,12 +211,12 @@ public class FreeMarkerMacroTests { @Test public void testForm3() throws Exception { - assertEquals("", getMacroOutput("FORM3")); + assertEquals("", getMacroOutput("FORM3")); } @Test public void testForm4() throws Exception { - assertEquals("", getMacroOutput("FORM4")); + assertEquals("", getMacroOutput("FORM4")); } // TODO verify remaining output (fix whitespace) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java index 1c46a1bad0..6409814ea2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java @@ -184,8 +184,10 @@ public class VelocityMacroTests { if (tokens[i].equals("URL")) assertEquals("/springtest/aftercontext.html", tokens[i + 1]); if (tokens[i].equals("FORM1")) assertEquals("", tokens[i + 1]); if (tokens[i].equals("FORM2")) assertEquals("", tokens[i + 1]); - if (tokens[i].equals("FORM3")) assertEquals("", tokens[i + 1]); - if (tokens[i].equals("FORM4")) assertEquals("", tokens[i + 1]); + if (tokens[i].equals("FORM3")) assertEquals("", tokens[i + 2]); + if (tokens[i].equals("FORM4")) assertEquals("", tokens[i + 2]); //TODO verify remaining output (fix whitespace) if (tokens[i].equals("FORM9")) assertEquals("", tokens[i + 1]); if (tokens[i].equals("FORM10")) assertEquals("", tokens[i + 1]); @@ -248,7 +250,8 @@ public class VelocityMacroTests { for (int i = 0; i < tokens.length; i++) { if (tokens[i].equals("FORM1")) assertEquals("", tokens[i + 1]); // - if (tokens[i].equals("FORM2")) assertEquals("", tokens[i + 1]); + if (tokens[i].equals("FORM2")) assertEquals("", tokens[i + 2]); if (tokens[i].equals("FORM3")) assertEquals("", tokens[i + 1]); if (tokens[i].equals("FORM5")) assertEquals("