[HtmlUnit] SVN: [14942] trunk/htmlunit/src

[<rb...@us...>]

Revision: 14942
          http://sourceforge.net/p/htmlunit/code/14942
Author:   rbri
Date:     2017-11-12 19:07:30 +0000 (Sun, 12 Nov 2017)
Log Message:
-----------
use constants

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImageInput.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/Location.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.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/HtmlAnchor2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAreaTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrameSetTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageDownloadTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLinkTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window3Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -40,6 +40,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpStatus;
 
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.SgmlPage;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -462,7 +463,7 @@
                 final URL url = page.getFullyQualifiedUrl(src);
                 final String accept = webclient.getBrowserVersion().getImgAcceptHeader();
                 final WebRequest request = new WebRequest(url, accept);
-                request.setAdditionalHeader("Referer", page.getUrl().toExternalForm());
+                request.setAdditionalHeader(HttpHeader.REFERER, page.getUrl().toExternalForm());
                 imageWebResponse_ = webclient.loadWebResponse(request);
             }
 

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImageInput.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImageInput.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImageInput.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -29,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.SgmlPage;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -215,7 +216,7 @@
                 final URL url = page.getFullyQualifiedUrl(src);
                 final String accept = webclient.getBrowserVersion().getImgAcceptHeader();
                 final WebRequest request = new WebRequest(url, accept);
-                request.setAdditionalHeader("Referer", page.getUrl().toExternalForm());
+                request.setAdditionalHeader(HttpHeader.REFERER, page.getUrl().toExternalForm());
                 imageWebResponse_ = webclient.loadWebResponse(request);
             }
 

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-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLink.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -25,6 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpStatus;
 
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.SgmlPage;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
@@ -227,7 +228,7 @@
 
         final WebRequest request = new WebRequest(url);
 
-        request.setAdditionalHeader("Referer", page.getUrl().toExternalForm());
+        request.setAdditionalHeader(HttpHeader.REFERER, page.getUrl().toExternalForm());
 
         final String accept = page.getWebClient().getBrowserVersion().getCssAcceptHeader();
         request.setAdditionalHeader("Accept", accept);

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-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -66,6 +66,7 @@
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import com.gargoylesoftware.htmlunit.History;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.OnbeforeunloadHandler;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.ScriptResult;
@@ -1015,7 +1016,7 @@
         final BrowserVersion browser = client.getBrowserVersion();
         final WebRequest request = new WebRequest(url, browser.getScriptAcceptHeader());
         request.setAdditionalHeaders(new HashMap<>(referringRequest.getAdditionalHeaders()));
-        request.setAdditionalHeader("Referer", referringRequest.getUrl().toString());
+        request.setAdditionalHeader(HttpHeader.REFERER, referringRequest.getUrl().toString());
         request.setAdditionalHeader("Accept", client.getBrowserVersion().getScriptAcceptHeader());
 
         // our cache is a bit strange;

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -34,6 +34,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
@@ -231,7 +232,7 @@
             }
 
             final WebRequest request = new WebRequest(url);
-            request.setAdditionalHeader("Referer", page.getUrl().toExternalForm());
+            request.setAdditionalHeader(HttpHeader.REFERER, page.getUrl().toExternalForm());
 
             final WebWindow webWindow = window_.getWebWindow();
             webWindow.getWebClient().download(webWindow, "", request, true, false, "JS set location");

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -77,6 +77,7 @@
 import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.Cache;
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
 import com.gargoylesoftware.htmlunit.WebResponse;
@@ -336,7 +337,7 @@
                 final String accept = client.getBrowserVersion().getCssAcceptHeader();
                 request = new WebRequest(new URL(url), accept);
                 final String referer = page.getUrl().toExternalForm();
-                request.setAdditionalHeader("Referer", referer);
+                request.setAdditionalHeader(HttpHeader.REFERER, referer);
 
                 // 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/dom/Document.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -64,6 +64,7 @@
 
 import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.SgmlPage;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -356,7 +357,7 @@
         String referrer = "";
         final WebResponse webResponse = getPage().getWebResponse();
         if (webResponse != null) {
-            referrer = webResponse.getWebRequest().getAdditionalHeaders().get("Referer");
+            referrer = webResponse.getWebRequest().getAdditionalHeaders().get(HttpHeader.REFERER);
             if (referrer == null) {
                 referrer = "";
             }

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-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -134,7 +134,8 @@
 
     private static Collection<String> PROHIBITED_HEADERS_ = Arrays.asList("accept-charset", "accept-encoding",
         "connection", "content-length", "cookie", "cookie2", "content-transfer-encoding", "date", "expect",
-        "host", "keep-alive", "referer", "te", "trailer", "transfer-encoding", "upgrade", "user-agent", "via");
+        "host", "keep-alive", HttpHeader.REFERER_LC, "te", "trailer", "transfer-encoding",
+        "upgrade", "user-agent", "via");
 
     private int state_;
     private Function stateChangeHandler_;
