Menu
▾
▴
[HtmlUnit] SVN: [14953] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-11-14 20:20:02
|
Revision: 14953
http://sourceforge.net/p/htmlunit/code/14953
Author: rbri
Date: 2017-11-14 20:19:59 +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/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/WebClient3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngineTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.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 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -163,7 +163,14 @@
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, HttpHeader.COOKIE, HttpHeader.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 +189,15 @@
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, HttpHeader.COOKIE, HttpHeader.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,7 +213,14 @@
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, HttpHeader.DNT, HttpHeader.CONNECTION,
+ 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";
@@ -226,7 +248,15 @@
CHROME.cpuClass_ = null;
CHROME.productSub_ = "20030107";
CHROME.headerNamesOrdered_ = new String[] {
- HttpHeader.HOST, HttpHeader.CONNECTION, "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.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 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -59,6 +59,11 @@
/** host. */
public static final String HOST_LC = "host";
+ /** Content-Length. */
+ public static final String CONTENT_LENGTH = "Content-Length";
+ /** content-length. */
+ public static final String CONTENT_LENGTH_LC = "content-length";
+
/** Cookie. */
public static final String COOKIE = "Cookie";
/** cookie. */
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 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -109,7 +109,7 @@
private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList(
"accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
- HttpHeader.CONNECTION_LC, "content-length", HttpHeader.COOKIE_LC, "cookie2",
+ HttpHeader.CONNECTION_LC, HttpHeader.CONTENT_LENGTH_LC, 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/javascript/host/xml/XMLHttpRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-11-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -134,7 +134,7 @@
private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList(
"accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
- HttpHeader.CONNECTION_LC, "content-length", HttpHeader.COOKIE_LC, "cookie2",
+ HttpHeader.CONNECTION_LC, HttpHeader.CONTENT_LENGTH_LC, 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/HttpWebConnection2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2017-11-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -244,7 +244,7 @@
final byte[] content = new byte[] {-1};
final List<NameValuePair> headers = new ArrayList<>();
headers.add(new NameValuePair("Content-Encoding", "gzip"));
- headers.add(new NameValuePair("Content-Length", String.valueOf(content.length)));
+ headers.add(new NameValuePair(HttpHeader.CONTENT_LENGTH, String.valueOf(content.length)));
final MockWebConnection conn = getMockWebConnection();
conn.setResponse(URL_FIRST, content, 404, "OK", "text/html", headers);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient3Test.java 2017-11-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient3Test.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -438,7 +438,7 @@
final List<NameValuePair> headers = new ArrayList<>();
headers.add(new NameValuePair("Content-Encoding", "deflate"));
- headers.add(new NameValuePair("Content-Length", String.valueOf(compressedDataLength)));
+ headers.add(new NameValuePair(HttpHeader.CONTENT_LENGTH, String.valueOf(compressedDataLength)));
final MockWebConnection conn = getMockWebConnection();
conn.setResponse(URL_SECOND, content, 200, "OK", "text/javascript", headers);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java 2017-11-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -101,7 +101,7 @@
headers.add(new NameValuePair("Content-Encoding", "gzip"));
if (contentLength != -1) {
- headers.add(new NameValuePair("Content-Length", String.valueOf(contentLength)));
+ headers.add(new NameValuePair(HttpHeader.CONTENT_LENGTH, String.valueOf(contentLength)));
}
if (contentType != null) {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseTest.java 2017-11-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseTest.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -214,7 +214,7 @@
page.getWebResponse().getContentAsString(UTF_8));
assertEquals("gzip", page.getWebResponse().getResponseHeaderValue("Content-Encoding"));
- assertEquals("73", page.getWebResponse().getResponseHeaderValue("Content-Length"));
+ assertEquals("73", page.getWebResponse().getResponseHeaderValue(HttpHeader.CONTENT_LENGTH));
}
/**
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-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -1179,7 +1179,7 @@
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
assertEquals(expectedHeaders[0], "" + headers.get(HttpHeader.ACCEPT));
assertEquals(expectedHeaders[1], "" + headers.get(HttpHeader.ACCEPT_ENCODING));
- assertEquals(expectedHeaders[2], "" + headers.get("Content-Length"));
+ assertEquals(expectedHeaders[2], "" + headers.get(HttpHeader.CONTENT_LENGTH));
assertEquals(expectedHeaders[3], "" + headers.get(HttpHeader.HOST));
assertEquals(expectedHeaders[4], "" + headers.get(HttpHeader.REFERER));
}
@@ -1215,7 +1215,7 @@
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
assertEquals(expectedHeaders[0], "" + headers.get(HttpHeader.ACCEPT));
assertEquals(expectedHeaders[1], "" + headers.get(HttpHeader.ACCEPT_ENCODING));
- assertEquals(expectedHeaders[2], "" + headers.get("Content-Length"));
+ assertEquals(expectedHeaders[2], "" + headers.get(HttpHeader.CONTENT_LENGTH));
assertEquals(expectedHeaders[3], "" + headers.get(HttpHeader.HOST));
assertEquals(expectedHeaders[4], "" + headers.get(HttpHeader.REFERER));
}
@@ -1320,7 +1320,7 @@
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
- assertEquals(contentLength, headers.get("Content-Length"));
+ assertEquals(contentLength, headers.get(HttpHeader.CONTENT_LENGTH));
}
private void property(final String property) throws Exception {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngineTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngineTest.java 2017-11-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngineTest.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -36,6 +36,7 @@
import com.gargoylesoftware.htmlunit.BrowserVersion;
import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.HttpHeader;
import com.gargoylesoftware.htmlunit.HttpMethod;
import com.gargoylesoftware.htmlunit.MockWebConnection;
import com.gargoylesoftware.htmlunit.ScriptException;
@@ -355,7 +356,7 @@
bytes.write("".getBytes("ASCII"));
final List<NameValuePair> headers = new ArrayList<>();
- headers.add(new NameValuePair("Content-Length", "0"));
+ headers.add(new NameValuePair(HttpHeader.CONTENT_LENGTH, "0"));
headers.add(new NameValuePair("Content-Encoding", "gzip"));
webConnection.setResponse(new URL(URL_FIRST, "foo.js"),
bytes.toByteArray(), 200, "OK", "text/javascript", headers);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetListTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetListTest.java 2017-11-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetListTest.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -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.NotYetImplemented;
import com.gargoylesoftware.htmlunit.WebDriverTestCase;
@@ -192,7 +193,7 @@
getMockWebConnection().setDefaultResponse(css, "text/css");
final List<NameValuePair> headers = new ArrayList<>();
- headers.add(new NameValuePair("Content-Length", "0"));
+ headers.add(new NameValuePair(HttpHeader.CONTENT_LENGTH, "0"));
headers.add(new NameValuePair("Content-Encoding", "gzip"));
getMockWebConnection().setDefaultResponse(css, 200, "OK", "text/css", headers);
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-14 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -184,7 +184,7 @@
final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
final Map<String, String> headers = lastRequest.getAdditionalHeaders();
- assertEquals("" + body.length(), headers.get("Content-Length"));
+ assertEquals("" + body.length(), headers.get(HttpHeader.CONTENT_LENGTH));
}
/**
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 20:15:12 UTC (rev 14952)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2017-11-14 20:19:59 UTC (rev 14953)
@@ -1288,7 +1288,7 @@
assertTrue(XMLHttpRequest.isAuthorizedHeader("Content-Type"));
final String[] headers = {"accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
- HttpHeader.CONNECTION_LC, "content-length", HttpHeader.COOKIE_LC, "cookie2",
+ HttpHeader.CONNECTION_LC, HttpHeader.CONTENT_LENGTH_LC, HttpHeader.COOKIE_LC, "cookie2",
"content-transfer-encoding", "date",
"expect", HttpHeader.HOST_LC, "keep-alive", HttpHeader.REFERER_LC,
"te", "trailer", "transfer-encoding", "upgrade",
|
