Menu
▾
▴
[HtmlUnit] SVN: [14946] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-11-13 17:24:51
|
Revision: 14946
http://sourceforge.net/p/htmlunit/code/14946
Author: rbri
Date: 2017-11-13 17:24:48 +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/html/HtmlInput.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLink.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.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/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/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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -163,7 +163,7 @@
FIREFOX_45.buildId_ = "20170411115307";
FIREFOX_45.productSub_ = "20100101";
FIREFOX_45.headerNamesOrdered_ = new String[] {
- "Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding", HttpHeader.REFERER, "Cookie", "Connection"};
+ "Host", "User-Agent", HttpHeader.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", HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding", HttpHeader.REFERER, "Cookie", "Connection", "Upgrade-Insecure-Requests"};
+ "Host", "User-Agent", HttpHeader.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, HttpHeader.ACCEPT_LANGUAGE, "User-Agent", "Accept-Encoding", "Host", "DNT", "Connection",
+ HttpHeader.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", HttpHeader.ACCEPT_LANGUAGE, "Cookie"};
+ "Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent", HttpHeader.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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -34,6 +34,11 @@
/** Cache-Control. */
public static final String CACHE_CONTROL = "Cache-Control";
+ /** Accept. */
+ public static final String ACCEPT = "Accept";
+ /** accept. */
+ public static final String ACCEPT_LC = "accept";
+
/** Accept-Language. */
public static final String ACCEPT_LANGUAGE = "Accept-Language";
/** accept-language. */
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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -785,7 +785,7 @@
else if ("User-Agent".equals(header)) {
list.add(new UserAgentHeaderHttpRequestInterceptor(userAgent));
}
- else if ("Accept".equals(header) && requestHeaders.get(header) != null) {
+ else if (HttpHeader.ACCEPT.equals(header) && requestHeaders.get(header) != null) {
list.add(new AcceptHeaderHttpRequestInterceptor(requestHeaders.get(header)));
}
else if (HttpHeader.ACCEPT_LANGUAGE.equals(header) && requestHeaders.get(header) != null) {
@@ -865,7 +865,7 @@
@Override
public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
- request.setHeader("Accept", value_);
+ request.setHeader(HttpHeader.ACCEPT, value_);
}
}
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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebRequest.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -75,7 +75,7 @@
*/
public WebRequest(final URL url, final String acceptHeader) {
setUrl(url);
- setAdditionalHeader("Accept", acceptHeader);
+ setAdditionalHeader(HttpHeader.ACCEPT, acceptHeader);
setAdditionalHeader("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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -658,7 +658,7 @@
}
return true;
}
- if ("accept".equals(name)
+ if (HttpHeader.ACCEPT_LC.equals(name)
|| HttpHeader.ACCEPT_LANGUAGE_LC.equals(name)
|| "content-language".equals(name)
|| HttpHeader.REFERER_LC.equals(name)
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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -296,7 +296,7 @@
}
final WebRequest request = new WebRequest(url, method);
- request.setAdditionalHeader("Accept", browser.getHtmlAcceptHeader());
+ request.setAdditionalHeader(HttpHeader.ACCEPT, browser.getHtmlAcceptHeader());
request.setAdditionalHeader("Accept-Encoding", "gzip, deflate");
request.setRequestParameters(parameters);
if (HttpMethod.POST == method) {
@@ -846,7 +846,7 @@
* @return the value of the attribute {@code accept} or an empty string if that attribute isn't defined
*/
public final String getAcceptAttribute() {
- return getAttribute("accept");
+ return getAttribute(HttpHeader.ACCEPT_LC);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInput.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInput.java 2017-11-13 17:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInput.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -23,6 +23,7 @@
import java.util.HashSet;
import java.util.Map;
+import com.gargoylesoftware.htmlunit.HttpHeader;
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.ScriptResult;
import com.gargoylesoftware.htmlunit.SgmlPage;
@@ -346,7 +347,7 @@
* or an empty string if that attribute isn't defined.
*/
public final String getAcceptAttribute() {
- return getAttribute("accept");
+ return getAttribute(HttpHeader.ACCEPT_LC);
}
/**
@@ -671,7 +672,7 @@
* @return the value of the {@code accept} attribute
*/
public String getAccept() {
- return getAttribute("accept");
+ return getAttribute(HttpHeader.ACCEPT_LC);
}
/**
@@ -680,7 +681,7 @@
* @param accept the {@code accept} attribute
*/
public void setAccept(final String accept) {
- setAttribute("accept", accept);
+ setAttribute(HttpHeader.ACCEPT_LC, accept);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLink.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLink.java 2017-11-13 17:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLink.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -231,7 +231,7 @@
request.setAdditionalHeader(HttpHeader.REFERER, page.getUrl().toExternalForm());
final String accept = page.getWebClient().getBrowserVersion().getCssAcceptHeader();
- request.setAdditionalHeader("Accept", accept);
+ request.setAdditionalHeader(HttpHeader.ACCEPT, accept);
return request;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java 2017-11-13 17:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -1017,7 +1017,7 @@
final WebRequest request = new WebRequest(url, browser.getScriptAcceptHeader());
request.setAdditionalHeaders(new HashMap<>(referringRequest.getAdditionalHeaders()));
request.setAdditionalHeader(HttpHeader.REFERER, referringRequest.getUrl().toString());
- request.setAdditionalHeader("Accept", client.getBrowserVersion().getScriptAcceptHeader());
+ request.setAdditionalHeader(HttpHeader.ACCEPT, client.getBrowserVersion().getScriptAcceptHeader());
// our cache is a bit strange;
// loadWebResponse check the cache for the web response
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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -881,7 +881,7 @@
}
return true;
}
- if ("accept".equals(name)
+ if (HttpHeader.ACCEPT_LC.equals(name)
|| HttpHeader.ACCEPT_LANGUAGE_LC.equals(name)
|| "content-language".equals(name)
|| HttpHeader.REFERER_LC.equals(name)
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java 2017-11-13 17:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -396,7 +396,7 @@
for (final Entry<String, String> headerEntry : headers.entrySet()) {
final String headerName = headerEntry.getKey();
final String headerNameLower = headerName.toLowerCase(Locale.ROOT);
- if ("accept".equals(headerNameLower)) {
+ if (HttpHeader.ACCEPT_LC.equals(headerNameLower)) {
sb.append(headerName);
sb.append(": ");
sb.append(headerEntry.getValue());
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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -203,7 +203,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",
+ final List<String> ignoredHeaders = Arrays.asList(HttpHeader.ACCEPT_LC, "accept-charset", "accept-encoding",
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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -48,11 +48,13 @@
*/
@Test
@Alerts(CHROME = {"Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent",
- "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",
+ HttpHeader.ACCEPT, "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",
"Connection", "Upgrade-Insecure-Requests"},
- IE = {"Accept", HttpHeader.ACCEPT_LANGUAGE, "User-Agent", "Accept-Encoding", "Host", "DNT", "Connection"})
+ IE = {HttpHeader.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,14 +93,14 @@
*/
@Test
@Alerts(CHROME = {"Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent",
- "Accept", HttpHeader.REFERER, "Accept-Encoding", HttpHeader.ACCEPT_LANGUAGE,
+ HttpHeader.ACCEPT, HttpHeader.REFERER, "Accept-Encoding", HttpHeader.ACCEPT_LANGUAGE,
"Cookie"},
- FF45 = {"Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
+ FF45 = {"Host", "User-Agent", HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
HttpHeader.REFERER, "Cookie", "Connection"},
- FF52 = {"Host", "User-Agent", "Accept", HttpHeader.ACCEPT_LANGUAGE, "Accept-Encoding",
+ FF52 = {"Host", "User-Agent", HttpHeader.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"})
+ IE = {HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, "User-Agent",
+ "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/activex/javascript/msxml/XMLHTTPRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java 2017-11-13 17:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -1177,7 +1177,7 @@
if (getExpectedAlerts().length > 1) {
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
- assertEquals(expectedHeaders[0], "" + headers.get("Accept"));
+ assertEquals(expectedHeaders[0], "" + headers.get(HttpHeader.ACCEPT));
assertEquals(expectedHeaders[1], "" + headers.get("Accept-Encoding"));
assertEquals(expectedHeaders[2], "" + headers.get("Content-Length"));
assertEquals(expectedHeaders[3], "" + headers.get("Host"));
@@ -1213,7 +1213,7 @@
if (getExpectedAlerts().length > 1) {
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
- assertEquals(expectedHeaders[0], "" + headers.get("Accept"));
+ assertEquals(expectedHeaders[0], "" + headers.get(HttpHeader.ACCEPT));
assertEquals(expectedHeaders[1], "" + headers.get("Accept-Encoding"));
assertEquals(expectedHeaders[2], "" + headers.get("Content-Length"));
assertEquals(expectedHeaders[3], "" + headers.get("Host"));
@@ -1286,7 +1286,7 @@
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
assertEquals(expectedHeaders[0], String.valueOf(headers.get("foo")));
- assertEquals(expectedHeaders[1], String.valueOf(headers.get("Accept")));
+ assertEquals(expectedHeaders[1], String.valueOf(headers.get(HttpHeader.ACCEPT)));
assertEquals(expectedHeaders[2], String.valueOf(headers.get("ValueEmpty")));
assertEquals(expectedHeaders[3], String.valueOf(headers.get("ValueBlank")));
}
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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -44,6 +44,7 @@
import com.gargoylesoftware.htmlunit.BrowserRunner.BuggyWebDriver;
import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
import com.gargoylesoftware.htmlunit.FormEncodingType;
+import com.gargoylesoftware.htmlunit.HttpHeader;
import com.gargoylesoftware.htmlunit.HttpMethod;
import com.gargoylesoftware.htmlunit.MockWebConnection;
import com.gargoylesoftware.htmlunit.WebDriverTestCase;
@@ -377,7 +378,7 @@
final Writer writer = response.getWriter();
final String html = "<html><head><script>\n"
+ "function test() {\n"
- + " alert('" + request.getHeader("Accept") + "');\n"
+ + " alert('" + request.getHeader(HttpHeader.ACCEPT) + "');\n"
+ "}\n"
+ "</script></head><body onload='test()'></body></html>";
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:18:04 UTC (rev 14945)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java 2017-11-13 17:24:48 UTC (rev 14946)
@@ -150,7 +150,7 @@
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
- assertEquals("text/javascript, application/javascript, */*", headers.get("Accept"));
+ assertEquals("text/javascript, application/javascript, */*", headers.get(HttpHeader.ACCEPT));
assertEquals("ar-eg", headers.get(HttpHeader.ACCEPT_LANGUAGE));
}
|
