svn commit: r541522 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/components/ test/java/org/apache/struts2/dispatcher/ test/java/org/apache/struts2/views/jsp/

[mrdon]

Author: mrdon
Date: Thu May 24 20:33:45 2007
New Revision: 541522

URL: http://svn.apache.org/viewvc?view=rev&rev=541522
Log:
Changing component parameters to use linkedHashMap (preserve order), fixed tests
to reflect this
WW-1942

Modified:
    
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java
    
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
    
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java?view=diff&rev=541522&r1=541521&r2=541522
==============================================================================
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java
 Thu May 24 20:33:45 2007
@@ -23,8 +23,8 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Writer;
-import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Stack;
 
@@ -65,7 +65,7 @@
      */
     public Component(ValueStack stack) {
         this.stack = stack;
-        this.parameters = new HashMap();
+        this.parameters = new LinkedHashMap();
         getComponentStack().push(this);
     }
 

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java?view=diff&rev=541522&r1=541521&r2=541522
==============================================================================
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
 Thu May 24 20:33:45 2007
@@ -102,7 +102,7 @@
         control.replay();
         result.setActionMapper(container.getInstance(ActionMapper.class));
         result.execute(mockInvocation);
-        
assertEquals("/myNamespace/myAction.action?param2=value+2&param1=value+1&param3=value+3",
 res.getRedirectedUrl());
+        
assertEquals("/myNamespace/myAction.action?param1=value+1&param2=value+2&param3=value+3",
 res.getRedirectedUrl());
 
         control.verify();
     }
@@ -156,7 +156,7 @@
         control.replay();
         result.setActionMapper(container.getInstance(ActionMapper.class));
         result.execute(mockInvocation);
-        
assertEquals("/myNamespace/myAction.action?param2=value+2&param1=value+1&param3=value+3",
 res.getRedirectedUrl());
+        
assertEquals("/myNamespace/myAction.action?param1=value+1&param2=value+2&param3=value+3",
 res.getRedirectedUrl());
 
         control.verify();
     }

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java?view=diff&rev=541522&r1=541521&r2=541522
==============================================================================
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
 Thu May 24 20:33:45 2007
@@ -223,7 +223,7 @@
         tag.component.addParameter("param1", "value1");
         tag.component.addParameter("param2", "value2");
         tag.doEndTag();
-        
assertEquals("/TestAction.action?param2=value2&param0=value0&param1=value1",
 writer.toString());
+        
assertEquals("/TestAction.action?param0=value0&param1=value1&param2=value2",
 writer.toString());
     }
 
     public void testEvaluateValue() throws Exception {
@@ -281,7 +281,7 @@
         paramTag.doEndTag();
         urlTag.doEndTag();
 
-        assertEquals(writer.getBuffer().toString(), 
"/context/someAction.action?name=John&id=33");
+        assertEquals("/context/someAction.action?id=33&name=John", 
writer.getBuffer().toString());
     }
 
     public void testParamPrecedenceWithAnchor() throws Exception {
@@ -304,7 +304,7 @@
         paramTag.doEndTag();
         urlTag.doEndTag();
 
-        assertEquals(writer.getBuffer().toString(), 
"/context/someAction.action?name=John&id=33#testAnchor");
+        
assertEquals("/context/someAction.action?id=33&name=John#testAnchor", 
writer.getBuffer().toString());
     }
 
     public void testPutId() throws Exception {
@@ -391,7 +391,7 @@
 
         tag.doEndTag();
 
-        
assertEquals("/team.action?section=team&year=2006&company=acme+inc", 
writer.toString());
+        
assertEquals("/team.action?section=team&company=acme+inc&year=2006", 
writer.toString());
     }
 
     public void testRequestURINoActionIncludeAll() throws Exception {
@@ -413,7 +413,7 @@
 
         tag.doEndTag();
 
-        
assertEquals("/public/about?section=team&year=2006&company=acme+inc", 
writer.toString());
+        
assertEquals("/public/about?section=team&company=acme+inc&year=2006", 
writer.toString());
     }
 
     public void testUnknownIncludeParam() throws Exception {