@@ -538,7 +539,7 @@
 
             final WebRequest request = new WebRequest(fullUrl, getBrowserVersion().getXmlHttpRequestAcceptHeader());
             request.setCharset(UTF_8);
-            request.setAdditionalHeader("Referer", containingPage_.getUrl().toExternalForm());
+            request.setAdditionalHeader(HttpHeader.REFERER, containingPage_.getUrl().toExternalForm());
 
             if (!isSameOrigin(originUrl, fullUrl)) {
                 final StringBuilder origin = new StringBuilder().append(originUrl.getProtocol()).append("://")
@@ -881,7 +882,8 @@
             return true;
         }
         if ("accept".equals(name) || "accept-language".equals(name) || "content-language".equals(name)
-                || "referer".equals(name) || "accept-encoding".equals(name) || HttpHeader.ORIGIN_LC.equals(name)) {
+                || HttpHeader.REFERER_LC.equals(name) || "accept-encoding".equals(name)
+                || HttpHeader.ORIGIN_LC.equals(name)) {
             return false;
         }
         return true;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -91,14 +91,14 @@
      */
     @Test
     @Alerts(CHROME = {"Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent",
-                        "Accept", "Referer", "Accept-Encoding", "Accept-Language",
+                        "Accept", HttpHeader.REFERER, "Accept-Encoding", "Accept-Language",
                         "Cookie"},
-            FF45 = {"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", "Referer", "Cookie",
+            FF45 = {"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", HttpHeader.REFERER, "Cookie",
                         "Connection"},
-            FF52 = {"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", "Referer", "Cookie",
+            FF52 = {"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", HttpHeader.REFERER, "Cookie",
                         "Connection", "Upgrade-Insecure-Requests"},
-            IE = {"Accept", "Referer", "Accept-Language", "User-Agent", "Accept-Encoding", "Host", "DNT", "Connection",
-                        "Cookie"})
+            IE = {"Accept", HttpHeader.REFERER, "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-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -39,6 +39,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;
@@ -1180,7 +1181,7 @@
             assertEquals(expectedHeaders[1], "" + headers.get("Accept-Encoding"));
             assertEquals(expectedHeaders[2], "" + headers.get("Content-Length"));
             assertEquals(expectedHeaders[3], "" + headers.get("Host"));
-            assertEquals(expectedHeaders[4], "" + headers.get("Referer"));
+            assertEquals(expectedHeaders[4], "" + headers.get(HttpHeader.REFERER));
         }
     }
 
@@ -1216,7 +1217,7 @@
             assertEquals(expectedHeaders[1], "" + headers.get("Accept-Encoding"));
             assertEquals(expectedHeaders[2], "" + headers.get("Content-Length"));
             assertEquals(expectedHeaders[3], "" + headers.get("Host"));
-            assertEquals(expectedHeaders[4], "" + headers.get("Referer"));
+            assertEquals(expectedHeaders[4], "" + headers.get(HttpHeader.REFERER));
         }
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAnchor2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAnchor2Test.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAnchor2Test.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -27,6 +27,7 @@
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.MockWebConnection;
 import com.gargoylesoftware.htmlunit.SimpleWebTestCase;
@@ -381,7 +382,7 @@
         a.click();
 
         final Map<String, String> lastAdditionalHeaders = conn.getLastAdditionalHeaders();
-        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get("Referer"));
+        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get(HttpHeader.REFERER));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAreaTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAreaTest.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAreaTest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -28,6 +28,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.Page;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
@@ -80,7 +81,7 @@
         driver.findElement(By.id("third")).click();
 
         final Map<String, String> lastAdditionalHeaders = getMockWebConnection().getLastAdditionalHeaders();
-        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get("Referer"));
+        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get(HttpHeader.REFERER));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -35,6 +35,7 @@
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.MockWebConnection;
 import com.gargoylesoftware.htmlunit.Page;
