Menu
▾
▴
[HtmlUnit] SVN: [14947] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-11-13 17:30:05
|
Revision: 14947
http://sourceforge.net/p/htmlunit/code/14947
Author: rbri
Date: 2017-11-13 17:30:02 +0000 (Mon, 13 Nov 2017)
Log Message:
-----------
use constants
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebRequest.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebRequestTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -163,7 +163,7 @@
FIREFOX_45.buildId_ = "20170411115307";
FIREFOX_45.productSub_ = "20100101";
FIREFOX_45.headerNamesOrdered_ = new String[] {
- "Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding", HttpHeader.REFERER, "Cookie", "Connection"};
+ "Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, "Cookie", "Connection"};
FIREFOX_45.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
FIREFOX_45.xmlHttpRequestAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
FIREFOX_45.imgAcceptHeader_ = "image/png,image/*;q=0.8,*/*;q=0.5";
@@ -182,7 +182,7 @@
FIREFOX_52.buildId_ = "20170921064520";
FIREFOX_52.productSub_ = "20100101";
FIREFOX_52.headerNamesOrdered_ = new String[] {
- "Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding", HttpHeader.REFERER, "Cookie", "Connection", "Upgrade-Insecure-Requests"};
+ "Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, "Cookie", "Connection", "Upgrade-Insecure-Requests"};
FIREFOX_52.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
FIREFOX_52.cssAcceptHeader_ = "text/css,*/*;q=0.1";
FIREFOX_52.fontHeights_ = new int[] {
@@ -198,7 +198,7 @@
INTERNET_EXPLORER.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko";
INTERNET_EXPLORER.platform_ = PLATFORM_WIN32;
INTERNET_EXPLORER.headerNamesOrdered_ = new String[] {
- HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, "User-Agent", "Accept-Encoding", "Host", "DNT", "Connection",
+ HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, "User-Agent", HttpHeader.ACCEPT_ENCODING, "Host", "DNT", "Connection",
"Cookie"};
INTERNET_EXPLORER.htmlAcceptHeader_ = "text/html, application/xhtml+xml, */*";
INTERNET_EXPLORER.imgAcceptHeader_ = "image/png, image/svg+xml, image/*;q=0.8, */*;q=0.5";
@@ -226,7 +226,7 @@
CHROME.cpuClass_ = null;
CHROME.productSub_ = "20030107";
CHROME.headerNamesOrdered_ = new String[] {
- "Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent", HttpHeader.ACCEPT, HttpHeader.REFERER, "Accept-Encoding", HttpHeader.ACCEPT_LANGUAGE, "Cookie"};
+ "Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent", HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE, "Cookie"};
CHROME.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8";
CHROME.imgAcceptHeader_ = "image/webp,image/apng,image/*,*/*;q=0.8";
CHROME.cssAcceptHeader_ = "text/css,*/*;q=0.1";
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -44,6 +44,11 @@
/** accept-language. */
public static final String ACCEPT_LANGUAGE_LC = "accept-language";
+ /** Accept-Encoding. */
+ public static final String ACCEPT_ENCODING = "Accept-Encoding";
+ /** accept-encoding. */
+ public static final String ACCEPT_ENCODING_LC = "accept-encoding";
+
private HttpHeader() {
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -791,7 +791,7 @@
else if (HttpHeader.ACCEPT_LANGUAGE.equals(header) && requestHeaders.get(header) != null) {
list.add(new AcceptLanguageHeaderHttpRequestInterceptor(requestHeaders.get(header)));
}
- else if ("Accept-Encoding".equals(header) && requestHeaders.get(header) != null) {
+ else if (HttpHeader.ACCEPT_ENCODING.equals(header) && requestHeaders.get(header) != null) {
list.add(new AcceptEncodingHeaderHttpRequestInterceptor(requestHeaders.get(header)));
}
else if ("Upgrade-Insecure-Requests".equals(header) && requestHeaders.get(header) != null) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebRequest.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebRequest.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -76,7 +76,7 @@
public WebRequest(final URL url, final String acceptHeader) {
setUrl(url);
setAdditionalHeader(HttpHeader.ACCEPT, acceptHeader);
- setAdditionalHeader("Accept-Encoding", "gzip, deflate");
+ setAdditionalHeader(HttpHeader.ACCEPT_ENCODING, "gzip, deflate");
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -107,7 +107,8 @@
"status", "statusText", "abort", "getAllResponseHeaders", "getResponseHeader", "open", "send",
"setRequestHeader"};
- private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList("accept-charset", "accept-encoding",
+ private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList(
+ "accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
"connection", "content-length", "cookie", "cookie2", "content-transfer-encoding", "date", "expect",
"host", "keep-alive", HttpHeader.REFERER_LC, "te", "trailer", "transfer-encoding", "upgrade",
"user-agent", "via");
@@ -662,7 +663,7 @@
|| HttpHeader.ACCEPT_LANGUAGE_LC.equals(name)
|| "content-language".equals(name)
|| HttpHeader.REFERER_LC.equals(name)
- || "accept-encoding".equals(name)
+ || HttpHeader.ACCEPT_ENCODING_LC.equals(name)
|| HttpHeader.ORIGIN_LC.equals(name)) {
return false;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -297,7 +297,7 @@
final WebRequest request = new WebRequest(url, method);
request.setAdditionalHeader(HttpHeader.ACCEPT, browser.getHtmlAcceptHeader());
- request.setAdditionalHeader("Accept-Encoding", "gzip, deflate");
+ request.setAdditionalHeader(HttpHeader.ACCEPT_ENCODING, "gzip, deflate");
request.setRequestParameters(parameters);
if (HttpMethod.POST == method) {
request.setEncodingType(FormEncodingType.getInstance(getEnctypeAttribute()));
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -132,7 +132,8 @@
"status", "statusText", "abort", "getAllResponseHeaders", "getResponseHeader", "open", "send",
"setRequestHeader"};
- private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList("accept-charset", "accept-encoding",
+ private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList(
+ "accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
"connection", "content-length", "cookie", "cookie2", "content-transfer-encoding", "date", "expect",
"host", "keep-alive", HttpHeader.REFERER_LC, "te", "trailer", "transfer-encoding",
"upgrade", "user-agent", "via");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -203,7 +203,8 @@
private static String headersToString(final WebRequest request) {
// why doesn't HtmlUnit send these headers whereas Firefox does?
- final List<String> ignoredHeaders = Arrays.asList(HttpHeader.ACCEPT_LC, "accept-charset", "accept-encoding",
+ final List<String> ignoredHeaders = Arrays.asList(
+ HttpHeader.ACCEPT_LC, "accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
HttpHeader.ACCEPT_LANGUAGE_LC, "keep-alive");
final List<String> caseInsensitiveHeaders = Arrays.asList("connection");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -48,13 +48,13 @@
*/
@Test
@Alerts(CHROME = {"Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent",
- HttpHeader.ACCEPT, "Accept-Encoding", HttpHeader.ACCEPT_LANGUAGE},
+ HttpHeader.ACCEPT, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE},
FF45 = {"Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
- "Accept-Encoding", "Connection"},
- FF52 = {"Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
+ HttpHeader.ACCEPT_ENCODING, "Connection"},
+ FF52 = {"Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING,
"Connection", "Upgrade-Insecure-Requests"},
IE = {HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, "User-Agent",
- "Accept-Encoding", "Host", "DNT", "Connection"})
+ HttpHeader.ACCEPT_ENCODING, "Host", "DNT", "Connection"})
@NotYetImplemented(IE)
public void headers() throws Exception {
final String response = "HTTP/1.1 200 OK\r\n"
@@ -93,14 +93,14 @@
*/
@Test
@Alerts(CHROME = {"Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent",
- HttpHeader.ACCEPT, HttpHeader.REFERER, "Accept-Encoding", HttpHeader.ACCEPT_LANGUAGE,
+ HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE,
"Cookie"},
- FF45 = {"Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
+ FF45 = {"Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING,
HttpHeader.REFERER, "Cookie", "Connection"},
- FF52 = {"Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
+ FF52 = {"Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING,
HttpHeader.REFERER, "Cookie", "Connection", "Upgrade-Insecure-Requests"},
IE = {HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, "User-Agent",
- "Accept-Encoding", "Host", "DNT", "Connection", "Cookie"})
+ HttpHeader.ACCEPT_ENCODING, "Host", "DNT", "Connection", "Cookie"})
@NotYetImplemented(IE)
public void headers_cookie_referer() throws Exception {
final String htmlResponse = "<a href='2.html'>Click me</a>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebRequestTest.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebRequestTest.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -201,7 +201,7 @@
public void accept_encoding() throws Exception {
final URL url = new URL("http://localhost/");
final WebRequest request = new WebRequest(url);
- assertEquals("gzip, deflate", request.getAdditionalHeaders().get("Accept-Encoding"));
+ assertEquals("gzip, deflate", request.getAdditionalHeaders().get(HttpHeader.ACCEPT_ENCODING));
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -151,7 +151,7 @@
startWebServer("src/test/resources/pjl-comp-filter", null);
final WebRequest request = new WebRequest(new URL("http://localhost:"
+ PORT + "/index.html"));
- request.setAdditionalHeader("Accept-Encoding", "deflate");
+ request.setAdditionalHeader(HttpHeader.ACCEPT_ENCODING, "deflate");
final WebClient webClient = getWebClient();
final HtmlPage page = webClient.getPage(request);
assertEquals("Hello Compressed World!", page.asText());
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -1178,7 +1178,7 @@
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
assertEquals(expectedHeaders[0], "" + headers.get(HttpHeader.ACCEPT));
- assertEquals(expectedHeaders[1], "" + headers.get("Accept-Encoding"));
+ assertEquals(expectedHeaders[1], "" + headers.get(HttpHeader.ACCEPT_ENCODING));
assertEquals(expectedHeaders[2], "" + headers.get("Content-Length"));
assertEquals(expectedHeaders[3], "" + headers.get("Host"));
assertEquals(expectedHeaders[4], "" + headers.get(HttpHeader.REFERER));
@@ -1214,7 +1214,7 @@
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
assertEquals(expectedHeaders[0], "" + headers.get(HttpHeader.ACCEPT));
- assertEquals(expectedHeaders[1], "" + headers.get("Accept-Encoding"));
+ assertEquals(expectedHeaders[1], "" + headers.get(HttpHeader.ACCEPT_ENCODING));
assertEquals(expectedHeaders[2], "" + headers.get("Content-Length"));
assertEquals(expectedHeaders[3], "" + headers.get("Host"));
assertEquals(expectedHeaders[4], "" + headers.get(HttpHeader.REFERER));
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -905,7 +905,7 @@
final Writer writer = response.getWriter();
final String html = "<html><head><script>\n"
+ "function test() {\n"
- + " alert('" + request.getHeader("Accept-Encoding") + "');\n"
+ + " alert('" + request.getHeader(HttpHeader.ACCEPT_ENCODING) + "');\n"
+ "}\n"
+ "</script></head><body onload='test()'></body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2017-11-13 17:24:48 UTC (rev 14946)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2017-11-13 17:30:02 UTC (rev 14947)
@@ -1287,7 +1287,7 @@
assertTrue(XMLHttpRequest.isAuthorizedHeader("Foo"));
assertTrue(XMLHttpRequest.isAuthorizedHeader("Content-Type"));
- final String[] headers = {"accept-charset", "accept-encoding",
+ final String[] headers = {"accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
"connection", "content-length", "cookie", "cookie2", "content-transfer-encoding", "date",
"expect", "host", "keep-alive", HttpHeader.REFERER_LC, "te", "trailer", "transfer-encoding", "upgrade",
"user-agent", "via" };
|
