WW-5302 Adds additional test case to cover evaluating action & method attribute at the same time

Author: lukaszlenart

core/src/test/java/com/opensymphony/xwork2/TestBean.java

@@ -20,25 +20,18 @@
 
 import java.util.Date;
 
-
-/**
- * TestBean
- *
- * @author Jason Carreira
- *         Created Aug 4, 2003 12:39:53 AM
- */
 public class TestBean {
 
     private Date birth;
     private String name;
     private int count;
-    
+    private String subName;
+
     private TestChildBean child = new TestChildBean();
 
     public TestBean() {
     }
 
-
     public void setBirth(Date birth) {
         this.birth = birth;
     }
@@ -63,13 +56,19 @@ public String getName() {
         return name;
     }
 
-
     public TestChildBean getChild() {
         return child;
     }
 
-
     public void setChild(TestChildBean child) {
         this.child = child;
     }
+
+    public String getSubName() {
+        return subName;
+    }
+
+    public void setSubName(String subName) {
+        this.subName = subName;
+    }
 }

core/src/test/java/org/apache/struts2/components/FormButtonTest.java

@@ -136,4 +136,22 @@ public void testPopulateComponentHtmlId7() {
 
         assertEquals("secondAction", submit.getParameters().get("id"));
     }
+
+    public void testPopulateComponentHtmlId8() {
+        MockHttpServletRequest req = new MockHttpServletRequest();
+        MockHttpServletResponse res = new MockHttpServletResponse();
+        ValueStack stack = ActionContext.getContext().getValueStack();
+        TestBean bean = new TestBean();
+        bean.setName("boo");
+        bean.setSubName("foo");
+        stack.push(bean);
+
+        Submit submit = new Submit(stack, req, res);
+        submit.setAction("%{name}");
+        submit.setMethod("%{subName}");
+
+        submit.populateComponentHtmlId(null);
+
+        assertEquals("boo_foo", submit.getParameters().get("id"));
+    }
 }