Author: dvinnichek Date: 2010-08-06 04:15:08 -0400 (Fri, 06 Aug 2010) New Revision: 23962 Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/bean/ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/bean/DayOfWeekForm.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/controller/DayOfWeekFormController.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/editor/ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/editor/DayOfWeekPropertyEditor.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/transform.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/transform.jsp.xml 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/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:transform (https://jira.jboss.org/browse/JBIDE-6711) Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/bean/DayOfWeekForm.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/bean/DayOfWeekForm.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/bean/DayOfWeekForm.java 2010-08-06 08:15:08 UTC (rev 23962) @@ -0,0 +1,14 @@ +package org.jboss.tools.vpe.spring.test.springtest.bean; + +public class DayOfWeekForm { + + private String dayOfWeekNumber = "3"; + + public String getDayOfWeekNumber() { + return dayOfWeekNumber; + } + + public void setDayOfWeekNumber(String dayOfWeekNumber) { + this.dayOfWeekNumber = dayOfWeekNumber; + } +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/bean/DayOfWeekForm.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/controller/DayOfWeekFormController.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/controller/DayOfWeekFormController.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/controller/DayOfWeekFormController.java 2010-08-06 08:15:08 UTC (rev 23962) @@ -0,0 +1,44 @@ +package org.jboss.tools.vpe.spring.test.springtest.controller; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.jboss.tools.vpe.spring.test.springtest.bean.DayOfWeekForm; +import org.jboss.tools.vpe.spring.test.springtest.editor.DayOfWeekPropertyEditor; +import org.springframework.validation.BindException; +import org.springframework.web.bind.ServletRequestDataBinder; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; + +public class DayOfWeekFormController extends SimpleFormController { + + private Map refData; + + public DayOfWeekFormController() { + + setCommandClass(DayOfWeekForm.class); + + refData = new HashMap(); + + List list = new ArrayList(); + for (int i = 0; i < 7; i++) { + list.add(String.valueOf(i)); + } + + refData.put("dayOfWeekNumbers", list); + } + + protected Map referenceData(HttpServletRequest request) throws Exception { + return refData; + } + + protected void initBinder(HttpServletRequest request, + ServletRequestDataBinder binder) throws Exception { + super.initBinder(request, binder); + binder.registerCustomEditor(String.class, new DayOfWeekPropertyEditor()); + } +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/controller/DayOfWeekFormController.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/editor/DayOfWeekPropertyEditor.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/editor/DayOfWeekPropertyEditor.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/editor/DayOfWeekPropertyEditor.java 2010-08-06 08:15:08 UTC (rev 23962) @@ -0,0 +1,67 @@ +package org.jboss.tools.vpe.spring.test.springtest.editor; + +import java.beans.PropertyEditorSupport; + +public class DayOfWeekPropertyEditor extends PropertyEditorSupport { + + public void setAsText(String text) { + if("MON".equals(text)) { + setValue("1"); + } + else if("TUE".equals(text)) { + setValue("2"); + } + else if("WED".equals(text)) { + setValue("3"); + } + else if("THU".equals(text)) { + setValue("4"); + } + else if("FRI".equals(text)) { + setValue("5"); + } + else if("SAT".equals(text)) { + setValue("6"); + } + else if("SUN".equals(text)) { + setValue("0"); + } + else { + setValue(""); + } + } + + public String getAsText() { + if(this.getValue() != null + && !(this.getValue() instanceof String)) { + return ""; + } + + String text = (String) this.getValue(); + + if("1".equals(text)) { + return "MON"; + } + else if("2".equals(text)) { + return "TUE"; + } + else if("3".equals(text)) { + return "WED"; + } + else if("4".equals(text)) { + return "THU"; + } + else if("5".equals(text)) { + return "FRI"; + } + else if("6".equals(text)) { + return "SAT"; + } + else if("0".equals(text)) { + return "SUN"; + } + else { + return text; + } + } +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/editor/DayOfWeekPropertyEditor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/transform.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/transform.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/transform.jsp 2010-08-06 08:15:08 UTC (rev 23962) @@ -0,0 +1,36 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@taglib prefix="c" + uri="http://java.sun.com/jsp/jstl/core"%> +<%@taglib prefix="spring" + uri="http://www.springframework.org/tags"%> + +<html> + <body> + <h1>Test of spring:transform</h1> + <form name="dayOfWeekForm" + action="/transform.htm" + method="POST"> + <spring:bind path="command.dayOfWeekNumber"> + <select id="dayOfWeekSelector" name="${status.expression}"> + <c:forEach var="dayOfWeekNumber" items="${dayOfWeekNumbers}" > + <span id="dayOfWeekTransformer"> + <spring:transform value="${dayOfWeekNumber}" var="dayOfWeekName"/> + </span> + <c:choose> + <c:when test="${status.value == dayOfWeekName}"> + <option value="<c:out value="${dayOfWeekName}"/>" + selected="selected"> + </c:when> + <c:otherwise> + <option value="<c:out value="${dayOfWeekName}"/>"> + </c:otherwise> + </c:choose> + <c:out value="${dayOfWeekName}"/> + </option> + </c:forEach> + </select> + </spring:bind> + </form> + </body> +</html> \ 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/transform.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/transform.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/transform.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/transform.jsp.xml 2010-08-06 08:15:08 UTC (rev 23962) @@ -0,0 +1,6 @@ +<tests> + <test id="dayOfWeekTransformer"> + <SPAN ID="dayOfWeekTransformer"> + </SPAN> + </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/transform.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-06 06:36:56 UTC (rev 23961) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-06 08:15:08 UTC (rev 23962) @@ -17,16 +17,21 @@ <bean name="/eval.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="userValidator"/> + <property name="successView" value="errors"/> </bean> <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> <property name="validator" ref="userValidator"/> + <property name="successView" value="bind"/> </bean> <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> <property name="validator" ref="beanValidator"/> + <property name="successView" value="hasBindErrors"/> </bean> <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> <property name="validator" ref="userValidator"/> + <property name="successView" value="nestedPath"/> </bean> + <bean name="/transform.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.DayOfWeekFormController"/> <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 name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> @@ -34,6 +39,7 @@ <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="viewClass" value="org.springframework.web.servlet.view.JstlView"></property> <property name="prefix" value="/WEB-INF/jsp/"></property> <property name="suffix" value=".jsp"></property> </bean> 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-06 06:36:56 UTC (rev 23961) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-06 08:15:08 UTC (rev 23962) @@ -24,4 +24,6 @@ <br/> <a href="eval.htm">eval.htm</a> <br/> +<a href="transform.htm">transform.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-06 06:36:56 UTC (rev 23961) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-06 08:15:08 UTC (rev 23962) @@ -117,6 +117,10 @@ performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/url.jsp"); //$NON-NLS-1$ } + public void testTransform() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/transform.jsp"); //$NON-NLS-1$ + } + @Override protected String getTestProjectName() { return SpringAllTests.IMPORT_PROJECT_NAME;