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

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

Revision: 15095
          http://sourceforge.net/p/htmlunit/code/15095
Author:   rbri
Date:     2018-01-27 14:10:40 +0000 (Sat, 27 Jan 2018)
Log Message:
-----------
chrome 64

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-01-27 12:48:16 UTC (rev 15094)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-01-27 14:10:40 UTC (rev 15095)
@@ -448,10 +448,6 @@
     @BrowserFeature(CHROME)
     HTMLLINK_CHECK_TYPE_FOR_STYLESHEET,
 
-    /** */
-    @BrowserFeature({FF, IE})
-    HTMLOPTION_EMPTY_TEXT_IS_NO_CHILDREN,
-
     /** If the single select has exact one option, this options gets never deselected. */
     @BrowserFeature(FF45)
     HTMLOPTION_EXACT_ONE_OPTION_GETS_NERVER_DESELECTED,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java	2018-01-27 12:48:16 UTC (rev 15094)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java	2018-01-27 14:10:40 UTC (rev 15095)
@@ -22,7 +22,6 @@
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_ONMOUSEOVER_NEVER_FOR_SELECT_OPTION;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_ONMOUSEUP_FOR_SELECT_OPTION_TRIGGERS_ADDITIONAL_UP_FOR_SELECT;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_ONMOUSEUP_NOT_FOR_SELECT_OPTION;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLOPTION_EMPTY_TEXT_IS_NO_CHILDREN;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLOPTION_EXACT_ONE_OPTION_GETS_NERVER_DESELECTED;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLOPTION_PREVENT_DISABLED;
 
@@ -391,8 +390,7 @@
      * @param text the text
      */
     public void setText(final String text) {
-        if ((text == null || text.isEmpty())
-                && hasFeature(HTMLOPTION_EMPTY_TEXT_IS_NO_CHILDREN)) {
+        if (text == null || text.isEmpty()) {
             removeAllChildren();
         }
         else {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java	2018-01-27 12:48:16 UTC (rev 15094)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java	2018-01-27 14:10:40 UTC (rev 15095)
@@ -850,9 +850,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = {"[object Text]", "[object Text]", "null"},
-            CHROME = {"null", "[object Text]", "[object Text]"},
-            IE = {"null", "[object Text]", "null"})
+    @Alerts(DEFAULT = {"null", "[object Text]", "null"},
+            FF = {"[object Text]", "[object Text]", "null"})
     public void setText() throws Exception {
         final String html =
             HtmlPageTest.STANDARDS_MODE_PREFIX_