Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed build breakage due to Java 1.6 incompatibility 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/branches/4.5.x@1747894 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2016-06-11 14:22:08 +00:00
parent 5a9a842d23
commit 900d96fbef
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java
View File

@ -28,7 +28,6 @@
package org.apache.http.client.utils; package org.apache.http.client.utils;
import java.net.URI; import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -351,46 +350,46 @@ public class TestURLEncodedUtils {
@Test @Test
public void testFormatString() throws Exception { // as above, using String public void testFormatString() throws Exception { // as above, using String
final List <NameValuePair> params = new ArrayList <NameValuePair>(); final List <NameValuePair> params = new ArrayList <NameValuePair>();
Assert.assertEquals(0, URLEncodedUtils.format(params, StandardCharsets.US_ASCII).length()); Assert.assertEquals(0, URLEncodedUtils.format(params, Consts.ASCII).length());
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name0", null)); params.add(new BasicNameValuePair("Name0", null));
Assert.assertEquals("Name0", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name0", URLEncodedUtils.format(params, Consts.ASCII));
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name1", "Value1")); params.add(new BasicNameValuePair("Name1", "Value1"));
Assert.assertEquals("Name1=Value1", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name1=Value1", URLEncodedUtils.format(params, Consts.ASCII));
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name2", "")); params.add(new BasicNameValuePair("Name2", ""));
Assert.assertEquals("Name2=", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name2=", URLEncodedUtils.format(params, Consts.ASCII));
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name4", "Value 4&")); params.add(new BasicNameValuePair("Name4", "Value 4&"));
Assert.assertEquals("Name4=Value+4%26", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name4=Value+4%26", URLEncodedUtils.format(params, Consts.ASCII));
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name4", "Value+4&")); params.add(new BasicNameValuePair("Name4", "Value+4&"));
Assert.assertEquals("Name4=Value%2B4%26", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name4=Value%2B4%26", URLEncodedUtils.format(params, Consts.ASCII));
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name4", "Value 4& =4")); params.add(new BasicNameValuePair("Name4", "Value 4& =4"));
Assert.assertEquals("Name4=Value+4%26+%3D4", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name4=Value+4%26+%3D4", URLEncodedUtils.format(params, Consts.ASCII));
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name5", "aaa")); params.add(new BasicNameValuePair("Name5", "aaa"));
params.add(new BasicNameValuePair("Name6", "bbb")); params.add(new BasicNameValuePair("Name6", "bbb"));
Assert.assertEquals("Name5=aaa&Name6=bbb", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name5=aaa&Name6=bbb", URLEncodedUtils.format(params, Consts.ASCII));
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name7", "aaa")); params.add(new BasicNameValuePair("Name7", "aaa"));
params.add(new BasicNameValuePair("Name7", "b,b")); params.add(new BasicNameValuePair("Name7", "b,b"));
params.add(new BasicNameValuePair("Name7", "ccc")); params.add(new BasicNameValuePair("Name7", "ccc"));
Assert.assertEquals("Name7=aaa&Name7=b%2Cb&Name7=ccc", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name7=aaa&Name7=b%2Cb&Name7=ccc", URLEncodedUtils.format(params, Consts.ASCII));
params.clear(); params.clear();
params.add(new BasicNameValuePair("Name8", "xx, yy ,zz")); params.add(new BasicNameValuePair("Name8", "xx, yy ,zz"));
Assert.assertEquals("Name8=xx%2C++yy++%2Czz", URLEncodedUtils.format(params, StandardCharsets.US_ASCII)); Assert.assertEquals("Name8=xx%2C++yy++%2Czz", URLEncodedUtils.format(params, Consts.ASCII));
} }
private List <NameValuePair> parse (final String params) { private List <NameValuePair> parse (final String params) {
@ -398,7 +397,7 @@ public class TestURLEncodedUtils {
} }
private List <NameValuePair> parseString (final String uri) throws Exception { private List <NameValuePair> parseString (final String uri) throws Exception {
return URLEncodedUtils.parse(new URI("?"+uri), StandardCharsets.UTF_8); return URLEncodedUtils.parse(new URI("?"+uri), Consts.UTF_8);
} }
private static void assertNameValuePair ( private static void assertNameValuePair (