Menu
▾
▴
[HtmlUnit] SVN: [14954] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-11-14 20:27:25
|
Revision: 14954
http://sourceforge.net/p/htmlunit/code/14954
Author: rbri
Date: 2017-11-14 20:27:22 +0000 (Tue, 14 Nov 2017)
Log Message:
-----------
use constants
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/MockWebConnection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/StringWebResponse.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/WebResponse.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/main/java/com/gargoylesoftware/htmlunit/util/EncodingSniffer.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/FalsifyingWebConnection.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.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/html/HtmlFileInputTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMetaElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/util/EncodingSnifferTest.java
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:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -64,6 +64,14 @@
/** content-length. */
public static final String CONTENT_LENGTH_LC = "content-length";
+ /** Content-Type. */
+ public static final String CONTENT_TYPE = "Content-Type";
+ /** content-type. */
+ public static final String CONTENT_TYPE_LC = "content-type";
+
+ /** content-language. */
+ public static final String CONTENT_LANGUAGE_LC = "content-language";
+
/** Cookie. */
public static final String COOKIE = "Cookie";
/** cookie. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/MockWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/MockWebConnection.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/MockWebConnection.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -79,7 +79,7 @@
compiledHeaders.addAll(headers);
}
if (contentType != null) {
- compiledHeaders.add(new NameValuePair("Content-Type", contentType));
+ compiledHeaders.add(new NameValuePair(HttpHeader.CONTENT_TYPE, contentType));
}
return compiledHeaders;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/StringWebResponse.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/StringWebResponse.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/StringWebResponse.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -69,7 +69,7 @@
private static WebResponseData getWebResponseData(final String contentString, final Charset charset) {
final byte[] content = TextUtil.stringToByteArray(contentString, charset);
final List<NameValuePair> compiledHeaders = new ArrayList<>();
- compiledHeaders.add(new NameValuePair("Content-Type", "text/html; charset=" + charset));
+ compiledHeaders.add(new NameValuePair(HttpHeader.CONTENT_TYPE, "text/html; charset=" + charset));
return new WebResponseData(content, HttpStatus.SC_OK, "OK", compiledHeaders);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/UrlFetchWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/UrlFetchWebConnection.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/UrlFetchWebConnection.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -112,7 +112,7 @@
if (HttpMethod.POST == httpMethod || HttpMethod.PUT == httpMethod || HttpMethod.PATCH == httpMethod) {
connection.setDoOutput(true);
final Charset charset = webRequest.getCharset();
- connection.addRequestProperty("Content-Type", FormEncodingType.URL_ENCODED.getName());
+ connection.addRequestProperty(HttpHeader.CONTENT_TYPE, FormEncodingType.URL_ENCODED.getName());
try (OutputStream outputStream = connection.getOutputStream()) {
final List<NameValuePair> pairs = webRequest.getRequestParameters();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -1150,7 +1150,7 @@
catch (final DecoderException e) {
throw new IOException(e.getMessage());
}
- responseHeaders.add(new NameValuePair("content-type",
+ responseHeaders.add(new NameValuePair(HttpHeader.CONTENT_TYPE_LC,
connection.getMediaType() + ";charset=" + connection.getCharset()));
try (InputStream is = connection.getInputStream()) {
@@ -1195,7 +1195,7 @@
if (!file.exists()) {
// construct 404
final List<NameValuePair> compiledHeaders = new ArrayList<>();
- compiledHeaders.add(new NameValuePair("Content-Type", "text/html"));
+ compiledHeaders.add(new NameValuePair(HttpHeader.CONTENT_TYPE, "text/html"));
final WebResponseData responseData =
new WebResponseData(
TextUtil.stringToByteArray("File: " + file.getAbsolutePath(), UTF_8),
@@ -1207,7 +1207,7 @@
final DownloadedContent content = new DownloadedContent.OnFile(file, false);
final List<NameValuePair> compiledHeaders = new ArrayList<>();
- compiledHeaders.add(new NameValuePair("Content-Type", contentType));
+ compiledHeaders.add(new NameValuePair(HttpHeader.CONTENT_TYPE, contentType));
final WebResponseData responseData = new WebResponseData(content, 200, "OK", compiledHeaders);
return new WebResponse(responseData, webRequest, 0);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebResponse.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebResponse.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebResponse.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -135,7 +135,7 @@
* @return the content type returned from the server, e.g. "text/html"
*/
public String getContentType() {
- final String contentTypeHeader = getResponseHeaderValue("content-type");
+ final String contentTypeHeader = getResponseHeaderValue(HttpHeader.CONTENT_TYPE_LC);
if (contentTypeHeader == null) {
// Not technically legal but some servers don't return a content-type
return "";
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:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -651,7 +651,7 @@
* @param value header value
*/
private static boolean isPreflightHeader(final String name, final String value) {
- if ("content-type".equals(name)) {
+ if (HttpHeader.CONTENT_TYPE_LC.equals(name)) {
final String lcValue = value.toLowerCase(Locale.ROOT);
if (lcValue.startsWith(FormEncodingType.URL_ENCODED.getName())
|| lcValue.startsWith(FormEncodingType.MULTIPART.getName())
@@ -662,7 +662,7 @@
}
if (HttpHeader.ACCEPT_LC.equals(name)
|| HttpHeader.ACCEPT_LANGUAGE_LC.equals(name)
- || "content-language".equals(name)
+ || HttpHeader.CONTENT_LANGUAGE_LC.equals(name)
|| HttpHeader.REFERER_LC.equals(name)
|| HttpHeader.ACCEPT_ENCODING_LC.equals(name)
|| HttpHeader.ORIGIN_LC.equals(name)) {
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:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -874,7 +874,7 @@
* @param value header value
*/
private static boolean isPreflightHeader(final String name, final String value) {
- if ("content-type".equals(name)) {
+ if (HttpHeader.CONTENT_TYPE_LC.equals(name)) {
final String lcValue = value.toLowerCase(Locale.ROOT);
if (lcValue.startsWith(FormEncodingType.URL_ENCODED.getName())
|| lcValue.startsWith(FormEncodingType.MULTIPART.getName())
@@ -885,7 +885,7 @@
}
if (HttpHeader.ACCEPT_LC.equals(name)
|| HttpHeader.ACCEPT_LANGUAGE_LC.equals(name)
- || "content-language".equals(name)
+ || HttpHeader.CONTENT_LANGUAGE_LC.equals(name)
|| HttpHeader.REFERER_LC.equals(name)
|| "accept-encoding".equals(name)
|| HttpHeader.ORIGIN_LC.equals(name)) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/EncodingSniffer.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/EncodingSniffer.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/EncodingSniffer.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -36,6 +36,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.gargoylesoftware.htmlunit.HttpHeader;
+
/**
* Sniffs encoding settings from HTML, XML or other content. The HTML encoding sniffing algorithm is based on the
* <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding">HTML5
@@ -497,7 +499,7 @@
static boolean contentTypeEndsWith(final List<NameValuePair> headers, final String... contentTypeEndings) {
for (final NameValuePair pair : headers) {
final String name = pair.getName();
- if ("content-type".equalsIgnoreCase(name)) {
+ if (HttpHeader.CONTENT_TYPE_LC.equalsIgnoreCase(name)) {
String value = pair.getValue();
final int i = value.indexOf(';');
if (i != -1) {
@@ -617,7 +619,7 @@
public static Charset sniffEncodingFromHttpHeaders(final List<NameValuePair> headers) {
for (final NameValuePair pair : headers) {
final String name = pair.getName();
- if ("content-type".equalsIgnoreCase(name)) {
+ if (HttpHeader.CONTENT_TYPE_LC.equalsIgnoreCase(name)) {
final Charset encoding = extractEncodingFromContentType(pair.getValue());
if (encoding != null) {
if (LOG.isDebugEnabled()) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/FalsifyingWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/FalsifyingWebConnection.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/FalsifyingWebConnection.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
+import com.gargoylesoftware.htmlunit.HttpHeader;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.WebConnection;
import com.gargoylesoftware.htmlunit.WebRequest;
@@ -110,7 +111,7 @@
protected WebResponse createWebResponse(final WebRequest wr, final String content,
final String contentType, final int responseCode, final String responseMessage) throws IOException {
final List<NameValuePair> headers = new ArrayList<>();
- headers.add(new NameValuePair("content-type", contentType + "; charset=" + UTF_8));
+ headers.add(new NameValuePair(HttpHeader.CONTENT_TYPE_LC, contentType + "; charset=" + UTF_8));
final byte[] body = content.getBytes(UTF_8);
final WebResponseData wrd = new WebResponseData(body, responseCode, responseMessage, headers);
return new WebResponse(wrd, wr.getUrl(), wr.getHttpMethod(), 0);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -719,7 +719,7 @@
boolean charsetInContentType = false;
for (final NameValuePair responseHeader : resp.getHeaders()) {
final String headerName = responseHeader.getName();
- if ("Content-Type".equals(headerName) && responseHeader.getValue().contains("charset=")) {
+ if (HttpHeader.CONTENT_TYPE.equals(headerName) && responseHeader.getValue().contains("charset=")) {
charsetInContentType = true;
}
response.addHeader(headerName, responseHeader.getValue());
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:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseDataTest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -105,7 +105,7 @@
}
if (contentType != null) {
- headers.add(new NameValuePair("Content-Type", contentType));
+ headers.add(new NameValuePair(HttpHeader.CONTENT_TYPE, contentType));
}
final WebResponseData data = new WebResponseData("".getBytes(), statusCode, "OK", headers);
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:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebResponseTest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -114,7 +114,7 @@
private void illegalCharset(final String cntTypeHeader, final Charset expectedCharset) throws Exception {
final MockWebConnection conn = new MockWebConnection();
final List<NameValuePair> headers = new ArrayList<>();
- headers.add(new NameValuePair("Content-Type", cntTypeHeader));
+ headers.add(new NameValuePair(HttpHeader.CONTENT_TYPE, cntTypeHeader));
conn.setDefaultResponse("<html/>", 200, "OK", "text/html", headers);
final WebClient webClient = getWebClient();
webClient.setWebConnection(conn);
@@ -121,7 +121,7 @@
final Page page = webClient.getPage(URL_FIRST);
assertEquals(expectedCharset, page.getWebResponse().getContentCharset());
- assertEquals(cntTypeHeader, page.getWebResponse().getResponseHeaderValue("Content-Type"));
+ assertEquals(cntTypeHeader, page.getWebResponse().getResponseHeaderValue(HttpHeader.CONTENT_TYPE));
assertEquals("<html/>", page.getWebResponse().getContentAsString());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -44,6 +44,7 @@
import org.openqa.selenium.ie.InternetExplorerDriver;
import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.HttpHeader;
import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
import com.gargoylesoftware.htmlunit.WebDriverTestCase;
import com.gargoylesoftware.htmlunit.WebRequest;
@@ -425,7 +426,7 @@
driver.findElement(By.id("mySubmit")).click();
final WebRequest request = getMockWebConnection().getLastWebRequest();
- final String contentType = request.getAdditionalHeaders().get("Content-Type");
+ final String contentType = request.getAdditionalHeaders().get(HttpHeader.CONTENT_TYPE);
assertTrue(StringUtils.isNotBlank(contentType));
assertFalse(StringUtils.containsIgnoreCase(contentType, "charset"));
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -31,6 +31,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.MockWebConnection;
@@ -1126,7 +1127,7 @@
getMockWebConnection().setDefaultResponse("");
loadPageWithAlerts2(html);
String headerValue = getMockWebConnection().getLastWebRequest().getAdditionalHeaders()
- .get("Content-Type");
+ .get(HttpHeader.CONTENT_TYPE);
// Can't test equality for multipart/form-data as it will have the form:
// multipart/form-data; boundary=---------------------------42937861433140731107235900
headerValue = StringUtils.substringBefore(headerValue, ";");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMetaElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMetaElementTest.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMetaElementTest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -18,6 +18,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.WebDriverTestCase;
@@ -35,8 +36,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = {"undefined", "text/html; charset=utf-8", "Content-Type", "", "", "undefined"},
- IE = {"", "text/html; charset=utf-8", "Content-Type", "", "", ""})
+ @Alerts(DEFAULT = {"undefined", "text/html; charset=utf-8", HttpHeader.CONTENT_TYPE, "", "", "undefined"},
+ IE = {"", "text/html; charset=utf-8", HttpHeader.CONTENT_TYPE, "", "", ""})
public void name() throws Exception {
final String html =
"<html>\n"
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:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -1104,7 +1104,7 @@
@Override
protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws IOException {
resp.setStatus(200);
- resp.addHeader("Content-Type", "text/html");
+ resp.addHeader(HttpHeader.CONTENT_TYPE, "text/html");
try {
for (int i = 0; i < 10; i++) {
resp.getOutputStream().print(String.valueOf(i));
@@ -1154,7 +1154,7 @@
}
resp.setStatus(200);
- resp.addHeader("Content-Type", "text/plain");
+ resp.addHeader(HttpHeader.CONTENT_TYPE, "text/plain");
resp.getOutputStream().print(authToken);
resp.flushBuffer();
}
@@ -1285,7 +1285,7 @@
@Test
public void isAuthorizedHeader() throws Exception {
assertTrue(XMLHttpRequest.isAuthorizedHeader("Foo"));
- assertTrue(XMLHttpRequest.isAuthorizedHeader("Content-Type"));
+ assertTrue(XMLHttpRequest.isAuthorizedHeader(HttpHeader.CONTENT_TYPE));
final String[] headers = {"accept-charset", HttpHeader.ACCEPT_ENCODING_LC,
HttpHeader.CONNECTION_LC, HttpHeader.CONTENT_LENGTH_LC, HttpHeader.COOKIE_LC, "cookie2",
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/util/EncodingSnifferTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/util/EncodingSnifferTest.java 2017-11-14 20:19:59 UTC (rev 14953)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/util/EncodingSnifferTest.java 2017-11-14 20:27:22 UTC (rev 14954)
@@ -26,6 +26,8 @@
import org.junit.Test;
+import com.gargoylesoftware.htmlunit.HttpHeader;
+
/**
* Unit tests for {@link EncodingSniffer}.
*
@@ -41,10 +43,10 @@
public void fromHttpHeaders() throws Exception {
header(null, null, null);
header(null, "foo", "bar");
- header(null, "Content-Type", "blah");
- header(null, "Content-Type", "text/html;charset=blah");
- header(UTF_8, "Content-Type", "text/html;charset=utf-8");
- header(UTF_8, "Content-Type", "text/html;charset=utf-8;");
+ header(null, HttpHeader.CONTENT_TYPE, "blah");
+ header(null, HttpHeader.CONTENT_TYPE, "text/html;charset=blah");
+ header(UTF_8, HttpHeader.CONTENT_TYPE, "text/html;charset=utf-8");
+ header(UTF_8, HttpHeader.CONTENT_TYPE, "text/html;charset=utf-8;");
}
private static void header(final Charset expectedEncoding, final String headerName, final String headerValue) {
|
