vmassol 2002/08/30 12:39:25
Modified: sample-servlet/src/unit/share/org/apache/cactus/unit Tag:
CACTUS_14_BRANCH TestServletTestCase2.java
framework/src/test/share/org/apache/cactus Tag:
CACTUS_14_BRANCH TestWebRequest.java
framework/src/java/share/org/apache/cactus/client Tag:
CACTUS_14_BRANCH HttpClientConnectionHelper.java
documentation/docs/xdocs Tag: CACTUS_14_BRANCH changes.xml
Log:
Fixed bug that was preventing having several POST parameters added in the request in
beginXXX() methods. Thanks to Larry Tambascio [[EMAIL PROTECTED]]
Revision Changes Path
No revision
No revision
1.7.2.1 +35 -1
jakarta-cactus/sample-servlet/src/unit/share/org/apache/cactus/unit/TestServletTestCase2.java
Index: TestServletTestCase2.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/src/unit/share/org/apache/cactus/unit/TestServletTestCase2.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- TestServletTestCase2.java 26 Jul 2002 18:50:29 -0000 1.7
+++ TestServletTestCase2.java 30 Aug 2002 19:39:24 -0000 1.7.2.1
@@ -742,4 +742,38 @@
assertEquals("atlantis", request.getRemoteHost());
}
+ //-------------------------------------------------------------------------
+
+ /**
+ * Verify we can set and retrieve several parameters.
+ *
+ * @param theRequest the request object that serves to initialize the
+ * HTTP connection to the server redirector.
+ */
+ public void beginTestSeveralParameters(WebRequest theRequest)
+ {
+ theRequest.addParameter("PostParameter1", "EMPLOYEE0145",
+ theRequest.POST_METHOD);
+ theRequest.addParameter("PostParameter2", "W", theRequest.GET_METHOD);
+ theRequest.addParameter("PostParameter3", "07/08/2002",
+ theRequest.POST_METHOD);
+ theRequest.addParameter("PostParameter4", "/tas/ViewSchedule.esp",
+ theRequest.GET_METHOD);
+ }
+
+ /**
+ * Verify we can set and retrieve several parameters.
+ */
+ public void testTestSeveralParameters()
+ {
+ assertEquals("parameter4", "/tas/ViewSchedule.esp",
+ request.getParameter("PostParameter4"));
+ assertEquals("parameter1", "EMPLOYEE0145",
+ request.getParameter("PostParameter1"));
+ assertEquals("parameter2", "W",
+ request.getParameter("PostParameter2"));
+ assertEquals("parameter3", "07/08/2002",
+ request.getParameter("PostParameter3"));
+ }
+
}
No revision
No revision
1.4.2.1 +30 -1
jakarta-cactus/framework/src/test/share/org/apache/cactus/TestWebRequest.java
Index: TestWebRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/TestWebRequest.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- TestWebRequest.java 22 Jul 2002 12:26:05 -0000 1.4
+++ TestWebRequest.java 30 Aug 2002 19:39:24 -0000 1.4.2.1
@@ -56,6 +56,8 @@
*/
package org.apache.cactus;
+import java.util.Enumeration;
+
import junit.framework.TestCase;
import org.apache.cactus.util.ChainedRuntimeException;
@@ -236,6 +238,33 @@
} catch (RuntimeException e) {
assertEquals("Bad QueryString [badquerystring] NameValue pair: "
+ "[badquerystring]", e.getMessage());
+ }
+ }
+
+ /**
+ * Verify that we can retrieve several POST parameters.
+ */
+ public void testGetPostParametersSeveral()
+ {
+ WebRequest request = new WebRequest();
+
+ request.addParameter("param1", "value1", WebRequest.POST_METHOD);
+ request.addParameter("param2", "value2", WebRequest.POST_METHOD);
+ request.addParameter("param3", "value3", WebRequest.POST_METHOD);
+
+ Enumeration keys = request.getParameterNamesPost();
+ while (keys.hasMoreElements()) {
+ String key = (String) keys.nextElement();
+ String[] values = request.getParameterValuesPost(key);
+
+ assertEquals(1, values.length);
+
+ if (!values[0].equals("value1") && !values[0].equals("value2")
+ && !values[0].equals("value3")) {
+
+ fail("Return value was [" + values[0] + "] but should have "
+ + "been one of [value1], [value2] or [value3]");
+ }
}
}
No revision
No revision
1.1.2.2 +2 -2
jakarta-cactus/framework/src/java/share/org/apache/cactus/client/HttpClientConnectionHelper.java
Index: HttpClientConnectionHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/client/HttpClientConnectionHelper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HttpClientConnectionHelper.java 8 Aug 2002 21:50:05 -0000 1.1.2.1
+++ HttpClientConnectionHelper.java 30 Aug 2002 19:39:24 -0000 1.1.2.2
@@ -181,7 +181,7 @@
}
Enumeration keys = theRequest.getParameterNamesPost();
- if (keys.hasMoreElements()) {
+ while (keys.hasMoreElements()) {
String key = (String) keys.nextElement();
String[] values = theRequest.getParameterValuesPost(key);
for (int i = 0; i < values.length; i++) {
No revision
No revision
1.35.2.6 +7 -0 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.35.2.5
retrieving revision 1.35.2.6
diff -u -r1.35.2.5 -r1.35.2.6
--- changes.xml 25 Aug 2002 16:13:09 -0000 1.35.2.5
+++ changes.xml 30 Aug 2002 19:39:24 -0000 1.35.2.6
@@ -47,6 +47,13 @@
<person name="Nicholas Lesiecki" email="[EMAIL PROTECTED]" id="NDL"/>
</devs>
+ <release version="1.4.1" date="31 August 2002">
+ <action dev="VMA" type="fix" due-to="Larry Tambascio"
due-to-email="[EMAIL PROTECTED]">
+ Fixed bug that was preventing having several POST parameters added in
+ the request in <code>beginXXX()</code> methods.
+ </action>
+ </release>
+
<release version="1.4" date="25 August 2002">
<action dev="VMA" type="add">
Added a <link href="howto_jsp.html">tutorial</link> that explains how
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
