Author: mrdon
Date: Sat May 19 21:28:35 2007
New Revision: 539825
URL: http://svn.apache.org/viewvc?view=rev&rev=539825
Log:
Added tests showing WW-1519 has been fixed
WW-1519
Added:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
Added:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java?view=auto&rev=539825
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
(added)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
Sat May 19 21:28:35 2007
@@ -0,0 +1,20 @@
+package org.apache.struts2;
+
+public enum SomeEnum {
+
+ INIT("init"), COMPLETED("completed");
+
+ private String displayName;
+
+ SomeEnum(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public String getName() {
+ return name();
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+}
\ No newline at end of file
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java?view=diff&rev=539825&r1=539824&r2=539825
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java
Sat May 19 21:28:35 2007
@@ -20,6 +20,7 @@
*/
package org.apache.struts2;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -47,6 +48,7 @@
private String[][] list;
private List list2;
private List list3;
+ private SomeEnum status = SomeEnum.COMPLETED;
public Collection getCollection() {
return collection;
@@ -146,6 +148,18 @@
public String doInput() throws Exception {
return INPUT;
+ }
+
+ public SomeEnum getStatus() {
+ return status;
+ }
+
+ public void setStatus(SomeEnum status) {
+ this.status = status;
+ }
+
+ public List<SomeEnum> getStatusList() {
+ return Arrays.asList(SomeEnum.values());
}
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java?view=diff&rev=539825&r1=539824&r2=539825
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
Sat May 19 21:28:35 2007
@@ -512,6 +512,22 @@
verify(SelectTag.class.getResource("Select-11.txt"));
}
+
+ public void testEnumList() throws Exception {
+
+ SelectTag tag = new SelectTag();
+ tag.setPageContext(pageContext);
+ tag.setLabel("mylabel");
+ tag.setName("status");
+ tag.setList("statusList");
+ tag.setListKey("name");
+ tag.setListValue("displayName");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(SelectTag.class.getResource("Select-13.txt"));
+ }
public class IdName {
private String name;
Added:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt?view=auto&rev=539825
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
(added)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
Sat May 19 21:28:35 2007
@@ -0,0 +1,7 @@
+<tr>
+ <td class="tdLabel"><label for="status" class="label">mylabel:</label></td>
+ <td><select name="status" id="status">
+ <option value="INIT">init</option>
+ <option value="COMPLETED" selected="selected">completed</option>
+</select></td>
+</tr>
