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

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

Revision: 14940
          http://sourceforge.net/p/htmlunit/code/14940
Author:   rbri
Date:     2017-11-12 18:36:17 +0000 (Sun, 12 Nov 2017)
Log Message:
-----------
use constants

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java	2017-11-12 18:35:47 UTC (rev 14939)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java	2017-11-12 18:36:17 UTC (rev 14940)
@@ -52,6 +52,7 @@
 import com.gargoylesoftware.htmlunit.util.EncodingSniffer;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
 import com.gargoylesoftware.htmlunit.util.UrlUtils;
+import com.google.common.net.HttpHeaders;
 
 /**
  * Wrapper for the HTML element "form".
@@ -309,7 +310,7 @@
         if (HttpMethod.POST == method
                 && browser.hasFeature(FORM_SUBMISSION_HEADER_ORIGIN)) {
             referer = StringUtils.stripEnd(referer, "/");
-            request.setAdditionalHeader("Origin", referer);
+            request.setAdditionalHeader(HttpHeaders.ORIGIN, referer);
         }
         if (HttpMethod.POST == method
                 && browser.hasFeature(FORM_SUBMISSION_HEADER_CACHE_CONTROL_MAX_AGE)) {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java	2017-11-12 18:35:47 UTC (rev 14939)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java	2017-11-12 18:36:17 UTC (rev 14940)
@@ -39,6 +39,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.WebDriverTestCase;
@@ -768,7 +769,7 @@
     @Alerts(DEFAULT = {"", ""},
             IE = {"undefined", "something"})
     public void origin() throws Exception {
-        attribute("origin", "something");
+        attribute(HttpHeader.ORIGIN_LC, "something");
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java	2017-11-12 18:35:47 UTC (rev 14939)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java	2017-11-12 18:36:17 UTC (rev 14940)
@@ -35,6 +35,7 @@
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 
 /**
@@ -230,7 +231,7 @@
             }
             response.setCharacterEncoding(UTF_8.name());
             response.setContentType("text/xml");
-            String origin = request.getHeader("Origin");
+            String origin = request.getHeader(HttpHeader.ORIGIN);
             if (origin == null) {
                 origin = "No Origin!";
             }
@@ -461,7 +462,7 @@
             if (ACCESS_CONTROL_ALLOW_HEADERS_ != null) {
                 response.setHeader("Access-Control-Allow-Headers", ACCESS_CONTROL_ALLOW_HEADERS_);
             }
-            options_origin_ = request.getHeader("Origin");
+            options_origin_ = request.getHeader(HttpHeader.ORIGIN);
             options_method_ = request.getHeader("Access-Control-Request-Method");
             options_headers_ = request.getHeader("Access-Control-Request-Headers");
         }
@@ -478,7 +479,7 @@
             response.setContentType("text/xml");
             final Writer writer = response.getWriter();
 
-            final String origin = request.getHeader("Origin");
+            final String origin = request.getHeader(HttpHeader.ORIGIN);
             writer.write("<result>"
                 + "<origin>" + origin + "</origin>"
                 + "<options_origin>" + options_origin_ + "</options_origin>"
@@ -911,7 +912,7 @@
             }
             response.setCharacterEncoding(UTF_8.name());
             response.setContentType("text/xml");
-            String origin = request.getHeader("Origin");
+            String origin = request.getHeader(HttpHeader.ORIGIN);
             if (origin == null) {
                 origin = "No Origin!";
             }