You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2022/01/14 08:22:26 UTC
[struts] branch WW-5117-evaluate-dynamic-attributes-cherrypick updated: WW-5117 Adds a new attribute to test the new behaviour
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5117-evaluate-dynamic-attributes-cherrypick
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/WW-5117-evaluate-dynamic-attributes-cherrypick by this push:
new 7ed77f5 WW-5117 Adds a new attribute to test the new behaviour
7ed77f5 is described below
commit 7ed77f5f0493d5d6f4db3479a4e9639c84e096e2
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Fri Jan 14 09:22:21 2022 +0100
WW-5117 Adds a new attribute to test the new behaviour
---
.../test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java | 6 ++++--
.../test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
index b2d4fdc..f42fdbc 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
@@ -346,7 +346,8 @@ public class TextfieldTest extends AbstractUITagTest {
tag.setName("myname");
tag.setValue("%{foo}");
tag.setSize("10");
- tag.setDynamicAttribute(null, "anotherAttr", "another_%{foo}");
+ tag.setDynamicAttribute(null, "anotherAttr", "%{foo}");
+ tag.setDynamicAttribute(null, "secondAttr", "second_%{foo}");
tag.doStartTag();
tag.doEndTag();
@@ -372,7 +373,8 @@ public class TextfieldTest extends AbstractUITagTest {
tag.setName("myname");
tag.setValue("%{foo}");
tag.setSize("10");
- tag.setDynamicAttribute(null, "anotherAttr", "another_%{foo}");
+ tag.setDynamicAttribute(null, "anotherAttr", "%{foo}");
+ tag.setDynamicAttribute(null, "secondAttr", "second_%{foo}");
tag.doStartTag();
setComponentTagClearTagState(tag, true); // Ensure component tag state clearing is set true (to match tag).
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
index 6dcdedb..5dc125c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
@@ -1,4 +1,4 @@
<tr>
<td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
- <td class="tdInput"><input type="text" name="myname" size="10" value="%{1+1}" id="myname" anotherAttr="another_%{1+1}"/></td>
+ <td class="tdInput"><input type="text" name="myname" size="10" value="%{1+1}" id="myname" anotherAttr="%{1+1}" secondAttr="second_%{1+1}"/></td>
</tr>