Author: dvinnichek Date: 2010-08-04 07:18:19 -0400 (Wed, 04 Aug 2010) New Revision: 23914 Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/BeanValidator.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/UserValidator.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml Removed: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/FieldValidator.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java Log: add tests for spring:hasBindErrors (https://jira.jboss.org/browse/JBIDE-6711) Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-04 11:05:44 UTC (rev 23913) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-04 11:18:19 UTC (rev 23914) @@ -443,7 +443,7 @@ </vpe:tag> <vpe:tag name="spring:hasBindErrors" case-sensitive="yes"> - <vpe:template children="no" modify="no" /> + <vpe:template children="yes" modify="no" /> </vpe:tag> <vpe:tag name="spring:htmlEscape" case-sensitive="yes"> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java 2010-08-04 11:05:44 UTC (rev 23913) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java 2010-08-04 11:18:19 UTC (rev 23914) @@ -24,6 +24,7 @@ private String selectedCategory; private User user; + private String verificationNum; public FormBean() { for (CategoryType categoryType : CategoryType.values()) { @@ -109,6 +110,14 @@ this.user = user; } + public String getVerificationNum() { + return verificationNum; + } + + public void setVerificationNum(String verificationNum) { + this.verificationNum = verificationNum; + } + public String getSelectedCategory() { return selectedCategory; } Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/BeanValidator.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/BeanValidator.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/BeanValidator.java 2010-08-04 11:18:19 UTC (rev 23914) @@ -0,0 +1,14 @@ +package org.jboss.tools.vpe.spring.test.springtest.validator; + +import org.springframework.validation.Errors; +import org.springframework.validation.ValidationUtils; + +public class BeanValidator extends UserValidator { + + @Override + public void validate(Object target, Errors errors) { + super.validate(target, errors); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "verificationNum", "required", "Verification Number is required."); + } + +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/BeanValidator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Deleted: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/FieldValidator.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/FieldValidator.java 2010-08-04 11:05:44 UTC (rev 23913) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/FieldValidator.java 2010-08-04 11:18:19 UTC (rev 23914) @@ -1,17 +0,0 @@ -package org.jboss.tools.vpe.spring.test.springtest.validator; - -import org.springframework.validation.Errors; -import org.springframework.validation.ValidationUtils; -import org.springframework.validation.Validator; - -public class FieldValidator implements Validator{ - - public boolean supports(Class<?> clazz) { - return true; - } - - public void validate(Object target, Errors errors) { - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "user.firstName", "required", "First Name is required."); - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "user.lastName", "required", "Last Name is required."); - } -} Copied: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/UserValidator.java (from rev 23905, trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/FieldValidator.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/UserValidator.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/validator/UserValidator.java 2010-08-04 11:18:19 UTC (rev 23914) @@ -0,0 +1,17 @@ +package org.jboss.tools.vpe.spring.test.springtest.validator; + +import org.springframework.validation.Errors; +import org.springframework.validation.ValidationUtils; +import org.springframework.validation.Validator; + +public class UserValidator implements Validator{ + + public boolean supports(Class<?> clazz) { + return true; + } + + public void validate(Object target, Errors errors) { + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "user.firstName", "required", "First Name is required."); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "user.lastName", "required", "Last Name is required."); + } +} Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp 2010-08-04 11:18:19 UTC (rev 23914) @@ -0,0 +1,71 @@ +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<html> +<head> +<style> +.error { + -moz-appearance: none; + color: red; + font: bold; +} +</style> +</head> +<body> +<h1>Test of spring:hasBindErrors</h1> + +<div id="formBeanErrors"> + <spring:hasBindErrors name="formBean"> + <div style="border: 1px solid red; width: 300px;"> + <h2>Errors for all bean fields</h2> + <div class="error"> + <ul> + <c:forEach var="error" items="${errors.allErrors}"> + <li>${error.defaultMessage}</li> + </c:forEach> + </ul> + </div> + </div> + </spring:hasBindErrors> +</div><br/> + +<div id="userErrors"> + <spring:hasBindErrors name="formBean"> + <div style="border: 1px solid red; width: 300px;"> + <h2>Errors for all user fields only</h2> + <div class="error"> + <ul> + <spring:bind path="formBean.user.*"> + <c:forEach var="error" items="${status.errorMessages}"> + <li>${error}</li> + </c:forEach> + </spring:bind> + </ul> + </div> + </div> + </spring:hasBindErrors> +</div> + +<form:form modelAttribute="formBean"> + + <table> + <tr> + <td>First Name:</td> + <td><form:input path="user.firstName" /></td> + </tr> + <tr> + <td>Last Name:</td> + <td><form:input path="user.lastName" /></td> + </tr> + <tr> + <td>Verification Number:</td> + <td><form:input path="verificationNum" /></td> + </tr> + <tr> + <td colspan="2" align="right"><input type="submit" value="Test" /></td> + </tr> + </table> + +</form:form> +</body> +</html> Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml 2010-08-04 11:18:19 UTC (rev 23914) @@ -0,0 +1,69 @@ +<tests> + <test id="formBeanErrors"> + <DIV ID="formBeanErrors"> + <DIV STYLE="border: 1px solid red; width: 300px;"> + <H2> + <SPAN CLASS="vpe-text"> + Errors for all bean fields + </SPAN> + </H2> + <DIV CLASS="error"> + <UL> + <SPAN CLASS="vpe-text"> + <LI> + <SPAN CLASS="vpe-text"> + ${error.defaultMessage} + </SPAN> + </LI> + <LI> + <SPAN CLASS="vpe-text"> + ${error.defaultMessage} + </SPAN> + </LI> + <LI> + <SPAN CLASS="vpe-text"> + ${error.defaultMessage} + </SPAN> + </LI> + </SPAN> + </UL> + </DIV> + </DIV> + </DIV> + </test> + <test id="userErrors"> + <DIV ID="userErrors"> + <DIV STYLE="border: 1px solid red; width: 300px;"> + <H2> + <SPAN CLASS="vpe-text"> + Errors for all user fields only + </SPAN> + </H2> + <DIV CLASS="error"> + <UL> + <SPAN CLASS="vpe-text"> + formBean.user.*&lt;= + <SPAN CLASS="vpe-text"> + <LI> + <SPAN CLASS="vpe-text"> + ${error} + </SPAN> + </LI> + <LI> + <SPAN CLASS="vpe-text"> + ${error} + </SPAN> + </LI> + <LI> + <SPAN CLASS="vpe-text"> + ${error} + </SPAN> + </LI> + </SPAN> + </SPAN> + </UL> + </DIV> + </DIV> + </DIV> + </test> +</tests> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-04 11:05:44 UTC (rev 23913) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-04 11:18:19 UTC (rev 23914) @@ -15,14 +15,18 @@ <bean name="/option.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean name="/options.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="fieldValidator"/> + <property name="validator" ref="userValidator"/> </bean> <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="fieldValidator"/> + <property name="validator" ref="userValidator"/> </bean> + <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="beanValidator"/> + </bean> <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean id="fieldValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.FieldValidator"/> + <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> + <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> <property name="prefix" value="/WEB-INF/jsp/"></property> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-04 11:05:44 UTC (rev 23913) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-04 11:18:19 UTC (rev 23914) @@ -16,6 +16,8 @@ <br/> <a href="bind.htm">bind.htm</a> <br/> +<a href="hasBindErrors.htm">hasBindErrors.htm</a> +<br/> <a href="select.htm">select.htm</a> <br/> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-04 11:05:44 UTC (rev 23913) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-04 11:18:19 UTC (rev 23914) @@ -57,6 +57,10 @@ performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/errors.jsp"); //$NON-NLS-1$ } + public void testHasBindErrors() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp"); //$NON-NLS-1$ + } + public void testBind() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/bind.jsp"); //$NON-NLS-1$ }