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

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

Revision: 15378
          http://sourceforge.net/p/htmlunit/code/15378
Author:   rbri
Date:     2018-06-21 18:31:07 +0000 (Thu, 21 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 16:42:37 UTC (rev 15377)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 18:31:07 UTC (rev 15378)
@@ -1210,6 +1210,10 @@
     @BrowserFeature(IE)
     JS_STYLE_UNSUPPORTED_PROPERTY_GETTER,
 
+    /** Indicates if style properties are always in lower case. */
+    @BrowserFeature({CHROME, FF60, IE})
+    JS_STYLE_VALUES_LOWERCASE,
+
     /** Indicates wordSpacing support percent values. */
     @BrowserFeature(FF)
     JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT,
@@ -1529,14 +1533,14 @@
     @BrowserFeature(IE)
     WINDOW_EXECUTE_EVENTS,
 
+    /** XMLHttpRequest.getAllResponseHeaders() has a trailing separator. */
+    @BrowserFeature(IE)
+    XHR_ALL_RESPONSE_HEADERS_APPEND_SEPARATOR,
+
     /** XMLHttpRequest.getAllResponseHeaders() uses only Lf as separator. */
     @BrowserFeature({FF60, IE})
     XHR_ALL_RESPONSE_HEADERS_SEPARATE_BY_LF,
 
-    /** XMLHttpRequest.getAllResponseHeaders() has a trailing separator. */
-    @BrowserFeature(IE)
-    XHR_ALL_RESPONSE_HEADERS_APPEND_SEPARATOR,
-
     /** XMLHttpRequest triggers the opened event at the beginning of the send method again. */
     @BrowserFeature(IE)
     XHR_FIRE_STATE_OPENED_AGAIN_IN_ASYNC_MODE,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java	2018-06-21 16:42:37 UTC (rev 15377)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java	2018-06-21 18:31:07 UTC (rev 15378)
@@ -24,6 +24,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_ZINDEX_TYPE_INTEGER;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_SET_PROPERTY_IMPORTANT_IGNORES_CASE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_UNSUPPORTED_PROPERTY_GETTER;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_VALUES_LOWERCASE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_WRONG_INDEX_RETURNS_UNDEFINED;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
@@ -1680,7 +1681,7 @@
         if (element != null && element.getValue() != null) {
             final String value = element.getValue();
             if (!value.contains("url")
-                    && getBrowserVersion().hasFeature(JS_STYLE_SET_PROPERTY_IMPORTANT_IGNORES_CASE)) {
+                    && getBrowserVersion().hasFeature(JS_STYLE_VALUES_LOWERCASE)) {
                 return value.toLowerCase(Locale.ROOT);
             }
             return value;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java	2018-06-21 16:42:37 UTC (rev 15377)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java	2018-06-21 18:31:07 UTC (rev 15378)
@@ -37,12 +37,10 @@
     private PrintStream originalErr_;
     private final ByteArrayOutputStream baos_ = new ByteArrayOutputStream();
     private static final Pattern[] PATTERNS = {
-
             // chrome
             Pattern.compile("Starting ChromeDriver " + ExternalTest.CHROME_DRIVER_.replace(".", "\\.")
                     + "\\.[0-9]+ ?\\(?[0-9a-f]*\\)? on port \\d*\r?\n"
                     + "Only local connections are allowed\\.\r?\n"),
-
             // GeckoDriver
             Pattern.compile("[0-9]*\\sgeckodriver\\sINFO\\sgeckodriver "
                                 + ExternalTest.GECKO_DRIVER_.replace(".", "\\.") + ".*", Pattern.DOTALL),
@@ -51,7 +49,6 @@
                     + "3\\.8\\.0\\.0\r?\n"
                     + "Listening on port \\d*\r?\n"
                     + "Only local connections are allowed\r?\n"),
-
             // edge
             Pattern.compile(".*Listening on http://localhost:\\d*/ \r\r?\n"),
             Pattern.compile(".*Stopping server.\r\r?\n"),

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement2Test.java	2018-06-21 16:42:37 UTC (rev 15377)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement2Test.java	2018-06-21 18:31:07 UTC (rev 15378)
@@ -43,7 +43,8 @@
      */
     @Test
     public void callAppletMethodFromJS() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (getBrowserVersion().isChrome()
+                || (getBrowserVersion().isFirefox() && !getBrowserVersion().isFirefox52())) {
             return;
         }