You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2008/01/25 13:22:22 UTC

svn commit: r615201 - in /struts/struts2/trunk/core/src/test: java/org/apache/struts2/views/jsp/ui/RadioTest.java resources/org/apache/struts2/views/jsp/ui/Radio-5.txt

Author: mrdon
Date: Fri Jan 25 04:22:22 2008
New Revision: 615201

URL: http://svn.apache.org/viewvc?rev=615201&view=rev
Log:
Adding test to ensure label separator for radio tag works WW-2343

Added:
    struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt
Modified:
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java

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=615201&r1=615200&r2=615201&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 Jan 25 04:22:22 2008
@@ -121,6 +121,30 @@
         verify(RadioTag.class.getResource("Radio-1.txt"));
     }
 
+    public void testSimpleWithLabelSeparator() throws Exception {
+        TestAction testAction = (TestAction) action;
+        testAction.setFoo("bar");
+        testAction.setList(new String[][]{
+                {"hello", "world"},
+                {"foo", "bar"}
+        });
+
+        RadioTag tag = new RadioTag();
+        tag.setPageContext(pageContext);
+        tag.setLabel("mylabel");
+        tag.setName("myname");
+        tag.setValue("");
+        tag.setList("list");
+        tag.setListKey("top[0]");
+        tag.setListValue("top[1]");
+        tag.setLabelSeparator("--");
+
+        tag.doStartTag();
+        tag.doEndTag();
+
+        verify(RadioTag.class.getResource("Radio-5.txt"));
+    }
+
     public void testGenericSimple() throws Exception {
         RadioTag tag = new RadioTag();
         prepareTagGeneric(tag);

Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt?rev=615201&view=auto
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt Fri Jan 25 04:22:22 2008
@@ -0,0 +1,7 @@
+<tr>
+    <td class="tdLabel"><label for="myname" class="label">mylabel--</label></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>
+    </td>
+</tr>