From 344eaf3e3308b24a2f7cdc2dda29042ccbf35374 Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Sun, 20 May 2007 04:28:35 +0000
Subject: [PATCH] Added tests showing WW-1519 has been fixed WW-1519

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@539825 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/struts2/SomeEnum.java     | 20 +++++++++++++++++++
 .../java/org/apache/struts2/TestAction.java   | 14 +++++++++++++
 .../struts2/views/jsp/ui/SelectTest.java      | 16 +++++++++++++++
 .../apache/struts2/views/jsp/ui/Select-13.txt |  7 +++++++
 4 files changed, 57 insertions(+)
 create mode 100644 core/src/test/java/org/apache/struts2/SomeEnum.java
 create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt

diff --git a/core/src/test/java/org/apache/struts2/SomeEnum.java b/core/src/test/java/org/apache/struts2/SomeEnum.java
new file mode 100644
index 000000000..0c83804f4
--- /dev/null
+++ b/core/src/test/java/org/apache/struts2/SomeEnum.java
@@ -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
diff --git a/core/src/test/java/org/apache/struts2/TestAction.java b/core/src/test/java/org/apache/struts2/TestAction.java
index 3bc050ba6..e09e4772b 100644
--- a/core/src/test/java/org/apache/struts2/TestAction.java
+++ b/core/src/test/java/org/apache/struts2/TestAction.java
@@ -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 @@ public class TestAction extends ActionSupport {
     private String[][] list;
     private List list2;
     private List list3;
+    private SomeEnum status = SomeEnum.COMPLETED;
 
     public Collection getCollection() {
         return collection;
@@ -148,4 +150,16 @@ public class TestAction extends ActionSupport {
         return INPUT;
     }
 
+	public SomeEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(SomeEnum status) {
+		this.status = status;
+	}
+    
+    public List<SomeEnum> getStatusList() {
+    	return Arrays.asList(SomeEnum.values());
+    }
+
 }
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
index dfcefa0e6..80358b370 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
@@ -512,6 +512,22 @@ public class SelectTest extends AbstractUITagTest {
 
         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;
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
new file mode 100644
index 000000000..910151416
--- /dev/null
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
@@ -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>