Menu
▾
▴
[HtmlUnit] SVN: [14945] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-11-13 17:18:07
|
Revision: 14945
http://sourceforge.net/p/htmlunit/code/14945
Author: rbri
Date: 2017-11-13 17:18:04 +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/WebClient.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.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/WebClient2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.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:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -163,7 +163,7 @@
FIREFOX_45.buildId_ = "20170411115307";
FIREFOX_45.productSub_ = "20100101";
FIREFOX_45.headerNamesOrdered_ = new String[] {
- "Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", HttpHeader.REFERER, "Cookie", "Connection"};
+ "Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "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", "Accept", "Accept-Language", "Accept-Encoding", HttpHeader.REFERER, "Cookie", "Connection", "Upgrade-Insecure-Requests"};
+ "Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "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[] {
- "Accept", HttpHeader.REFERER, "Accept-Language", "User-Agent", "Accept-Encoding", "Host", "DNT", "Connection",
+ "Accept", HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, "User-Agent", "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", "Accept", HttpHeader.REFERER, "Accept-Encoding", "Accept-Language", "Cookie"};
+ "Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent", "Accept", HttpHeader.REFERER, "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:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -34,6 +34,11 @@
/** Cache-Control. */
public static final String CACHE_CONTROL = "Cache-Control";
+ /** Accept-Language. */
+ public static final String ACCEPT_LANGUAGE = "Accept-Language";
+ /** accept-language. */
+ public static final String ACCEPT_LANGUAGE_LC = "accept-language";
+
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:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -788,7 +788,7 @@
else if ("Accept".equals(header) && requestHeaders.get(header) != null) {
list.add(new AcceptHeaderHttpRequestInterceptor(requestHeaders.get(header)));
}
- else if ("Accept-Language".equals(header) && requestHeaders.get(header) != null) {
+ 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) {
@@ -878,7 +878,7 @@
@Override
public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
- request.setHeader("Accept-Language", value_);
+ request.setHeader(HttpHeader.ACCEPT_LANGUAGE, value_);
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2017-11-13 17:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -1459,8 +1459,8 @@
*/
private void addDefaultHeaders(final WebRequest wrs) {
// Add standard HtmlUnit headers.
- if (!wrs.isAdditionalHeader("Accept-Language")) {
- wrs.setAdditionalHeader("Accept-Language", getBrowserVersion().getBrowserLanguage());
+ if (!wrs.isAdditionalHeader(HttpHeader.ACCEPT_LANGUAGE)) {
+ wrs.setAdditionalHeader(HttpHeader.ACCEPT_LANGUAGE, getBrowserVersion().getBrowserLanguage());
}
if (getBrowserVersion().hasFeature(HTTP_HEADER_UPGRADE_INSECURE_REQUEST)
&& !wrs.isAdditionalHeader("Upgrade-Insecure-Requests")) {
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:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -658,8 +658,11 @@
}
return true;
}
- if ("accept".equals(name) || "accept-language".equals(name) || "content-language".equals(name)
- || HttpHeader.REFERER_LC.equals(name) || "accept-encoding".equals(name)
+ if ("accept".equals(name)
+ || HttpHeader.ACCEPT_LANGUAGE_LC.equals(name)
+ || "content-language".equals(name)
+ || HttpHeader.REFERER_LC.equals(name)
+ || "accept-encoding".equals(name)
|| HttpHeader.ORIGIN_LC.equals(name)) {
return false;
}
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:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -881,8 +881,11 @@
}
return true;
}
- if ("accept".equals(name) || "accept-language".equals(name) || "content-language".equals(name)
- || HttpHeader.REFERER_LC.equals(name) || "accept-encoding".equals(name)
+ if ("accept".equals(name)
+ || HttpHeader.ACCEPT_LANGUAGE_LC.equals(name)
+ || "content-language".equals(name)
+ || HttpHeader.REFERER_LC.equals(name)
+ || "accept-encoding".equals(name)
|| HttpHeader.ORIGIN_LC.equals(name)) {
return false;
}
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:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -204,7 +204,7 @@
private static String headersToString(final WebRequest request) {
// why doesn't HtmlUnit send these headers whereas Firefox does?
final List<String> ignoredHeaders = Arrays.asList("accept", "accept-charset", "accept-encoding",
- "accept-language", "keep-alive");
+ HttpHeader.ACCEPT_LANGUAGE_LC, "keep-alive");
final List<String> caseInsensitiveHeaders = Arrays.asList("connection");
// ensure ordering for comparison
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:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -48,11 +48,11 @@
*/
@Test
@Alerts(CHROME = {"Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent",
- "Accept", "Accept-Encoding", "Accept-Language"},
- FF45 = {"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", "Connection"},
- FF52 = {"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding",
+ "Accept", "Accept-Encoding", HttpHeader.ACCEPT_LANGUAGE},
+ FF45 = {"Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding", "Connection"},
+ FF52 = {"Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
"Connection", "Upgrade-Insecure-Requests"},
- IE = {"Accept", "Accept-Language", "User-Agent", "Accept-Encoding", "Host", "DNT", "Connection"})
+ IE = {"Accept", HttpHeader.ACCEPT_LANGUAGE, "User-Agent", "Accept-Encoding", "Host", "DNT", "Connection"})
@NotYetImplemented(IE)
public void headers() throws Exception {
final String response = "HTTP/1.1 200 OK\r\n"
@@ -91,13 +91,13 @@
*/
@Test
@Alerts(CHROME = {"Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent",
- "Accept", HttpHeader.REFERER, "Accept-Encoding", "Accept-Language",
+ "Accept", HttpHeader.REFERER, "Accept-Encoding", HttpHeader.ACCEPT_LANGUAGE,
"Cookie"},
- FF45 = {"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", HttpHeader.REFERER, "Cookie",
- "Connection"},
- FF52 = {"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", HttpHeader.REFERER, "Cookie",
- "Connection", "Upgrade-Insecure-Requests"},
- IE = {"Accept", HttpHeader.REFERER, "Accept-Language", "User-Agent", "Accept-Encoding", "Host",
+ FF45 = {"Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
+ HttpHeader.REFERER, "Cookie", "Connection"},
+ FF52 = {"Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
+ HttpHeader.REFERER, "Cookie", "Connection", "Upgrade-Insecure-Requests"},
+ IE = {"Accept", HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, "User-Agent", "Accept-Encoding", "Host",
"DNT", "Connection", "Cookie"})
@NotYetImplemented(IE)
public void headers_cookie_referer() throws Exception {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient2Test.java 2017-11-13 17:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient2Test.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -247,7 +247,8 @@
loadPageWithAlerts(html);
// browsers are using different casing, but this is not relevant for this test
assertEquals("en-us",
- getMockWebConnection().getLastAdditionalHeaders().get("Accept-Language").toLowerCase(Locale.ROOT));
+ getMockWebConnection().getLastAdditionalHeaders()
+ .get(HttpHeader.ACCEPT_LANGUAGE).toLowerCase(Locale.ROOT));
}
/**
@@ -267,7 +268,8 @@
loadPageWithAlerts(html);
// browsers are using different casing, but this is not relevant for this test
assertEquals("fr",
- getMockWebConnection().getLastAdditionalHeaders().get("Accept-Language").toLowerCase(Locale.ROOT));
+ getMockWebConnection().getLastAdditionalHeaders()
+ .get(HttpHeader.ACCEPT_LANGUAGE).toLowerCase(Locale.ROOT));
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java 2017-11-13 17:11:16 UTC (rev 14944)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java 2017-11-13 17:18:04 UTC (rev 14945)
@@ -42,6 +42,7 @@
import org.junit.runner.RunWith;
import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.HttpHeader;
import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
import com.gargoylesoftware.htmlunit.BrowserRunner.BuggyWebDriver;
import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
@@ -150,7 +151,7 @@
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
assertEquals("text/javascript, application/javascript, */*", headers.get("Accept"));
- assertEquals("ar-eg", headers.get("Accept-Language"));
+ assertEquals("ar-eg", headers.get(HttpHeader.ACCEPT_LANGUAGE));
}
/**
|
