Author: dvinnichek Date: 2010-08-02 08:55:27 -0400 (Mon, 02 Aug 2010) New Revision: 23865 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/webapp/WEB-INF/jsp/checkbox.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkboxes.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/errors.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobuttons.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java Log: add component content tests for form:checkboxes, form:radiobutton, form:radiobuttons and form:errors 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-02 12:03:20 UTC (rev 23864) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-02 12:55:27 UTC (rev 23865) @@ -339,7 +339,7 @@ <vpe:if test="attrpresent('itemLabel')"> <vpe:template children="no" modify="no"> <span class="vpe-text"> - <input type="radio" id="{@id}" style="{@cssStyle}" class="{@cssClass}" + <input type="radio" id="{@id}1" style="{@cssStyle}" class="{@cssClass}" disabled="disabled" name="{@path}"/> <label> <vpe:value expr=&quot;{@items}.{(a)itemLabel}&quot; /> @@ -352,7 +352,7 @@ </vpe:if> <vpe:template children="no" modify="no"> <span class="vpe-text"> - <input type="radio" id="{@id}" style="{@cssStyle}" class="{@cssClass}" + <input type="radio" id="{@id}1" style="{@cssStyle}" class="{@cssClass}" disabled="disabled" name="{@path}"/> <label> <vpe:value expr="{@items}" /> @@ -366,7 +366,7 @@ <vpe:if test="attrpresent('itemLabel')"> <vpe:template children="no" modify="no"> <span class="vpe-text"> - <input type="radio" id="{@id}" style="{@cssStyle}" class="{@cssClass}" + <input type="radio" id="{@id}1" style="{@cssStyle}" class="{@cssClass}" name="{@path}"/> <label> <vpe:value expr=&quot;{@items}.{(a)itemLabel}&quot; /> @@ -379,7 +379,7 @@ </vpe:if> <vpe:template children="no" modify="no"> <span class="vpe-text"> - <input type="radio" id="{@id}" style="{@cssStyle}" class="{@cssClass}" + <input type="radio" id="{@id}1" style="{@cssStyle}" class="{@cssClass}" name="{@path}"/> <label> <vpe:value expr="{@items}" /> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkbox.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkbox.jsp.xml 2010-08-02 12:03:20 UTC (rev 23864) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkbox.jsp.xml 2010-08-02 12:55:27 UTC (rev 23865) @@ -11,8 +11,7 @@ <INPUT TYPE="checkbox" CLASS="tall-checkbox" ID="checkbox2" STYLE="width: 30px;" /> <LABEL> - form:checkbox with id, path, cssStyle, cssClass and label - attributes. (Must be big square.) + form:checkbox with id, path, cssStyle, cssClass and label attributes. (Must look as a big square.) </LABEL> </SPAN> </test> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkboxes.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkboxes.jsp.xml 2010-08-02 12:03:20 UTC (rev 23864) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/checkboxes.jsp.xml 2010-08-02 12:55:27 UTC (rev 23865) @@ -14,7 +14,7 @@ <test id="checkboxes3"> <span> <input id="checkboxes31" disabled="disabled" type="checkbox"/> - <label>${formBean.availableCategories}.id</label> + <label>${formBean.favoriteCategories}.id</label> </span> </test> </tests> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/errors.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/errors.jsp.xml 2010-08-02 12:03:20 UTC (rev 23864) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/errors.jsp.xml 2010-08-02 12:55:27 UTC (rev 23865) @@ -9,7 +9,7 @@ Errors for user.firstName field. </span> </test> - <test id="nameErrors2"> + <test id="lastNameErrors"> <span id="lastNameErrors" style="color: red;"> Errors for user.lastName field. </span> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobuttons.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobuttons.jsp.xml 2010-08-02 12:03:20 UTC (rev 23864) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/radiobuttons.jsp.xml 2010-08-02 12:55:27 UTC (rev 23865) @@ -2,13 +2,13 @@ <test id="radiobuttons1"> <span> <input id="radiobuttons11" type="radio"/> - <label>${formBean.favoriteCategories}</label> + <label>${formBean.availableCategories}</label> </span> </test> <test id="radiobuttons2"> <span> <input id="radiobuttons21" type="radio" class="tall-radiobuttons" style="width: 30px;"/> - <label>${formBean.favoriteCategories}</label> + <label>${formBean.availableCategories}</label> </span> </test> <test id="radiobuttons3"> 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-02 12:03:20 UTC (rev 23864) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-02 12:55:27 UTC (rev 23865) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.vpe.spring.test; +import org.eclipse.core.resources.IFile; import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.ui.test.TestUtil; /** * Tests for the context that was generated by Spring templates @@ -33,6 +35,22 @@ performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/checkbox.jsp"); //$NON-NLS-1$ } + public void testCheckboxes() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/checkboxes.jsp"); //$NON-NLS-1$ + } + + public void testRadiobutton() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/radiobutton.jsp"); //$NON-NLS-1$ + } + + public void testRadiobuttons() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/radiobuttons.jsp"); //$NON-NLS-1$ + } + + public void testErrors() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/errors.jsp"); //$NON-NLS-1$ + } + @Override protected String getTestProjectName() { return SpringAllTests.IMPORT_PROJECT_NAME;