Author: mrdon
Date: Fri Jun 20 06:01:59 2008
New Revision: 669881
URL: http://svn.apache.org/viewvc?rev=669881&view=rev
Log:
Adding a test to prove radio tag properly handles a map of strings
WW-2046
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
- copied, changed from r669878,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt
Modified:
struts/struts2/trunk/core/src/site/resources/tags/a.html
struts/struts2/trunk/core/src/site/resources/tags/actionerror.html
struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html
struts/struts2/trunk/core/src/site/resources/tags/checkbox.html
struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
struts/struts2/trunk/core/src/site/resources/tags/combobox.html
struts/struts2/trunk/core/src/site/resources/tags/component.html
struts/struts2/trunk/core/src/site/resources/tags/debug.html
struts/struts2/trunk/core/src/site/resources/tags/div.html
struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
struts/struts2/trunk/core/src/site/resources/tags/fielderror.html
struts/struts2/trunk/core/src/site/resources/tags/file.html
struts/struts2/trunk/core/src/site/resources/tags/form.html
struts/struts2/trunk/core/src/site/resources/tags/head.html
struts/struts2/trunk/core/src/site/resources/tags/hidden.html
struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html
struts/struts2/trunk/core/src/site/resources/tags/label.html
struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
struts/struts2/trunk/core/src/site/resources/tags/password.html
struts/struts2/trunk/core/src/site/resources/tags/radio.html
struts/struts2/trunk/core/src/site/resources/tags/select.html
struts/struts2/trunk/core/src/site/resources/tags/submit.html
struts/struts2/trunk/core/src/site/resources/tags/textarea.html
struts/struts2/trunk/core/src/site/resources/tags/textfield.html
struts/struts2/trunk/core/src/site/resources/tags/token.html
struts/struts2/trunk/core/src/site/resources/tags/updownselect.html
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
Modified: struts/struts2/trunk/core/src/site/resources/tags/a.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/a.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/a.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/a.html Fri Jun 20
06:01:59 2008
@@ -113,7 +113,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/actionerror.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/actionerror.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/actionerror.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/actionerror.html Fri Jun
20 06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html Fri
Jun 20 06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/checkbox.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/checkbox.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/checkbox.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/checkbox.html Fri Jun 20
06:01:59 2008
@@ -113,7 +113,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html Fri Jun
20 06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/combobox.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/combobox.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/combobox.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/combobox.html Fri Jun 20
06:01:59 2008
@@ -129,7 +129,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/component.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/component.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/component.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/component.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/debug.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/debug.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/debug.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/debug.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/div.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/div.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/div.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/div.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html Fri Jun
20 06:01:59 2008
@@ -369,7 +369,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/fielderror.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/fielderror.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/fielderror.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/fielderror.html Fri Jun
20 06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/file.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/file.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/file.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/file.html Fri Jun 20
06:01:59 2008
@@ -113,7 +113,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/form.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/form.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/form.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/form.html Fri Jun 20
06:01:59 2008
@@ -137,7 +137,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/head.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/head.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/head.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/head.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/hidden.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/hidden.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/hidden.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/hidden.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified:
struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html
Fri Jun 20 06:01:59 2008
@@ -169,7 +169,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/label.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/label.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/label.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/label.html Fri Jun 20
06:01:59 2008
@@ -113,7 +113,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified:
struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
Fri Jun 20 06:01:59 2008
@@ -505,7 +505,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/password.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/password.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/password.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/password.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/radio.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/radio.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/radio.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/radio.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/select.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/select.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/select.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/select.html Fri Jun 20
06:01:59 2008
@@ -129,7 +129,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/submit.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/submit.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/submit.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/submit.html Fri Jun 20
06:01:59 2008
@@ -121,7 +121,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/textarea.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/textarea.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/textarea.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/textarea.html Fri Jun 20
06:01:59 2008
@@ -113,7 +113,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/textfield.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/textfield.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/textfield.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/textfield.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/token.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/token.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/token.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/token.html Fri Jun 20
06:01:59 2008
@@ -105,7 +105,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/updownselect.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/updownselect.html?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/updownselect.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/updownselect.html Fri Jun
20 06:01:59 2008
@@ -153,7 +153,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">Label
expression used for rendering a element specific label</td>
+ <td align="left" valign="top">Label
expression used for rendering an element specific label</td>
</tr>
<tr>
<td align="left"
valign="top">labelSeparator</td>
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java?rev=669881&r1=669880&r2=669881&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
Fri Jun 20 06:01:59 2008
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.Map;
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
@@ -122,6 +123,21 @@
verify(RadioTag.class.getResource("Radio-1.txt"));
}
+ public void testSimpleWithStringMap() throws Exception {
+ final Map<String, String> myMap = new HashMap<String, String>();
+ myMap.put("name", "Std.");
+ stack.push(new HashMap() {{ put ("myMap", myMap); }});
+
+ RadioTag tag = new RadioTag();
+ tag.setPageContext(pageContext);
+ tag.setName("myMap['name']");
+ tag.setList("[EMAIL PROTECTED]@{\"Opt.\":\"Opt.\", \"Std.\":\"Std.\",
\"\":\"N/A\"}");
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(RadioTag.class.getResource("Radio-6.txt"));
+ }
+
public void testSimpleWithLabelSeparator() throws Exception {
TestAction testAction = (TestAction) action;
testAction.setFoo("bar");
Copied:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
(from r669878,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt?p2=struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt&p1=struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt&r1=669878&r2=669881&rev=669881&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
Fri Jun 20 06:01:59 2008
@@ -1,7 +1,11 @@
<tr>
- <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+ <td class="tdLabel"></td>
<td>
-<input type="radio" name="myname" id="mynamehello" value="hello"/><label
for="mynamehello">world</label>
-<input type="radio" name="myname" id="mynamefoo" value="foo"/><label
for="mynamefoo">bar</label>
+ <input type="radio" name="myMap['name']" id="myMap__name__Std."
checked="checked" value="Std."/>
+ <label for="myMap__name__Std.">Std.</label>
+ <input type="radio" name="myMap['name']" id="myMap__name__Opt."
value="Opt."/>
+ <label for="myMap__name__Opt.">Opt.</label>
+ <input type="radio" name="myMap['name']" id="myMap__name__"value=""/>
+ <label for="myMap__name__">N/A</label>
</td>
</tr>
