Return-Path: Delivered-To: apmail-click-commits-archive@www.apache.org Received: (qmail 27264 invoked from network); 2 Jul 2010 12:07:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jul 2010 12:07:04 -0000 Received: (qmail 92937 invoked by uid 500); 2 Jul 2010 12:07:04 -0000 Delivered-To: apmail-click-commits-archive@click.apache.org Received: (qmail 92921 invoked by uid 500); 2 Jul 2010 12:07:04 -0000 Mailing-List: contact commits-help@click.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: click-dev@click.apache.org Delivered-To: mailing list commits@click.apache.org Received: (qmail 92908 invoked by uid 99); 2 Jul 2010 12:07:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jul 2010 12:07:03 +0000 X-ASF-Spam-Status: No, hits=-1999.4 required=10.0 tests=ALL_TRUSTED,HK_RANDOM_ENVFROM,HK_RANDOM_FROM X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jul 2010 12:07:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F98B23889F1; Fri, 2 Jul 2010 12:06:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r959958 - /click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java Date: Fri, 02 Jul 2010 12:06:07 -0000 To: commits@click.apache.org From: bckfnn@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100702120607.4F98B23889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bckfnn Date: Fri Jul 2 12:06:06 2010 New Revision: 959958 URL: http://svn.apache.org/viewvc?rev=959958&view=rev Log: support testing of multiple request parameters. part of CLK-558 Modified: click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java Modified: click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java URL: http://svn.apache.org/viewvc/click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java?rev=959958&r1=959957&r2=959958&view=diff ============================================================================== --- click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java (original) +++ click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java Fri Jul 2 12:06:06 2010 @@ -497,6 +497,7 @@ public class MockRequest implements Http return new ServletInputStream() { + @Override public int read() { return bais.read(); } @@ -504,6 +505,7 @@ public class MockRequest implements Http } else { return new ServletInputStream() { + @Override public int read() { return -1; } @@ -587,7 +589,12 @@ public class MockRequest implements Http * @return The parameter value, or null */ public String getParameter(final String name) { - return (String) parameters.get(name); + Object value = parameters.get(name); + if (value instanceof String[]) { + return ((String[])value)[0]; + } else { + return (String) parameters.get(name); + } } /** @@ -669,10 +676,22 @@ public class MockRequest implements Http try { for (Iterator iterator = parameters.keySet().iterator(); iterator.hasNext();) { final String name = (String) iterator.next(); - final String value = (String) parameters.get(name); - buf.append(URLEncoder.encode(name, "UTF-8")); - buf.append('='); - buf.append(URLEncoder.encode(value, "UTF-8")); + final Object value = parameters.get(name); + if (value instanceof String[]) { + String[] aValue = (String[]) value; + for (int i = 0; i < aValue.length; i++) { + buf.append(URLEncoder.encode(name, "UTF-8")); + buf.append('='); + buf.append(URLEncoder.encode(aValue[i], "UTF-8")); + if (i < aValue.length) { + buf.append("&"); + } + } + } else { + buf.append(URLEncoder.encode(name, "UTF-8")); + buf.append('='); + buf.append(URLEncoder.encode((String) value, "UTF-8")); + } if (iterator.hasNext()) { buf.append("&"); } @@ -1262,6 +1281,7 @@ public class MockRequest implements Http * * @return string representation of the mock request */ + @Override public String toString() { return getRequestURL().toString(); }