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 b4317553323c5e384080eed5eaa49e92d6ebd52a Author: Aleksandr Mashchenko <amashche...@apache.org> AuthorDate: Wed Dec 5 21:56:30 2018 +0200 Improve optgroup list attributes test (cherry picked from commit 48d40ae6ac3a6cb72ef72b677b66b60672b46ad0) --- .../apache/struts2/views/jsp/ui/OptGroupTest.java | 21 ++++++++++++--------- .../org/apache/struts2/views/jsp/ui/OptGroup-8.txt | 12 ++++++------ 2 files changed, 18 insertions(+), 15 deletions(-) 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 07da6f6..5a2b351 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 @@ -257,21 +257,24 @@ public class OptGroupTest extends AbstractUITagTest { SelectTag selectTag = new SelectTag(); selectTag.setName("mySelection"); selectTag.setLabel("My Selection"); - selectTag.setList("%{#{'ONE':'one','TWO':'two','THREE':'three'}}"); - selectTag.setListCssClass("'option-css-class'"); - selectTag.setListCssStyle("'background-color: green;'"); - selectTag.setListTitle("'option-title'"); + selectTag.setList("#{'ONE':'one','TWO':'two','THREE':'three'}"); + selectTag.setListCssClass("'option-css-class ' + key"); + selectTag.setListCssStyle("'background-color: green; font-family: ' + key"); + selectTag.setListTitle("'option-title' + key"); OptGroupTag optGroupTag1 = new OptGroupTag(); optGroupTag1.setLabel("My Label 1"); - optGroupTag1.setList("%{#{'AAA':'aaa','BBB':'bbb','CCC':'ccc'}}"); - optGroupTag1.setListCssClass("'optgroup-option-css-class'"); - optGroupTag1.setListCssStyle("'background-color: blue;'"); - optGroupTag1.setListTitle("'optgroup-option-title'"); + optGroupTag1.setList("#{'AAA':'aaa','BBB':'bbb','CCC':'ccc'}"); + optGroupTag1.setListCssClass("'optgroup-option-css-class ' + key"); + optGroupTag1.setListCssStyle("'background-color: blue; font-family: ' + key"); + optGroupTag1.setListTitle("'optgroup-option-title' + key"); OptGroupTag optGroupTag2 = new OptGroupTag(); optGroupTag2.setLabel("My Label 2"); - optGroupTag2.setList("%{#{'DDD':'ddd','EEE':'eee','FFF':'fff'}}"); + optGroupTag2.setList("#{'DDD':'ddd','EEE':'eee','FFF':'fff'}"); + optGroupTag2.setListCssClass("notExistingProperty"); + optGroupTag2.setListCssStyle("notExistingProperty"); + optGroupTag2.setListTitle("notExistingProperty"); selectTag.setPageContext(pageContext); selectTag.doStartTag(); 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 index fbde2bc..79468fe 100644 --- 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 @@ -2,21 +2,21 @@ <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" style="background-color: green;" title="option-title">one</option> - <option value="TWO" class="option-css-class" style="background-color: green;" title="option-title">two</option> - <option value="THREE" class="option-css-class" style="background-color: green;" title="option-title">three</option> + <option value="ONE" class="option-css-class ONE" style="background-color: green; font-family: ONE" title="option-title ONE">one</option> + <option value="TWO" class="option-css-class TWO" style="background-color: green; font-family: TWO" title="option-title TWO">two</option> + <option value="THREE" class="option-css-class THREE" style="background-color: green; font-family: THREE" title="option-title THREE">three</option> <optgroup label="My Label 1" > - <option value="AAA" class="optgroup-option-css-class" style="background-color: blue;" title="optgroup-option-title" + <option value="AAA" class="optgroup-option-css-class AAA" style="background-color: blue; font-family: AAA" title="optgroup-option-title AAA" >aaa </option> - <option value="BBB" class="optgroup-option-css-class" style="background-color: blue;" title="optgroup-option-title" + <option value="BBB" class="optgroup-option-css-class BBB" style="background-color: blue; font-family: BBB" title="optgroup-option-title BBB" >bbb </option> - <option value="CCC" class="optgroup-option-css-class" style="background-color: blue;" title="optgroup-option-title" + <option value="CCC" class="optgroup-option-css-class CCC" style="background-color: blue; font-family: CCC" title="optgroup-option-title CCC" >ccc </option> </optgroup>