Menu
▾
▴
[HtmlUnit] SVN: [14952] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-11-14 20:15:15
|
Revision: 14952
http://sourceforge.net/p/htmlunit/code/14952
Author: rbri
Date: 2017-11-14 20:15:12 +0000 (Tue, 14 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/UrlFetchWebConnection.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/httpclient/HtmlUnitDomainHandler.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager4Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.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/UrlFetchWebConnectionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient5Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocketTest.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-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -163,7 +163,7 @@
FIREFOX_45.buildId_ = "20170411115307";
FIREFOX_45.productSub_ = "20100101";
FIREFOX_45.headerNamesOrdered_ = new String[] {
- HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, "Cookie", "Connection"};
+ HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.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[] {
- HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, "Cookie", "Connection", "Upgrade-Insecure-Requests"};
+ HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.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,8 +198,8 @@
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, HttpHeader.USER_AGENT, HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, "DNT", "Connection",
- "Cookie"};
+ HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT, HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.DNT, HttpHeader.CONNECTION,
+ HttpHeader.COOKIE};
INTERNET_EXPLORER.htmlAcceptHeader_ = "text/html, application/xhtml+xml, */*";
INTERNET_EXPLORER.imgAcceptHeader_ = "image/png, image/svg+xml, image/*;q=0.8, */*;q=0.5";
INTERNET_EXPLORER.cssAcceptHeader_ = "text/css, */*";
@@ -226,7 +226,7 @@
CHROME.cpuClass_ = null;
CHROME.productSub_ = "20030107";
CHROME.headerNamesOrdered_ = new String[] {
- HttpHeader.HOST, "Connection", "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE, "Cookie"};
+ HttpHeader.HOST, HttpHeader.CONNECTION, "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.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-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -59,6 +59,19 @@
/** host. */
public static final String HOST_LC = "host";
+ /** Cookie. */
+ public static final String COOKIE = "Cookie";
+ /** cookie. */
+ public static final String COOKIE_LC = "cookie";
+
+ /** Connection. */
+ public static final String CONNECTION = "Connection";
+ /** connection. */
+ public static final String CONNECTION_LC = "connection";
+
+ /** DNT. */
+ public static final String DNT = "DNT";
+
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-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -800,13 +800,13 @@
else if (HttpHeader.REFERER.equals(header) && requestHeaders.get(header) != null) {
list.add(new RefererHeaderHttpRequestInterceptor(requestHeaders.get(header)));
}
- else if ("Connection".equals(header)) {
+ else if (HttpHeader.CONNECTION.equals(header)) {
list.add(new RequestClientConnControl());
}
- else if ("Cookie".equals(header)) {
+ else if (HttpHeader.COOKIE.equals(header)) {
list.add(new RequestAddCookies());
}
- else if ("DNT".equals(header) && webClient_.getOptions().isDoNotTrackEnabled()) {
+ else if (HttpHeader.DNT.equals(header) && webClient_.getOptions().isDoNotTrackEnabled()) {
list.add(new DntHeaderHttpRequestInterceptor("1"));
}
}
@@ -930,7 +930,7 @@
@Override
public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
- request.setHeader("DNT", value_);
+ request.setHeader(HttpHeader.DNT, value_);
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/UrlFetchWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/UrlFetchWebConnection.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/UrlFetchWebConnection.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -178,7 +178,7 @@
}
cookieNb++;
}
- connection.setRequestProperty("Cookie", cookieHeader.toString());
+ connection.setRequestProperty(HttpHeader.COOKIE, cookieHeader.toString());
}
private void saveCookies(final String domain, final List<NameValuePair> headers) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -593,7 +593,7 @@
* @see #removeRequestHeader(String)
*/
public void addRequestHeader(final String name, final String value) {
- if ("cookie".equalsIgnoreCase(name)) {
+ if (HttpHeader.COOKIE_LC.equalsIgnoreCase(name)) {
throw new IllegalArgumentException("Do not add 'Cookie' header, use .getCookieManager() instead");
}
requestHeaders_.put(name, value);
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-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -109,7 +109,8 @@
private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList(
"accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
- "connection", "content-length", "cookie", "cookie2", "content-transfer-encoding", "date", "expect",
+ HttpHeader.CONNECTION_LC, "content-length", HttpHeader.COOKIE_LC, "cookie2",
+ "content-transfer-encoding", "date", "expect",
HttpHeader.HOST_LC, "keep-alive", HttpHeader.REFERER_LC, "te", "trailer", "transfer-encoding", "upgrade",
HttpHeader.USER_AGENT_LC, "via");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/httpclient/HtmlUnitDomainHandler.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/httpclient/HtmlUnitDomainHandler.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/httpclient/HtmlUnitDomainHandler.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -29,6 +29,7 @@
import org.apache.http.util.TextUtils;
import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.HttpHeader;
/**
* Customized BasicDomainHandler for HtmlUnit.
@@ -46,7 +47,7 @@
@Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
- Args.notNull(cookie, "Cookie");
+ Args.notNull(cookie, HttpHeader.COOKIE);
if (TextUtils.isBlank(value)) {
throw new MalformedCookieException("Blank or null value for domain attribute");
}
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-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -134,7 +134,8 @@
private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList(
"accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
- "connection", "content-length", "cookie", "cookie2", "content-transfer-encoding", "date", "expect",
+ HttpHeader.CONNECTION_LC, "content-length", HttpHeader.COOKIE_LC, "cookie2",
+ "content-transfer-encoding", "date", "expect",
HttpHeader.HOST_LC, "keep-alive", HttpHeader.REFERER_LC, "te", "trailer", "transfer-encoding",
"upgrade", HttpHeader.USER_AGENT_LC, "via");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager4Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager4Test.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager4Test.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -452,11 +452,11 @@
loadPageWithAlerts2(new URL(URL_HOST1));
WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
- assertNull(lastRequest.getAdditionalHeaders().get("Cookie"));
+ assertNull(lastRequest.getAdditionalHeaders().get(HttpHeader.COOKIE));
webDriver.findElement(By.linkText("next page")).click();
lastRequest = getMockWebConnection().getLastWebRequest();
- assertEquals("c1=1; c2=2", lastRequest.getAdditionalHeaders().get("Cookie"));
+ assertEquals("c1=1; c2=2", lastRequest.getAdditionalHeaders().get(HttpHeader.COOKIE));
}
/**
@@ -486,7 +486,7 @@
loadPageWithAlerts2(new URL(URL_HOST1));
assertEquals(2, getMockWebConnection().getRequestCount() - startCount);
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
- assertEquals("c1=1; c2=2", lastRequest.getAdditionalHeaders().get("Cookie"));
+ assertEquals("c1=1; c2=2", lastRequest.getAdditionalHeaders().get(HttpHeader.COOKIE));
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -116,7 +116,7 @@
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
assertEquals("exampleCookie=currentPath; exampleCookie=rootPath",
- lastRequest.getAdditionalHeaders().get("Cookie"));
+ lastRequest.getAdditionalHeaders().get(HttpHeader.COOKIE));
}
/**
@@ -166,7 +166,7 @@
driver.get(URL_SECOND.toExternalForm());
// strange check, but there is no order
- final String lastCookies = getMockWebConnection().getLastAdditionalHeaders().get("Cookie");
+ final String lastCookies = getMockWebConnection().getLastAdditionalHeaders().get(HttpHeader.COOKIE);
assertEquals(26, lastCookies.length());
assertTrue("lastCookies: " + lastCookies, lastCookies.contains("key=value")
&& lastCookies.contains("test=\"aa= xx==\"")
@@ -222,7 +222,7 @@
final WebDriver driver = loadPageWithAlerts2(URL_FIRST);
driver.get(URL_SECOND.toExternalForm());
- final String lastCookie = getMockWebConnection().getLastAdditionalHeaders().get("Cookie");
+ final String lastCookie = getMockWebConnection().getLastAdditionalHeaders().get(HttpHeader.COOKIE);
assertEquals(cookie, lastCookie);
}
@@ -567,7 +567,7 @@
final Map<String, String> lastHeaders = getMockWebConnection().getLastAdditionalHeaders();
// strange check, but there is no order
- final String lastCookies = lastHeaders.get("Cookie");
+ final String lastCookies = lastHeaders.get(HttpHeader.COOKIE);
assertEquals(17, lastCookies.length());
assertTrue("lastCookies: " + lastCookies, lastCookies.contains("first=1")
&& lastCookies.contains("second=2")
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -206,7 +206,7 @@
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");
+ final List<String> caseInsensitiveHeaders = Arrays.asList(HttpHeader.CONNECTION_LC);
// ensure ordering for comparison
final Map<String, String> headers = new TreeMap<>(request.getAdditionalHeaders());
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -47,14 +47,14 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(CHROME = {HttpHeader.HOST, "Connection", "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT,
+ @Alerts(CHROME = {HttpHeader.HOST, HttpHeader.CONNECTION, "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT,
HttpHeader.ACCEPT, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE},
FF45 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
- HttpHeader.ACCEPT_ENCODING, "Connection"},
+ HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION},
FF52 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
- HttpHeader.ACCEPT_ENCODING, "Connection", "Upgrade-Insecure-Requests"},
+ HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION, "Upgrade-Insecure-Requests"},
IE = {HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT,
- HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, "DNT", "Connection"})
+ HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.DNT, HttpHeader.CONNECTION})
@NotYetImplemented(IE)
public void headers() throws Exception {
final String response = "HTTP/1.1 200 OK\r\n"
@@ -92,16 +92,17 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(CHROME = {HttpHeader.HOST, "Connection", "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT,
+ @Alerts(CHROME = {HttpHeader.HOST, HttpHeader.CONNECTION, "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT,
HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE,
"Cookie"},
FF45 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
- HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, "Cookie", "Connection"},
+ HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.CONNECTION},
FF52 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
- HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, "Cookie", "Connection",
+ HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.CONNECTION,
"Upgrade-Insecure-Requests"},
IE = {HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT,
- HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, "DNT", "Connection", "Cookie"})
+ HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.DNT, HttpHeader.CONNECTION,
+ HttpHeader.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/UrlFetchWebConnectionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/UrlFetchWebConnectionTest.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/UrlFetchWebConnectionTest.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -193,7 +193,7 @@
}
private static String headersToString(final WebRequest request) {
- final Set<String> caseInsensitiveHeaders = new HashSet<>(Arrays.asList("Connection"));
+ final Set<String> caseInsensitiveHeaders = new HashSet<>(Arrays.asList(HttpHeader.CONNECTION));
final StringBuilder sb = new StringBuilder();
// ensure ordering for comparison
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient5Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient5Test.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient5Test.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -45,7 +45,7 @@
@Test
public void addRequestHeader_Cookie() throws Exception {
try (WebClient wc = new WebClient()) {
- wc.addRequestHeader("Cookie", "some_value");
+ wc.addRequestHeader(HttpHeader.COOKIE, "some_value");
fail("Should have thrown an exception ");
}
catch (final IllegalArgumentException e) {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -23,6 +23,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.AlertsStandards;
import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
@@ -1079,7 +1080,7 @@
@Test
@Alerts("exception")
public void connection() throws Exception {
- test("Connection");
+ test(HttpHeader.CONNECTION);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocketTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocketTest.java 2017-11-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocketTest.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -47,6 +47,7 @@
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.HttpHeader;
import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
import com.gargoylesoftware.htmlunit.WebClient;
@@ -335,7 +336,8 @@
@Override
public void onWebSocketText(final String data) {
try {
- final String cookie = session_.getUpgradeRequest().getHeaders().get("Cookie").get(0) + counter_++;
+ final String cookie = session_.getUpgradeRequest().getHeaders()
+ .get(HttpHeader.COOKIE).get(0) + counter_++;
for (final CookiesWebSocket webSocket : webSockets_) {
webSocket.session_.getRemote().sendString(cookie);
}
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-14 19:46:16 UTC (rev 14951)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2017-11-14 20:15:12 UTC (rev 14952)
@@ -1288,7 +1288,8 @@
assertTrue(XMLHttpRequest.isAuthorizedHeader("Content-Type"));
final String[] headers = {"accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
- "connection", "content-length", "cookie", "cookie2", "content-transfer-encoding", "date",
+ HttpHeader.CONNECTION_LC, "content-length", HttpHeader.COOKIE_LC, "cookie2",
+ "content-transfer-encoding", "date",
"expect", HttpHeader.HOST_LC, "keep-alive", HttpHeader.REFERER_LC,
"te", "trailer", "transfer-encoding", "upgrade",
HttpHeader.USER_AGENT_LC, "via" };
|
