Author: tmjee
Date: Sun Apr 23 00:19:46 2006
New Revision: 396239
URL: http://svn.apache.org/viewcvs?rev=396239&view=rev
Log:
ww-1266
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/URL.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/URL.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/URL.java?rev=396239&r1=396238&r2=396239&view=diff
==============================================================================
---
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/URL.java
(original)
+++
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/URL.java
Sun Apr 23 00:19:46 2006
@@ -148,7 +148,8 @@
// no explicit url set so attach params from current url, do
// this at start so body params can override any of these they wish.
try {
- String includeParams = null;
+ // ww-1266
+ String includeParams = GET;
if (this.includeParams != null) {
includeParams = findString(this.includeParams);
Modified:
incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java?rev=396239&r1=396238&r2=396239&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
(original)
+++
incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
Sun Apr 23 00:19:46 2006
@@ -17,8 +17,17 @@
*/
package org.apache.struts.action2.views.jsp;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.servlet.jsp.JspWriter;
+import org.apache.struts.action2.components.URL;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+import com.opensymphony.xwork.util.OgnlValueStack;
+
/**
* Unit test for [EMAIL PROTECTED] URLTag}.
*
@@ -27,6 +36,31 @@
private URLTag tag;
+ public void testIncludeParamsDefaultToGET() throws Exception {
+ request.setQueryString("one=oneVal&two=twoVal&three=threeVal");
+
+ // request parameter map should not have any effect, as includeParams
+ // default to GET, which get its param from request.getQueryString()
+ Map tmp = new HashMap();
+ tmp.put("one", "aaa");
+ tmp.put("two", "bbb");
+ tmp.put("three", "ccc");
+ request.setParameterMap(tmp);
+
+ tag.setValue("TestAction.acton");
+
+ tag.doStartTag();
+
+ URL url = (URL) tag.getComponent();
+ Map parameters = url.getParameters();
+
+ tag.doEndTag();
+
+ assertEquals(parameters.get("one"), "oneVal");
+ assertEquals(parameters.get("two"), "twoVal");
+ assertEquals(parameters.get("three"), "threeVal");
+ }
+
public void testActionURL() throws Exception {
tag.setValue("TestAction.action");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
