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

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

Revision: 14955
          http://sourceforge.net/p/htmlunit/code/14955
Author:   rbri
Date:     2017-11-14 20:31:58 +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/HttpWebConnection.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.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:27:22 UTC (rev 14954)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpHeader.java	2017-11-14 20:31:58 UTC (rev 14955)
@@ -85,6 +85,9 @@
     /** DNT. */
     public static final String DNT = "DNT";
 
+    /** Upgrade-Insecure-Requests. */
+    public static final String UPGRADE_INSECURE_REQUESTS = "Upgrade-Insecure-Requests";
+
     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 20:27:22 UTC (rev 14954)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java	2017-11-14 20:31:58 UTC (rev 14955)
@@ -794,7 +794,7 @@
                 else if (HttpHeader.ACCEPT_ENCODING.equals(header) && requestHeaders.get(header) != null) {
                     list.add(new AcceptEncodingHeaderHttpRequestInterceptor(requestHeaders.get(header)));
                 }
-                else if ("Upgrade-Insecure-Requests".equals(header) && requestHeaders.get(header) != null) {
+                else if (HttpHeader.UPGRADE_INSECURE_REQUESTS.equals(header) && requestHeaders.get(header) != null) {
                     list.add(new UpgradeInsecureRequestHeaderHttpRequestInterceptor(requestHeaders.get(header)));
                 }
                 else if (HttpHeader.REFERER.equals(header) && requestHeaders.get(header) != null) {
@@ -891,7 +891,7 @@
 
         @Override
         public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
-            request.setHeader("Upgrade-Insecure-Requests", value_);
+            request.setHeader(HttpHeader.UPGRADE_INSECURE_REQUESTS, value_);
         }
     }
 

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:27:22 UTC (rev 14954)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2017-11-14 20:31:58 UTC (rev 14955)
@@ -1463,8 +1463,8 @@
             wrs.setAdditionalHeader(HttpHeader.ACCEPT_LANGUAGE, getBrowserVersion().getBrowserLanguage());
         }
         if (getBrowserVersion().hasFeature(HTTP_HEADER_UPGRADE_INSECURE_REQUEST)
-                && !wrs.isAdditionalHeader("Upgrade-Insecure-Requests")) {
-            wrs.setAdditionalHeader("Upgrade-Insecure-Requests", "1");
+                && !wrs.isAdditionalHeader(HttpHeader.UPGRADE_INSECURE_REQUESTS)) {
+            wrs.setAdditionalHeader(HttpHeader.UPGRADE_INSECURE_REQUESTS, "1");
         }
         // Add user-specified headers last so that they can override HtmlUnit defaults.
         wrs.getAdditionalHeaders().putAll(requestHeaders_);

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2017-11-14 20:27:22 UTC (rev 14954)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2017-11-14 20:31:58 UTC (rev 14955)
@@ -47,12 +47,13 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(CHROME = {HttpHeader.HOST, HttpHeader.CONNECTION, "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT,
+    @Alerts(CHROME = {HttpHeader.HOST, HttpHeader.CONNECTION, HttpHeader.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, HttpHeader.CONNECTION},
+                        HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION},
             FF52 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
-                        HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION, "Upgrade-Insecure-Requests"},
+                        HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION, HttpHeader.UPGRADE_INSECURE_REQUESTS},
             IE = {HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.DNT, HttpHeader.CONNECTION})
     @NotYetImplemented(IE)
@@ -92,14 +93,15 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(CHROME = {HttpHeader.HOST, HttpHeader.CONNECTION, "Upgrade-Insecure-Requests", HttpHeader.USER_AGENT,
+    @Alerts(CHROME = {HttpHeader.HOST, HttpHeader.CONNECTION, HttpHeader.UPGRADE_INSECURE_REQUESTS,
+                        HttpHeader.USER_AGENT,
                         HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE,
-                        "Cookie"},
+                        HttpHeader.COOKIE},
             FF45 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
                         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, HttpHeader.COOKIE, HttpHeader.CONNECTION,
-                        "Upgrade-Insecure-Requests"},
+                        HttpHeader.UPGRADE_INSECURE_REQUESTS},
             IE = {HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.DNT, HttpHeader.CONNECTION,
                         HttpHeader.COOKIE})