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 2014/07/30 09:16:51 UTC
[15/17] git commit: Extends test case to demonstrate possible usage
of listValueKey
Extends test case to demonstrate possible usage of listValueKey
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8e6f198d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8e6f198d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8e6f198d
Branch: refs/heads/feature/WW-4295-localization
Commit: 8e6f198d41c01aa4b34645f558b209190f72510b
Parents: d20c2f1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jul 30 09:08:34 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jul 30 09:08:34 2014 +0200
----------------------------------------------------------------------
.../views/jsp/ui/LocaleKeyValueTest.java | 11 ++++++++++
.../struts2/views/jsp/ui/LocaleTestAction.java | 17 ++++++++++++++++
.../struts2/views/jsp/ui/OptGroupTest.java | 21 ++++++++------------
.../apache/struts2/views/jsp/ui/OptGroup-6.txt | 8 ++++----
4 files changed, 40 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/8e6f198d/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleKeyValueTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleKeyValueTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleKeyValueTest.java
new file mode 100644
index 0000000..5ea01a7
--- /dev/null
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleKeyValueTest.java
@@ -0,0 +1,11 @@
+package org.apache.struts2.views.jsp.ui;
+
+public enum LocaleKeyValueTest {
+
+ ONE, TWO, THREE;
+
+ public String getValueKey() {
+ return getClass().getSimpleName() + "." + name();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/8e6f198d/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleTestAction.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleTestAction.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleTestAction.java
new file mode 100644
index 0000000..ad2a4b5
--- /dev/null
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleTestAction.java
@@ -0,0 +1,17 @@
+package org.apache.struts2.views.jsp.ui;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.struts2.TestAction;
+
+import com.opensymphony.xwork2.Action;
+
+public class LocaleTestAction extends TestAction implements Action {
+
+ @SuppressWarnings("unused")
+ public List<LocaleKeyValueTest> getSelectValues() {
+ return Arrays.asList(LocaleKeyValueTest.values());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/8e6f198d/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java
----------------------------------------------------------------------
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 038cb6a..de9d34b 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
@@ -23,13 +23,9 @@ package org.apache.struts2.views.jsp.ui;
import java.util.LinkedHashMap;
-import com.opensymphony.xwork2.Action;
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-/**
- *
- */
public class OptGroupTest extends AbstractUITagTest {
public void testOptGroupSimple() throws Exception {
@@ -129,7 +125,7 @@ public class OptGroupTest extends AbstractUITagTest {
((TestAction)action).setMap(new LinkedHashMap() {{
put("AAA", "aaa");
- put(new Long(111111), "bbb");
+ put(111111L, "bbb");
put("CCC", "ccc");
}});
@@ -192,20 +188,19 @@ public class OptGroupTest extends AbstractUITagTest {
verify(SelectTag.class.getResource("OptGroup-5.txt"));
}
+
public void testOptGroupWithValueKey() throws Exception {
SelectTag selectTag = new SelectTag();
selectTag.setName("mySelection");
selectTag.setLabel("My Selection");
- selectTag.setList("%{#{'ONE':'one','TWO':'two','THREE':'three'}}");
+ selectTag.setList("selectValues");
selectTag.setListValueKey("valueKey");
- stack.push(new Action() {
- public String execute() throws Exception {
- return SUCCESS;
- }
-
- public String getValueKey() { return "MyValue"; }
- });
+ LocaleTestAction localeTestAction = new LocaleTestAction();
+
+ localeTestAction.setText("LocaleKeyValueTest.ONE","Edno");
+ localeTestAction.setText("LocaleKeyValueTest.TWO","Dve");
+ stack.push(localeTestAction);
OptGroupTag optGroupTag1 = new OptGroupTag();
optGroupTag1.setLabel("My Label 1");
http://git-wip-us.apache.org/repos/asf/struts/blob/8e6f198d/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
index 401ef44..99ed297 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
@@ -2,9 +2,9 @@
<td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
<td>
<select name="mySelection" id="mySelection">
- <option value="ONE">MyValue</option>
- <option value="TWO">MyValue</option>
- <option value="THREE">MyValue</option>
+ <option value="ONE">Edno</option>
+ <option value="TWO">Dve</option>
+ <option value="THREE">LocaleKeyValueTest.THREE</option>
<optgroup
label="My Label 1"
@@ -37,4 +37,4 @@
</select>
</td>
-</tr>
\ No newline at end of file
+</tr>