Author: tmjee
Date: Wed May 10 06:34:28 2006
New Revision: 405758
URL: http://svn.apache.org/viewcvs?rev=405758&view=rev
Log:
ww-1310
Added:
struts/action2/trunk/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-3.txt
(with props)
Modified:
struts/action2/trunk/core/src/main/resources/template/simple/radiomap.ftl
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
Modified:
struts/action2/trunk/core/src/main/resources/template/simple/radiomap.ftl
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/core/src/main/resources/template/simple/radiomap.ftl?rev=405758&r1=405757&r2=405758&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/simple/radiomap.ftl
(original)
+++ struts/action2/trunk/core/src/main/resources/template/simple/radiomap.ftl
Wed May 10 06:34:28 2006
@@ -1,8 +1,8 @@
<@saf.iterator value="parameters.list">
<#if parameters.listKey?exists>
- <#assign itemKey = stack.findValue(parameters.listKey)/>
+ <#assign itemKey = stack.findString(parameters.listKey)/>
<#else>
- <#assign itemKey = stack.findValue('top')/>
+ <#assign itemKey = stack.findString('top')/>
</#if>
<#if parameters.listValue?exists>
<#assign itemValue = stack.findString(parameters.listValue)/>
Modified:
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java?rev=405758&r1=405757&r2=405758&view=diff
==============================================================================
---
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
(original)
+++
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
Wed May 10 06:34:28 2006
@@ -21,11 +21,34 @@
import org.apache.struts.action2.views.jsp.AbstractUITagTest;
import java.util.HashMap;
+import java.util.LinkedHashMap;
/**
*/
public class RadioTest extends AbstractUITagTest {
+
+ public void testMapWithBooleanAsKey() throws Exception {
+ TestAction testAction = (TestAction) action;
+
+ HashMap map = new LinkedHashMap();
+ map.put(Boolean.TRUE, "male");
+ map.put(Boolean.FALSE, "female");
+ testAction.setMap(map);
+
+ RadioTag tag = new RadioTag();
+ tag.setPageContext(pageContext);
+ tag.setLabel("mylabel");
+ tag.setName("myname");
+ tag.setValue("%{'true'}");
+ tag.setList("map");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(RadioTag.class.getResource("Radio-3.txt"));
+ }
+
public void testMapChecked() throws Exception {
TestAction testAction = (TestAction) action;
Added:
struts/action2/trunk/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-3.txt
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-3.txt?rev=405758&view=auto
==============================================================================
---
struts/action2/trunk/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-3.txt
(added)
+++
struts/action2/trunk/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-3.txt
Wed May 10 06:34:28 2006
@@ -0,0 +1,7 @@
+<tr>
+ <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+ <td>
+<input type="radio" name="myname" id="mynametrue" checked="checked"
value="true"/><label for="mynametrue">male</label>
+<input type="radio" name="myname" id="mynamefalse" value="false"/><label
for="mynamefalse">female</label>
+ </td>
+</tr>
Propchange:
struts/action2/trunk/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-3.txt
------------------------------------------------------------------------------
svn:eol-style = native
