This is an automated email from the ASF dual-hosted git repository. amashchenko pushed a commit to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2f99110189513b594da1217f8e18a783536f2f56 Author: Aleksandr Mashchenko <amashche...@apache.org> AuthorDate: Tue Dec 4 22:26:26 2018 +0200 WW-4987 Add test for listCssClass in optgroup tag (cherry picked from commit 94210a02e73a32a0e20d111ac8270191ee2cb5d6) --- .../apache/struts2/views/jsp/ui/OptGroupTest.java | 29 ++++++++++++++++ .../org/apache/struts2/views/jsp/ui/OptGroup-8.txt | 40 ++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java index d4bd0e2..81c0e12 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java @@ -253,4 +253,33 @@ public class OptGroupTest extends AbstractUITagTest { verify(SelectTag.class.getResource("OptGroup-6.txt")); } + public void testOptGroupListCssClass() throws Exception { + SelectTag selectTag = new SelectTag(); + selectTag.setName("mySelection"); + selectTag.setLabel("My Selection"); + selectTag.setList("%{#{'ONE':'one','TWO':'two','THREE':'three'}}"); + selectTag.setListCssClass("'option-css-class'"); + + OptGroupTag optGroupTag1 = new OptGroupTag(); + optGroupTag1.setLabel("My Label 1"); + optGroupTag1.setList("%{#{'AAA':'aaa','BBB':'bbb','CCC':'ccc'}}"); + optGroupTag1.setListCssClass("'optgroup-option-css-class'"); + + OptGroupTag optGroupTag2 = new OptGroupTag(); + optGroupTag2.setLabel("My Label 2"); + optGroupTag2.setList("%{#{'DDD':'ddd','EEE':'eee','FFF':'fff'}}"); + + selectTag.setPageContext(pageContext); + selectTag.doStartTag(); + optGroupTag1.setPageContext(pageContext); + optGroupTag1.doStartTag(); + optGroupTag1.doEndTag(); + optGroupTag2.setPageContext(pageContext); + optGroupTag2.doStartTag(); + optGroupTag2.doEndTag(); + selectTag.doEndTag(); + + //System.out.println(writer.toString()); + verify(SelectTag.class.getResource("OptGroup-8.txt")); + } } diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-8.txt new file mode 100644 index 0000000..bc2c30f --- /dev/null +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-8.txt @@ -0,0 +1,40 @@ +<tr> + <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td> + <td class="tdInput"> +<select name="mySelection" id="mySelection"> + <option value="ONE" class="option-css-class">one</option> + <option value="TWO" class="option-css-class">two</option> + <option value="THREE" class="option-css-class">three</option> + +<optgroup + label="My Label 1" +> + + <option value="AAA" class="optgroup-option-css-class" + >aaa + </option> + <option value="BBB" class="optgroup-option-css-class" + >bbb + </option> + <option value="CCC" class="optgroup-option-css-class" + >ccc + </option> +</optgroup> +<optgroup + label="My Label 2" +> + + <option value="DDD" + >ddd + </option> + <option value="EEE" + >eee + </option> + <option value="FFF" + >fff + </option> +</optgroup> + +</select> +</td> +</tr>