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

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

Revision: 15041
          http://sourceforge.net/p/htmlunit/code/15041
Author:   rbri
Date:     2017-12-24 15:46:44 +0000 (Sun, 24 Dec 2017)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2017-12-24 15:02:46 UTC (rev 15040)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2017-12-24 15:46:44 UTC (rev 15041)
@@ -1216,7 +1216,9 @@
      * @param style the style of the element
      */
     protected void setStyle(final String style) {
-        getStyle().setCssText(style);
+        if (!getBrowserVersion().hasFeature(JS_ELEMENT_GET_ATTRIBUTE_RETURNS_EMPTY)) {
+            getStyle().setCssText(style);
+        }
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java	2017-12-24 15:02:46 UTC (rev 15040)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java	2017-12-24 15:46:44 UTC (rev 15041)
@@ -1785,10 +1785,11 @@
             + "<script>\n"
             + "  function test() {\n"
             + "    var div1 = document.getElementById('div1');\n"
+
             + "    var empty = getOffsetHeight('width: 300px; height: 300px;');\n"
             + "    var marginAndPadding = getOffsetHeight('width: 300px; height: 300px; margin: 3px; padding: 5px;');\n"
             + "    var withBorderBox = getOffsetHeight('width: 300px; height: 300px; margin: 3px; padding: 5px;"
-            + " box-sizing: border-box;');\n"
+                                                            + " box-sizing: border-box;');\n"
             + "    alert(marginAndPadding - empty);\n"
             + "    alert(withBorderBox - empty);\n"
             + "  }\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java	2017-12-24 15:02:46 UTC (rev 15040)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java	2017-12-24 15:46:44 UTC (rev 15041)
@@ -21,12 +21,10 @@
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
 
 /**
  * Tests for {@link MutationObserver}.
@@ -359,15 +357,6 @@
         final WebDriver driver = loadPage2(html);
         driver.findElement(By.id("id1")).click();
         verifyAlerts(driver, getExpectedAlerts());
-
-        if (driver instanceof HtmlUnitDriver) {
-            driver.get(URL_FIRST.toExternalForm());
-            final HtmlElement element = toHtmlElement(driver.findElement(By.id("headline")));
-            element.setAttribute("style", "color: red");
-
-            element.getHtmlPageOrNull().getWebClient().getJavaScriptEngine().processPostponedActions();
-            verifyAlerts(driver, getExpectedAlerts());
-        }
     }
 
     /**
@@ -402,7 +391,7 @@
             + "<body onload='test()'>\n"
             + "  <div id='myDiv' style='color: green'>old</div>\n"
             + "</body></html>";
-        loadPageWithAlerts2(html, 700000);
+        loadPageWithAlerts2(html);
     }
 
     /**