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/06/21 12:16:19 UTC
svn commit: r670174 - in /struts/struts2/trunk/core/src/test:
java/org/apache/struts2/views/jsp/ui/RadioTest.java
resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
Author: mrdon
Date: Sat Jun 21 03:16:19 2008
New Revision: 670174
URL: http://svn.apache.org/viewvc?rev=670174&view=rev
Log:
Fixing test that breaks in Java 6 WW-2537
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
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=670174&r1=670173&r2=670174&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 Sat Jun 21 03:16:19 2008
@@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.TreeMap;
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
@@ -124,14 +125,14 @@
}
public void testSimpleWithStringMap() throws Exception {
- final Map<String, String> myMap = new HashMap<String, String>();
+ final Map<String, String> myMap = new TreeMap<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("#@java.util.HashMap@{\"Opt.\":\"Opt.\", \"Std.\":\"Std.\", \"\":\"N/A\"}");
+ tag.setList("#@java.util.TreeMap@{\"Opt.\":\"Opt.\", \"Std.\":\"Std.\", \"\":\"N/A\"}");
tag.doStartTag();
tag.doEndTag();
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt?rev=670174&r1=670173&r2=670174&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt Sat Jun 21 03:16:19 2008
@@ -1,11 +1,11 @@
<tr>
<td class="tdLabel"></td>
<td>
- <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>
+ <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__Std." checked="checked" value="Std."/>
+ <label for="myMap__name__Std.">Std.</label>
</td>
</tr>