@@ -1010,7 +1011,7 @@
         button.click();
 
         final Map<String, String> lastAdditionalHeaders = webConnection.getLastAdditionalHeaders();
-        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get("Referer"));
+        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get(HttpHeader.REFERER));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrameSetTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrameSetTest.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrameSetTest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -25,6 +25,7 @@
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
 import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.MockWebConnection;
 import com.gargoylesoftware.htmlunit.SimpleWebTestCase;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -239,7 +240,7 @@
         assertEquals("First", firstPage.getTitleText());
 
         final Map<String, String> lastAdditionalHeaders = webConnection.getLastAdditionalHeaders();
-        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get("Referer"));
+        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get(HttpHeader.REFERER));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageDownloadTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageDownloadTest.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageDownloadTest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -29,6 +29,7 @@
 import org.junit.runner.RunWith;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebResponse;
 import com.gargoylesoftware.htmlunit.WebServerTestCase;
@@ -117,7 +118,7 @@
         assertNull(htmlImage.getWebResponse(false));
         final WebResponse resp = htmlImage.getWebResponse(true);
         assertNotNull(resp);
-        assertEquals(url.toExternalForm(), resp.getWebRequest().getAdditionalHeaders().get("Referer"));
+        assertEquals(url.toExternalForm(), resp.getWebRequest().getAdditionalHeaders().get(HttpHeader.REFERER));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLinkTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLinkTest.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLinkTest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -18,6 +18,7 @@
 import org.junit.runner.RunWith;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.SimpleWebTestCase;
 import com.gargoylesoftware.htmlunit.WebResponse;
 
@@ -44,6 +45,7 @@
 
         final HtmlLink link = page.getFirstByXPath("//link");
         final WebResponse respCss = link.getWebResponse(true);
-        assertEquals(page.getUrl().toExternalForm(), respCss.getWebRequest().getAdditionalHeaders().get("Referer"));
+        assertEquals(page.getUrl().toExternalForm(),
+                respCss.getWebRequest().getAdditionalHeaders().get(HttpHeader.REFERER));
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -29,6 +29,7 @@
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.MockWebConnection;
 import com.gargoylesoftware.htmlunit.SimpleWebTestCase;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -152,7 +153,7 @@
         client.getPage(URL_FIRST);
 
         final Map<String, String> lastAdditionalHeaders = conn.getLastAdditionalHeaders();
-        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get("Referer"));
+        assertEquals(URL_FIRST.toString(), lastAdditionalHeaders.get(HttpHeader.REFERER));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window3Test.java	2017-11-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window3Test.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -25,6 +25,7 @@
 import org.openqa.selenium.WebDriver;
 
 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;
@@ -1116,10 +1117,10 @@
 
         final Map<String, String> lastAdditionalHeaders = getMockWebConnection().getLastAdditionalHeaders();
         if (expectedAlerts.length == 0) {
-            assertNull(lastAdditionalHeaders.get("Referer"));
+            assertNull(lastAdditionalHeaders.get(HttpHeader.REFERER));
         }
         else {
-            assertEquals(expectedAlerts[0], lastAdditionalHeaders.get("Referer"));
+            assertEquals(expectedAlerts[0], lastAdditionalHeaders.get(HttpHeader.REFERER));
         }
     }
 

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-12 18:46:10 UTC (rev 14941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2017-11-12 19:07:30 UTC (rev 14942)
@@ -37,6 +37,7 @@
 import org.openqa.selenium.WebDriver;
 
 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.BrowserRunner.Tries;
@@ -903,7 +904,7 @@
 
         final WebRequest request = getMockWebConnection().getLastWebRequest();
         assertEquals(urlPage2, request.getUrl());
-        assertEquals(URL_FIRST.toExternalForm(), request.getAdditionalHeaders().get("Referer"));
+        assertEquals(URL_FIRST.toExternalForm(), request.getAdditionalHeaders().get(HttpHeader.REFERER));
     }
 
     /**
@@ -1288,7 +1289,7 @@
 
         final String[] headers = {"accept-charset", "accept-encoding",
             "connection", "content-length", "cookie", "cookie2", "content-transfer-encoding", "date",
-            "expect", "host", "keep-alive", "referer", "te", "trailer", "transfer-encoding", "upgrade",
+            "expect", "host", "keep-alive", HttpHeader.REFERER_LC, "te", "trailer", "transfer-encoding", "upgrade",
             "user-agent", "via" };
         for (final String header : headers) {
             assertFalse(XMLHttpRequest.isAuthorizedHeader(header));