htmlunit-develop — General discussion of the development of HtmlUnit

[HtmlUnit] SVN: [15443] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ javascript/host

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

Revision: 15443
          http://sourceforge.net/p/htmlunit/code/15443
Author:   rbri
Date:     2018-07-09 10:03:39 +0000 (Mon, 09 Jul 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2018-07-08 10:18:32 UTC (rev 15442)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2018-07-09 10:03:39 UTC (rev 15443)
@@ -25,7 +25,6 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import java.io.IOException;
@@ -2656,24 +2655,6 @@
     }
 
     /**
-     * Returns the {@code onmozpointerlockchange} event handler.
-     * @return the {@code onmozpointerlockchange} event handler
-     */
-    @JsxGetter(FF60)
-    public Function getOnmozpointerlockchange() {
-        return getEventHandler("mozpointerlockchange");
-    }
-
-    /**
-     * Sets the {@code onmozpointerlockchange} event handler.
-     * @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler
-     */
-    @JsxSetter(FF60)
-    public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
-        setHandlerForJavaScript("mozpointerlockchange", onmozpointerlockchange);
-    }
-
-    /**
      * Returns the {@code onwebkitanimationstart} event handler.
      * @return the {@code onwebkitanimationstart} event handler
      */
@@ -4060,24 +4041,6 @@
     }
 
     /**
-     * Returns the {@code onmozpointerlockerror} event handler.
-     * @return the {@code onmozpointerlockerror} event handler
-     */
-    @JsxGetter(FF60)
-    public Function getOnmozpointerlockerror() {
-        return getEventHandler("mozpointerlockerror");
-    }
-
-    /**
-     * Sets the {@code onmozpointerlockerror} event handler.
-     * @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler
-     */
-    @JsxSetter(FF60)
-    public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
-        setHandlerForJavaScript("mozpointerlockerror", onmozpointerlockerror);
-    }
-
-    /**
      * Returns the {@code onwebkittransitionend} event handler.
      * @return the {@code onwebkittransitionend} event handler
      */

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java	2018-07-08 10:18:32 UTC (rev 15442)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java	2018-07-09 10:03:39 UTC (rev 15443)
@@ -24,7 +24,6 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import java.io.IOException;
@@ -3571,42 +3570,6 @@
     }
 
     /**
-     * Returns the {@code onmozpointerlockchange} event handler for this element.
-     * @return the {@code onmozpointerlockchange} event handler for this element
-     */
-    @JsxGetter(FF60)
-    public Function getOnmozpointerlockchange() {
-        return getEventHandler("mozpointerlockchange");
-    }
-
-    /**
-     * Sets the {@code onmozpointerlockchange} event handler for this element.
-     * @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler for this element
-     */
-    @JsxSetter(FF60)
-    public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
-        setEventHandler("mozpointerlockchange", onmozpointerlockchange);
-    }
-
-    /**
-     * Returns the {@code onmozpointerlockerror} event handler for this element.
-     * @return the {@code onmozpointerlockerror} event handler for this element
-     */
-    @JsxGetter(FF60)
-    public Function getOnmozpointerlockerror() {
-        return getEventHandler("mozpointerlockerror");
-    }
-
-    /**
-     * Sets the {@code onmozpointerlockerror} event handler for this element.
-     * @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler for this element
-     */
-    @JsxSetter(FF60)
-    public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
-        setEventHandler("mozpointerlockerror", onmozpointerlockerror);
-    }
-
-    /**
      * Returns the {@code onactivate} event handler for this element.
      * @return the {@code onactivate} event handler for this element
      */

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java	2018-07-08 10:18:32 UTC (rev 15442)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java	2018-07-09 10:03:39 UTC (rev 15443)
@@ -17,7 +17,6 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -438,24 +437,6 @@
     }
 
     /**
-     * Returns the {@code onmozpointerlockchange} event handler.
-     * @return the {@code onmozpointerlockchange} event handler
-     */
-    @JsxGetter(FF60)
-    public Function getOnmozpointerlockchange() {
-        return getEventHandler("mozpointerlockchange");
-    }
-
-    /**
-     * Sets the {@code onmozpointerlockchange} event handler.
-     * @param mozpointerlockchange the {@code onmozpointerlockchange} event handler
-     */
-    @JsxSetter(FF60)
-    public void setOnmozpointerlockchange(final Object mozpointerlockchange) {
-        setEventHandler("mozpointerlockchange", mozpointerlockchange);
-    }
-
-    /**
      * Returns the {@code onclick} event handler.
      * @return the {@code onclick} event handler
      */
@@ -852,24 +833,6 @@
     }
 
     /**
-     * Returns the {@code onmozpointerlockerror} event handler.
-     * @return the {@code onmozpointerlockerror} event handler
-     */
-    @JsxGetter(FF60)
-    public Function getOnmozpointerlockerror() {
-        return getEventHandler("mozpointerlockerror");
-    }
-
-    /**
-     * Sets the {@code onmozpointerlockerror} event handler.
-     * @param mozpointerlockerror the {@code onmozpointerlockerror} event handler
-     */
-    @JsxSetter(FF60)
-    public void setOnmozpointerlockerror(final Object mozpointerlockerror) {
-        setEventHandler("mozpointerlockerror", mozpointerlockerror);
-    }
-
-    /**
      * {@inheritDoc}
      */
     @Override

[HtmlUnit] SVN: [15442] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host/xml/XMLHttpRequestTest.java

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

Revision: 15442
          http://sourceforge.net/p/htmlunit/code/15442
Author:   rbri
Date:     2018-07-08 10:18:32 +0000 (Sun, 08 Jul 2018)
Log Message:
-----------
code style

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-07-08 08:50:40 UTC (rev 15441)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-07-08 10:18:32 UTC (rev 15442)
@@ -250,6 +250,7 @@
             }
         }
     }
+
     /**
      * Checks that not passing the async flag to <code>open()</code>
      * results in async execution.  If this gets interpreted as {@code false}

[HtmlUnit] SVN: [15441] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host/xml/XMLHttpRequestTest.java

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

Revision: 15441
          http://sourceforge.net/p/htmlunit/code/15441
Author:   rbri
Date:     2018-07-08 08:50:40 +0000 (Sun, 08 Jul 2018)
Log Message:
-----------
try to make our test suite more robust

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-07-06 14:04:27 UTC (rev 15440)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-07-08 08:50:40 UTC (rev 15441)
@@ -32,8 +32,10 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.junit.ComparisonFailure;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
@@ -189,24 +191,26 @@
 
             + "  function test() {\n"
             + "    try {\n"
-            + "      alertStatus('1: ');\n"
+            + "      logStatus('1: ');\n"
 
             + "      xhr.onreadystatechange = onReadyStateChange;\n"
-            + "      alertStatus('2: ');\n"
+            + "      logStatus('2: ');\n"
 
             + "      xhr.open('GET', '/foo.xml', true);\n"
-            + "      alertStatus('3: ');\n"
+            + "      logStatus('3: ');\n"
 
             + "      xhr.send();\n"
-            + "      alertStatus('4: ');\n"
-            + "    } catch(e) { alert(e) }\n"
+            + "      logStatus('4: ');\n"
+            + "    } catch(e) {\n"
+            + "      document.getElementById('log').value += e + '\\n';\n"
+            + "    }\n"
             + "  }\n"
 
             + "  function onReadyStateChange() {\n"
-            + "    alertStatus('#' + xhr.readyState + ': ');\n"
+            + "    logStatus('#' + xhr.readyState + ': ');\n"
             + "  }\n"
 
-            + "  function alertStatus(prefix) {\n"
+            + "  function logStatus(prefix) {\n"
             + "    var msg = prefix;\n"
             + "    try {\n"
             + "      msg = msg + xhr.status + '-';\n"
@@ -214,17 +218,38 @@
             + "    try {\n"
             + "      msg = msg + xhr.statusText;;\n"
             + "    } catch(e) { msg = msg + 'ex: statusText' }\n"
-            + "    alert(msg);\n"
+            + "    document.getElementById('log').value += msg + '\\n';\n"
             + "  }\n"
             + "</script>\n"
             + "  </head>\n"
-            + "  <body onload='test()'></body>\n"
+            + "  <body onload='test()'>\n"
+            + "    <textarea id='log' cols='80' rows='40'></textarea>\n"
+            + "  </body>\n"
             + "</html>";
 
         getMockWebConnection().setDefaultResponse("<res></res>", "text/xml");
-        loadPageWithAlerts2(html);
+        final WebDriver driver = loadPage2(html);
+
+        final String expected = String.join("\n", getExpectedAlerts());
+        assertLog(driver, expected);
     }
 
+    private void assertLog(final WebDriver driver, final String expected) throws InterruptedException {
+        final long maxWait = System.currentTimeMillis() + DEFAULT_WAIT_TIME;
+        while (true) {
+            try {
+                final String text = driver.findElement(By.id("log")).getAttribute("value").trim().replaceAll("\r", "");
+                assertEquals(expected, text);
+                return;
+            }
+            catch (final ComparisonFailure e) {
+                if (System.currentTimeMillis() > maxWait) {
+                    throw e;
+                }
+                Thread.sleep(10);
+            }
+        }
+    }
     /**
      * Checks that not passing the async flag to <code>open()</code>
      * results in async execution.  If this gets interpreted as {@code false}
@@ -234,27 +259,39 @@
     @Test
     @Alerts({"#1", "#2", "#3", "#4"})
     public void asyncIsDefault() throws Exception {
-        final String html = "<html><body><script>\n"
+        final String html = "<html>\n"
+            + "<body>\n"
+            + "  <textarea id='log' cols='80' rows='40'></textarea>\n"
+
+            + "<script>\n"
+            + "    function log(x) {\n"
+            + "      document.getElementById('log').value += x + '\\n';\n"
+            + "    }\n"
+
             + "var xhr = new XMLHttpRequest();\n"
 
             + "function onReadyStateChange() {\n"
             + "  if( xhr.readyState == 4 ) {\n"
-            + "    alert('#4');\n"
+            + "    log('#4');\n"
             + "  }\n"
             + "}\n"
 
             + "try {\n"
-            + "  alert('#1');\n"
+            + "  log('#1');\n"
             + "  xhr.onreadystatechange = onReadyStateChange;\n"
             + "  xhr.open('GET', '/foo.xml');\n"
-            + "  alert('#2');\n"
+            + "  log('#2');\n"
             + "  xhr.send();\n"
-            + "  alert('#3');\n"
-            + "} catch(e) { alert(e); }\n"
-            + "</script></body></html>";
+            + "  log('#3');\n"
+            + "} catch(e) { log(e); }\n"
+            + "</script>\n"
+            + "</body></html>";
 
         getMockWebConnection().setDefaultResponse("<res></res>", "text/xml");
-        loadPageWithAlerts2(html);
+        final WebDriver driver = loadPage2(html);
+
+        final String expected = String.join("\n", getExpectedAlerts());
+        assertLog(driver, expected);
     }
 
     /**
@@ -273,27 +310,36 @@
               "<html>\n"
             + "  <head>\n"
             + "    <script>\n"
+            + "      function log(x) {\n"
+            + "        document.getElementById('log').value += x + '\\n';\n"
+            + "      }\n"
+
             + "      function test() {\n"
             + "        var xhr = new XMLHttpRequest();\n"
 
-            + "        xhr.onreadystatechange = function() { alert('orsc' + xhr.readyState); };\n"
-            + "        xhr.onload = function() { alert(xhr.readyState); alert(xhr.responseText); alert(this); }\n"
+            + "        xhr.onreadystatechange = function() { log('orsc' + xhr.readyState); };\n"
+            + "        xhr.onload = function() { log(xhr.readyState); log(xhr.responseText); log(this); }\n"
 
             + "        xhr.open('GET', '/foo.xml', true);\n"
-            + "        alert('open-done');\n"
+            + "        log('open-done');\n"
 
             + "        xhr.send('');\n"
-            + "        alert('send-done');\n"
+            + "        log('send-done');\n"
             + "      }\n"
             + "    </script>\n"
             + "  </head>\n"
-            + "  <body onload='test()'></body>\n"
+            + "  <body onload='test()'>\n"
+            + "    <textarea id='log' cols='80' rows='40'></textarea>\n"
+            + "  </body>\n"
             + "</html>";
 
         final String xml = "<a>b</a>";
 
         getMockWebConnection().setDefaultResponse(xml, "text/xml");
-        loadPageWithAlerts2(html);
+        final WebDriver driver = loadPage2(html);
+
+        final String expected = String.join("\n", getExpectedAlerts());
+        assertLog(driver, expected);
     }
 
     /**

[HtmlUnit] SVN: [15440] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host/html/HTMLScriptElementTest.java

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

Revision: 15440
          http://sourceforge.net/p/htmlunit/code/15440
Author:   rbri
Date:     2018-07-06 14:04:27 +0000 (Fri, 06 Jul 2018)
Log Message:
-----------
try to make our test suite more robust

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java	2018-07-06 08:10:52 UTC (rev 15439)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java	2018-07-06 14:04:27 UTC (rev 15440)
@@ -1074,7 +1074,6 @@
      */
     @Test
     @Alerts("1 2 3")
-    @NotYetImplemented
     public void asyncFromAsyncTask() throws Exception {
         final String html = "<html><body><script>\n"
             + "function addAsyncScript() {\n"

[HtmlUnit] SVN: [15439] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit

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

Revision: 15439
          http://sourceforge.net/p/htmlunit/code/15439
Author:   rbri
Date:     2018-07-06 08:10:52 +0000 (Fri, 06 Jul 2018)
Log Message:
-----------
try to make our test suite more robust

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

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java	2018-07-06 08:09:44 UTC (rev 15438)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java	2018-07-06 08:10:52 UTC (rev 15439)
@@ -44,8 +44,8 @@
 import org.openqa.selenium.ie.InternetExplorerDriver;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.HttpHeader;
-import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 import com.gargoylesoftware.htmlunit.WebRequest;
 
@@ -417,9 +417,8 @@
 
         final WebDriver driver = loadPage2(htmlContent);
         String path = getClass().getClassLoader().getResource("realm.properties").toExternalForm();
-        if (driver instanceof InternetExplorerDriver || driver instanceof ChromeDriver) {
-            path = path.substring(path.indexOf('/') + 1).replace('/', '\\');
-        }
+        path = path.substring(path.indexOf('/') + 1).replace('/', '\\');
+
         driver.findElement(By.name("myInput")).sendKeys(path);
         driver.findElement(By.id("mySubmit")).click();
 
@@ -476,9 +475,8 @@
         final WebDriver driver = loadPage2(htmlContent);
 
         String path = getClass().getClassLoader().getResource("realm.properties").toExternalForm();
-        if (driver instanceof InternetExplorerDriver || driver instanceof ChromeDriver) {
-            path = path.substring(path.indexOf('/') + 1).replace('/', '\\');
-        }
+        path = path.substring(path.indexOf('/') + 1).replace('/', '\\');
+
         driver.findElement(By.name("myInput")).sendKeys(path);
         driver.findElement(By.id("mySubmit")).click();
 

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-07-06 08:09:44 UTC (rev 15438)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java	2018-07-06 08:10:52 UTC (rev 15439)
@@ -16,6 +16,7 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 
 import java.util.LinkedList;
@@ -51,7 +52,7 @@
      */
     @Test
     @Alerts("SELECT;")
-    @BuggyWebDriver({CHROME, IE})
+    @BuggyWebDriver({CHROME, FF60, IE})
     //https://bugs.chromium.org/p/chromedriver/issues/detail?id=1352
     public void clickSelect() throws Exception {
         final String html =

[HtmlUnit] SVN: [15438] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ WebDriverTestCase.java

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

Revision: 15438
          http://sourceforge.net/p/htmlunit/code/15438
Author:   rbri
Date:     2018-07-06 08:09:44 +0000 (Fri, 06 Jul 2018)
Log Message:
-----------
try to make our test suite more robust

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java	2018-07-05 07:35:45 UTC (rev 15437)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java	2018-07-06 08:09:44 UTC (rev 15438)
@@ -1157,24 +1157,20 @@
      * @throws Exception in case of failure
      */
     protected void assertTitle(final WebDriver webdriver, final String expected) throws Exception {
-        if (useRealBrowser()) {
-            final long maxWait = System.currentTimeMillis() + DEFAULT_WAIT_TIME;
+        final long maxWait = System.currentTimeMillis() + DEFAULT_WAIT_TIME;
 
-            while (true) {
-                try {
-                    assertEquals(expected, webdriver.getTitle());
-                    break;
+        while (true) {
+            try {
+                assertEquals(expected, webdriver.getTitle());
+                return;
+            }
+            catch (final ComparisonFailure e) {
+                if (System.currentTimeMillis() > maxWait) {
+                    throw e;
                 }
-                catch (final ComparisonFailure e) {
-                    if (System.currentTimeMillis() > maxWait) {
-                        throw e;
-                    }
-                    Thread.sleep(10);
-                }
+                Thread.sleep(10);
             }
         }
-
-        assertEquals(expected, webdriver.getTitle());
     }
 
     /**

[HtmlUnit] SVN: [15437] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host/html/HTMLInputElementTest.java

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

Revision: 15437
          http://sourceforge.net/p/htmlunit/code/15437
Author:   rbri
Date:     2018-07-05 07:35:45 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java	2018-07-05 07:25:40 UTC (rev 15436)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java	2018-07-05 07:35:45 UTC (rev 15437)
@@ -25,6 +25,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
@@ -795,10 +796,10 @@
             + "<p>hello world</p>\n"
             + "<form name='form1'>\n"
             + "  <input type='text' name='text1' id='text1'>\n"
-            + "<input name='myButton' type='button' onclick='document.form1.text1.value=\"from button\"'>\n"
+            + "  <input name='myButton' type='button' onclick='document.form1.text1.value=\"from button\"'>\n"
             + "</form>\n"
             + "<script>\n"
-            + "document.getElementById('text1').onchange = function(event) { alert(this.value) };\n"
+            + "  document.getElementById('text1').onchange = function(event) { alert(this.value) };\n"
             + "</script>\n"
             + "</body></html>";
 
@@ -809,7 +810,8 @@
         final WebElement button = driver.findElement(By.name("myButton"));
         button.click();
         verifyAlerts(driver, getExpectedAlerts());
-        Thread.sleep(10);
+
+        Thread.sleep(100);
         assertEquals("from button", textinput.getAttribute("value"));
     }
 
@@ -1106,13 +1108,15 @@
         final WebElement textField = webDriver.findElement(By.id("text1"));
         textField.sendKeys("123456789");
         assertEquals("12345", textField.getAttribute("value"));
-        textField.sendKeys("\b7");
+        textField.sendKeys(Keys.BACK_SPACE);
+        textField.sendKeys("7");
         assertEquals("12347", textField.getAttribute("value"));
 
         final WebElement passwordField = webDriver.findElement(By.id("password1"));
         passwordField.sendKeys("123456789");
         assertEquals("123456", passwordField.getAttribute("value"));
-        passwordField.sendKeys("\b7");
+        passwordField.sendKeys(Keys.BACK_SPACE);
+        passwordField.sendKeys("7");
         assertEquals("123457", passwordField.getAttribute("value"));
     }
 
@@ -1160,13 +1164,15 @@
         final WebElement textField = webDriver.findElement(By.id("text1"));
         textField.sendKeys("123456789");
         assertEquals("12", textField.getAttribute("value"));
-        textField.sendKeys("\b7");
+        textField.sendKeys(Keys.BACK_SPACE);
+        textField.sendKeys("7");
         assertEquals("17", textField.getAttribute("value"));
 
         final WebElement passwordField = webDriver.findElement(By.id("password1"));
         passwordField.sendKeys("123456789");
         assertEquals("1234", passwordField.getAttribute("value"));
-        passwordField.sendKeys("\b7");
+        passwordField.sendKeys(Keys.BACK_SPACE);
+        passwordField.sendKeys("7");
         assertEquals("1237", passwordField.getAttribute("value"));
     }
 

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

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

Revision: 15436
          http://sourceforge.net/p/htmlunit/code/15436
Author:   rbri
Date:     2018-07-05 07:25:40 +0000 (Thu, 05 Jul 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/html/HTMLFormElement.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAnchorTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-07-05 06:39:14 UTC (rev 15435)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-07-05 07:25:40 UTC (rev 15436)
@@ -900,9 +900,13 @@
     JS_FILE_SHORT_DATE_FORMAT,
 
     /** Indicates that the action property will not be expanded if defined as empty string. */
-    @BrowserFeature(FF)
+    @BrowserFeature(FF52)
     JS_FORM_ACTION_EXPANDURL_IGNORE_EMPTY,
 
+    /** Indicates that the action property will not be expanded if defined as empty string. */
+    @BrowserFeature({CHROME, FF60})
+    JS_FORM_ACTION_EXPANDURL_NOT_DEFINED,
+
     /** form.dispatchEvent(e) submits the form if the event is of type 'submit'. */
     @BrowserFeature(FF)
     JS_FORM_DISPATCHEVENT_SUBMITS,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java	2018-07-05 06:39:14 UTC (rev 15435)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java	2018-07-05 07:25:40 UTC (rev 15436)
@@ -18,6 +18,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.FORMFIELD_REACHABLE_BY_ORIGINAL_NAME;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.FORM_SUBMISSION_DOWNLOWDS_ALSO_IF_ONLY_HASH_CHANGED;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_FORM_ACTION_EXPANDURL_IGNORE_EMPTY;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_FORM_ACTION_EXPANDURL_NOT_DEFINED;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_FORM_DISPATCHEVENT_SUBMITS;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_FORM_REJECT_INVALID_ENCODING;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_FORM_SUBMIT_FORCES_DOWNLOAD;
@@ -34,7 +35,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.FormEncodingType;
 import com.gargoylesoftware.htmlunit.WebAssert;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -192,20 +192,25 @@
      */
     @JsxGetter
     public String getAction() {
-        String action = getHtmlForm().getActionAttribute();
-        final BrowserVersion browser = getBrowserVersion();
-        if (action != DomElement.ATTRIBUTE_NOT_DEFINED) {
-            if (action.length() == 0 && browser.hasFeature(JS_FORM_ACTION_EXPANDURL_IGNORE_EMPTY)) {
-                return action;
-            }
+        final String action = getHtmlForm().getActionAttribute();
 
-            try {
-                action = ((HtmlPage) getHtmlForm().getPage()).getFullyQualifiedUrl(action).toExternalForm();
-            }
-            catch (final MalformedURLException e) {
-                // nothing, return action attribute
-            }
+        if (action != DomElement.ATTRIBUTE_NOT_DEFINED
+                && action.length() == 0
+                && getBrowserVersion().hasFeature(JS_FORM_ACTION_EXPANDURL_IGNORE_EMPTY)) {
+            return action;
         }
+
+        if (action == DomElement.ATTRIBUTE_NOT_DEFINED
+                && !getBrowserVersion().hasFeature(JS_FORM_ACTION_EXPANDURL_NOT_DEFINED)) {
+            return action;
+        }
+
+        try {
+            return ((HtmlPage) getHtmlForm().getPage()).getFullyQualifiedUrl(action).toExternalForm();
+        }
+        catch (final MalformedURLException e) {
+            // nothing, return action attribute
+        }
         return action;
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAnchorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAnchorTest.java	2018-07-05 06:39:14 UTC (rev 15435)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAnchorTest.java	2018-07-05 07:25:40 UTC (rev 15436)
@@ -16,6 +16,7 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -268,12 +269,13 @@
      * @throws Exception if an error occurs
      */
     @Test
+    @BuggyWebDriver(FF60)
     public void clickNestedOptionElement() throws Exception {
         final String html =
               "<html>\n"
             + "<body>\n"
             + "  <a href='page2.html'>\n"
-            + "    <select>\n"
+            + "    <select size=2>\n"
             + "      <option id='theOption'>test</option>\n"
             + "    </select>\n"
             + "  </a>\n"
@@ -284,6 +286,7 @@
         final WebElement option = driver.findElement(By.id("theOption"));
         assertEquals("option", option.getTagName());
         option.click();
+
         assertEquals(URL_FIRST + "page2.html", driver.getCurrentUrl());
     }
 
@@ -371,6 +374,8 @@
 
         final WebElement tester = driver.findElement(By.id("a"));
         tester.click();
+
+        Thread.sleep(100);
         assertEquals(2, driver.getWindowHandles().size());
     }
 
@@ -691,6 +696,7 @@
             .keyUp(Keys.SHIFT)
             .perform();
 
+        Thread.sleep(100);
         assertEquals("Should have opened a new window", windowsSize + 1, driver.getWindowHandles().size());
         assertEquals("Should not have navigated away", originalTitle, driver.getTitle());
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java	2018-07-05 06:39:14 UTC (rev 15435)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java	2018-07-05 07:25:40 UTC (rev 15436)
@@ -14,8 +14,6 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.html;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 import static org.junit.Assert.fail;
 
@@ -31,9 +29,9 @@
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
 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.HttpHeader;
 import com.gargoylesoftware.htmlunit.MockWebConnection;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 
@@ -532,7 +530,9 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("")
+    @Alerts(DEFAULT = "§§URL§§",
+            FF52 = "",
+            IE = "")
     public void action() throws Exception {
         final String html =
             "<html>\n"
@@ -551,7 +551,7 @@
      */
     @Test
     @Alerts(DEFAULT = "§§URL§§",
-            FF = "")
+            FF52 = "")
     public void actionEmpty() throws Exception {
         final String html =
             "<html>\n"
@@ -1194,8 +1194,8 @@
      */
     @Test
     @Alerts(DEFAULT = {"", "foo4?foo=", "script4.js"},
-            IE = {"", "foo0?foo=", "foo1?foo=", "foo2?foo=", "foo3?foo=", "foo4?foo=", "script4.js"})
-    @NotYetImplemented({CHROME, FF})
+            IE = {"", "foo0?foo=", "foo4?foo=", "script4.js"})
+    @NotYetImplemented
     public void submitTriggersRequestNotParsed() throws Exception {
         final String html = "<html><head><script>\n"
             + "function test() {\n"
@@ -1205,10 +1205,12 @@
             + "    f.submit();\n"
             + "  }\n"
             + "}\n"
-            + "</script></head><body onload='test()'>\n"
-            + "<form>\n"
-            + "<input name='foo'>\n"
-            + "</form></body></html>";
+            + "</script></head>\n"
+            + "<body onload='test()'>\n"
+            + "  <form>\n"
+            + "    <input name='foo'>\n"
+            + "  </form>\n"
+            + "</body></html>";
 
         final MockWebConnection connection = getMockWebConnection();
         for (int i = 0; i < 5; i++) {

[HtmlUnit] SVN: [15435] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ html/HtmlAreaTest.java

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

Revision: 15435
          http://sourceforge.net/p/htmlunit/code/15435
Author:   rbri
Date:     2018-07-05 06:39:14 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAreaTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAreaTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAreaTest.java	2018-07-05 06:27:06 UTC (rev 15434)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlAreaTest.java	2018-07-05 06:39:14 UTC (rev 15435)
@@ -14,6 +14,9 @@
  */
 package com.gargoylesoftware.htmlunit.html;
 
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
+
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Collections;
@@ -28,8 +31,9 @@
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
+import com.gargoylesoftware.htmlunit.BrowserRunner.BuggyWebDriver;
 import com.gargoylesoftware.htmlunit.HttpHeader;
-import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
@@ -74,6 +78,7 @@
      * @throws Exception if the test fails
      */
     @Test
+    @BuggyWebDriver({FF60, IE})
     public void referer() throws Exception {
         final WebDriver driver = createWebClient("");
 
@@ -235,6 +240,7 @@
      * @throws Exception if the test fails
      */
     @Test
+    @BuggyWebDriver(FF60)
     public void click_javascriptUrl() throws Exception {
         try (InputStream is = getClass().getClassLoader().getResourceAsStream("testfiles/tiny-jpg.img")) {
             final byte[] directBytes = IOUtils.toByteArray(is);
@@ -274,6 +280,7 @@
      * @throws Exception if the test fails
      */
     @Test
+    @BuggyWebDriver(FF60)
     public void click_javascriptUrlMixedCase() throws Exception {
         try (InputStream is = getClass().getClassLoader().getResourceAsStream("testfiles/tiny-jpg.img")) {
             final byte[] directBytes = IOUtils.toByteArray(is);
@@ -313,6 +320,7 @@
      * @throws Exception if the test fails
      */
     @Test
+    @BuggyWebDriver(FF60)
     public void click_javascriptUrlLeadingWhitespace() throws Exception {
         try (InputStream is = getClass().getClassLoader().getResourceAsStream("testfiles/tiny-jpg.img")) {
             final byte[] directBytes = IOUtils.toByteArray(is);
@@ -353,6 +361,7 @@
      * @throws Exception if the test fails
      */
     @Test
+    @BuggyWebDriver(FF60)
     public void thisInJavascriptHref() throws Exception {
         try (InputStream is = getClass().getClassLoader().getResourceAsStream("testfiles/tiny-jpg.img")) {
             final byte[] directBytes = IOUtils.toByteArray(is);

[HtmlUnit] SVN: [15434] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host

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

Revision: 15434
          http://sourceforge.net/p/htmlunit/code/15434
Author:   rbri
Date:     2018-07-05 06:27:06 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
try to make our test suite more robust (when running in real browsers)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java

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	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -200,7 +200,7 @@
         final WebDriver driver = loadPage2(html);
         driver.findElement(By.id("button1")).click();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -402,6 +402,6 @@
         actions.moveToElement(driver.findElement(By.id("disabledBtn")));
         actions.perform();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -244,7 +244,7 @@
 
         try {
             final WebDriver driver = loadPageWithAlerts2(html);
-            assertEquals("#1", driver.getTitle());
+            assertTitle(driver, "#1");
         }
         finally {
             shutDownRealIE();
@@ -315,7 +315,7 @@
 
         try {
             final WebDriver driver = loadPage2(html);
-            assertEquals(getExpectedAlerts()[0], driver.getTitle());
+            assertTitle(driver, getExpectedAlerts()[0]);
         }
         finally {
             shutDownRealIE();
@@ -344,7 +344,7 @@
 
         try {
             final WebDriver driver = loadPage2(html);
-            assertEquals(getExpectedAlerts()[0], driver.getTitle());
+            assertTitle(driver, getExpectedAlerts()[0]);
         }
         finally {
             shutDownAll();
@@ -389,7 +389,7 @@
         getMockWebConnection().setDefaultResponse(script, JAVASCRIPT_MIME_TYPE);
 
         final WebDriver driver = loadPage2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
 
         assertEquals("hello", driver.findElement(By.id("div1")).getText());
     }
@@ -410,7 +410,7 @@
             + "</script></div></body></html>";
         final WebDriver driver = loadPageWithAlerts2(html);
 
-        assertEquals("done", driver.getTitle());
+        assertTitle(driver, "done");
         assertEquals("in inline script", driver.findElement(By.id("it")).getText());
     }
 
@@ -432,7 +432,7 @@
         getMockWebConnection().setDefaultResponse(js, JAVASCRIPT_MIME_TYPE);
         final WebDriver driver = loadPage2(html);
 
-        assertEquals("done", driver.getTitle());
+        assertTitle(driver, "done");
         assertEquals("here", driver.findElement(By.id("it")).getText());
         assertEquals("here", driver.findElement(By.tagName("body")).getText());
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -1458,15 +1458,15 @@
 
         try {
             final WebDriver driver = loadPage2(firstHtml);
-            assertEquals("First:" + getExpectedAlerts()[0], driver.getTitle());
+            assertTitle(driver, "First:" + getExpectedAlerts()[0]);
 
             driver.findElement(By.id("button1")).click();
 
             driver.switchTo().window("second");
-            assertEquals("Second:" + getExpectedAlerts()[1], driver.getTitle());
+            assertTitle(driver, "Second:" + getExpectedAlerts()[1]);
 
             driver.findElement(By.id("button2")).click();
-            assertEquals("Second:" + getExpectedAlerts()[2], driver.getTitle());
+            assertTitle(driver, "Second:" + getExpectedAlerts()[2]);
         }
         finally {
             shutDownRealIE();

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -115,8 +115,8 @@
                 + "</body>\n"
                 + "</html>";
 
-        final WebDriver webDriver = loadPageWithAlerts2(html);
-        assertEquals("test", webDriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(html);
+        assertTitle(driver, "test");
     }
 
     /**
@@ -270,8 +270,8 @@
             + "</body>\n"
             + "</html>";
 
-        final WebDriver webDriver = loadPageWithAlerts2(html);
-        assertEquals("test", webDriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(html);
+        assertTitle(driver, "test");
     }
 
     /**
@@ -349,8 +349,8 @@
             + "</body>\n"
             + "</html>";
 
-        final WebDriver webDriver = loadPageWithAlerts2(html);
-        assertEquals("test", webDriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(html);
+        assertTitle(driver, "test");
     }
 
     /**
@@ -387,13 +387,13 @@
         final String[] alerts = getExpectedAlerts();
         int i = 0;
 
-        final WebDriver webDriver = loadPage2(html);
+        final WebDriver driver = loadPage2(html);
 
-        webDriver.findElement(By.id("login")).click();
-        assertEquals(alerts[i++], webDriver.getTitle());
+        driver.findElement(By.id("login")).click();
+        assertTitle(driver, alerts[i++]);
 
-        webDriver.findElement(By.id("password")).click();
-        assertEquals(alerts[i++], webDriver.getTitle());
+        driver.findElement(By.id("password")).click();
+        assertTitle(driver, alerts[i++]);
     }
 
     /**
@@ -427,10 +427,10 @@
             + "  </form>\n"
             + "</body></html>";
 
-        final WebDriver webDriver = loadPageWithAlerts2(html);
+        final WebDriver driver = loadPageWithAlerts2(html);
 
-        webDriver.findElement(By.id("login")).click();
-        assertEquals("", webDriver.getTitle());
+        driver.findElement(By.id("login")).click();
+        assertTitle(driver, "");
     }
 
     /**
@@ -462,10 +462,10 @@
             + "  </form>\n"
             + "</body></html>";
 
-        final WebDriver webDriver = loadPageWithAlerts2(html);
+        final WebDriver driver = loadPageWithAlerts2(html);
 
-        webDriver.findElement(By.id("login")).click();
-        assertEquals("", webDriver.getTitle());
+        driver.findElement(By.id("login")).click();
+        assertTitle(driver, "");
     }
 
     /**
@@ -497,10 +497,10 @@
             + "  </form>\n"
             + "</body></html>";
 
-        final WebDriver webDriver = loadPageWithAlerts2(html);
+        final WebDriver driver = loadPageWithAlerts2(html);
 
-        webDriver.findElement(By.id("login")).click();
-        assertEquals("", webDriver.getTitle());
+        driver.findElement(By.id("login")).click();
+        assertTitle(driver, "");
     }
 
     /**
@@ -533,13 +533,13 @@
         final String[] alerts = getExpectedAlerts();
         int i = 0;
 
-        final WebDriver webDriver = loadPage2(html);
+        final WebDriver driver = loadPage2(html);
 
-        webDriver.findElement(By.id("login")).click();
-        assertEquals(alerts[i++], webDriver.getTitle());
+        driver.findElement(By.id("login")).click();
+        assertTitle(driver, alerts[i++]);
 
-        webDriver.findElement(By.id("password")).click();
-        assertEquals(alerts[i++], webDriver.getTitle());
+        driver.findElement(By.id("password")).click();
+        assertTitle(driver, alerts[i++]);
     }
 
     /**
@@ -605,8 +605,8 @@
             + "  <div id='div1' align='left'></div>\n"
             + "</body>\n"
             + "</html>";
-        final WebDriver webDriver = loadPageWithAlerts2(html);
-        assertEquals("test", webDriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(html);
+        assertTitle(driver, "test");
     }
 
     /**
@@ -2759,8 +2759,8 @@
             + "} catch(e) { alert('exception'); }\n"
             + "</script></body></html>";
 
-        final WebDriver webDriver = loadPageWithAlerts2(html);
-        assertEquals("page 1", webDriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(html);
+        assertTitle(driver, "page 1");
     }
 
     /**
@@ -3014,8 +3014,8 @@
             + "<script>\n"
             + "     document.body.innerHTML = unescape(document.body.innerHTML);\n"
             + "</script></body></html>";
-        final WebDriver webDriver = loadPageWithAlerts2(html);
-        assertEquals("Recursion", webDriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(html);
+        assertTitle(driver, "Recursion");
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -1067,7 +1067,7 @@
             // ok
         }
         driver.switchTo().window("foo1");
-        assertEquals("Name: foo1", driver.getTitle());
+        assertTitle(driver, "Name: foo1");
     }
 
     /**
@@ -1228,7 +1228,7 @@
         // NB: comparing the sequence order here is not 100% safe with a real browser
         assertEquals(expectedRequests, getMockWebConnection().getRequestedUrls(URL_FIRST));
 
-        assertEquals("Page 4", driver.getTitle());
+        assertTitle(driver, "Page 4");
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -196,7 +196,7 @@
         expandExpectedAlertsVariables(URL_FIRST);
         verifyAlerts(driver, getExpectedAlerts());
 
-        assertEquals("first", driver.getTitle());
+        assertTitle(driver, "first");
     }
 
     /**
@@ -393,9 +393,9 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "head.html"), top);
         getMockWebConnection().setResponse(new URL(URL_FIRST, "bottom.html"), bottom);
 
-        loadPage2(html);
+        final WebDriver driver = loadPage2(html);
         assertEquals(3, getMockWebConnection().getRequestCount());
-        assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -421,9 +421,9 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "left.html"), left);
         getMockWebConnection().setResponse(new URL(URL_FIRST, "right.html"), right);
 
-        loadPage2(html);
+        final WebDriver driver = loadPage2(html);
         assertEquals(3, getMockWebConnection().getRequestCount());
-        assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -479,7 +479,7 @@
 
         final WebDriver driver = loadPage2(html);
         // top frame
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
 
         // header frame
         driver.switchTo().frame("header");
@@ -561,7 +561,7 @@
 
         final WebDriver driver = loadPage2(html);
         // top frame
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
 
         // header frame
         driver.switchTo().frame("header");
@@ -640,7 +640,7 @@
 
         final WebDriver driver = loadPage2(html);
         // top frame
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
 
         // header frame
         driver.switchTo().frame("header");

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -1022,7 +1022,7 @@
         final WebDriver driver = loadPage2(html);
         driver.findElement(By.name("field1")).sendKeys("bla");
         driver.findElement(By.tagName("img")).click();
-        assertEquals("page 2", driver.getTitle());
+        assertTitle(driver, "page 2");
     }
 
     /**
@@ -1968,7 +1968,7 @@
         actions.moveToElement(driver.findElement(By.id("tester")));
         actions.perform();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

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-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -1427,7 +1427,7 @@
         actions.moveToElement(driver.findElement(By.id("option1")));
         actions.perform();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1481,6 +1481,6 @@
         actions.moveToElement(driver.findElement(By.id("option1")));
         actions.perform();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -334,7 +334,7 @@
         getMockWebConnection().setResponse(URL_SECOND, js);
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -567,7 +567,7 @@
         getMockWebConnection().setResponse(URL_SECOND, js);
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1019,7 +1019,7 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "js3.js"), "document.title += ' 3';");
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1043,7 +1043,7 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "js2.js"), "document.title += ' 2';");
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1066,7 +1066,7 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "js2.js"), "document.title += ' 2';");
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1091,7 +1091,7 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "js.js"), "document.title += ' 3';");
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1118,7 +1118,7 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "js.js"), "document.title += ' from script';");
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -2387,7 +2387,7 @@
         actions.moveToElement(driver.findElement(By.id("select1")));
         actions.perform();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -2420,7 +2420,7 @@
         actions.moveToElement(driver.findElement(By.id("select1")));
         actions.perform();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -781,6 +781,6 @@
         actions.moveToElement(driver.findElement(By.id("tester")));
         actions.perform();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -118,8 +118,7 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "scriptToImport2.js"), scriptToImportJs2);
 
         final WebDriver driver = loadPage2(html);
-        Thread.sleep(200);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -145,8 +144,7 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "worker.js"), workerJs);
 
         final WebDriver driver = loadPage2(html);
-        Thread.sleep(200);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

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	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -834,8 +834,7 @@
         startWebServer2(".", null, servlets2);
 
         final WebDriver driver = loadPage2(html, new URL(URL_FIRST, "/withCredentials1"));
-        Thread.sleep(DEFAULT_WAIT_TIME);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-07-05 06:27:06 UTC (rev 15434)
@@ -646,9 +646,9 @@
             + "<body onload='test()'></body></html>";
 
         getMockWebConnection().setDefaultResponse("");
-        final WebDriver webdriver = loadPageWithAlerts2(html);
-        assertEquals(URL_FIRST.toString(), webdriver.getCurrentUrl());
-        assertEquals("foo", webdriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(html);
+        assertEquals(URL_FIRST.toString(), driver.getCurrentUrl());
+        assertTitle(driver, "foo");
     }
 
     /**

[HtmlUnit] SVN: [15433] trunk/htmlunit/pom.xml

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

Revision: 15433
          http://sourceforge.net/p/htmlunit/code/15433
Author:   rbri
Date:     2018-07-05 06:25:25 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
selenium 3.13.0

Modified Paths:
--------------
    trunk/htmlunit/pom.xml

Modified: trunk/htmlunit/pom.xml
===================================================================
--- trunk/htmlunit/pom.xml	2018-07-05 06:24:47 UTC (rev 15432)
+++ trunk/htmlunit/pom.xml	2018-07-05 06:25:25 UTC (rev 15433)
@@ -20,7 +20,7 @@
         <!-- As a property, as it is included in Checkstyle build -->
         <checkstyle.version>8.10.1</checkstyle.version>
         <jetty.version>9.4.11.v20180605</jetty.version>
-        <selenium.version>3.12.0</selenium.version>
+        <selenium.version>3.13.0</selenium.version>
         <htmlunitdriver.version>2.32.0-SNAPSHOT</htmlunitdriver.version>
     </properties>
 
@@ -1004,6 +1004,10 @@
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>httpcore</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.squareup.okio</groupId>
+                    <artifactId>okio</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

[HtmlUnit] SVN: [15432] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host

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

Revision: 15432
          http://sourceforge.net/p/htmlunit/code/15432
Author:   rbri
Date:     2018-07-05 06:24:47 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
try to make our test suite more robust (when running in real browsers)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/BeforeUnloadEventTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MouseEventTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java	2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java	2018-07-05 06:24:47 UTC (rev 15432)
@@ -52,7 +52,7 @@
             + "<div id='div1'>Some Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -75,7 +75,7 @@
             + "<div id='div1'>Some Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -98,7 +98,7 @@
             + "<div id='div1'>Some Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -120,7 +120,7 @@
             + "<div id='div1'>Some Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -165,7 +165,7 @@
             + "<div id='div1'>Some Not So New Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -206,7 +206,7 @@
             + "<div id='div1'>-</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -245,7 +245,7 @@
             + "<div id='div1'>abcde</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -279,7 +279,7 @@
             + "<div id='div1'>Some Not So New Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -301,7 +301,7 @@
             + "<div id='div1'>Some Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -323,7 +323,7 @@
             + "<div id='div1'>Some Old Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -345,7 +345,7 @@
             + "<div id='div1'>Some New Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -369,6 +369,6 @@
             + "<div id='div1'>Some Text</div></body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java	2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java	2018-07-05 06:24:47 UTC (rev 15432)
@@ -148,10 +148,10 @@
 
         expandExpectedAlertsVariables(URL_FIRST);
         final WebDriver driver = loadPage2(firstHtml);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
 
         driver.findElement(By.id("testJavascript")).click();
-        assertEquals(getExpectedAlerts()[1], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[1]);
     }
 
     /**
@@ -1642,7 +1642,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1679,7 +1679,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1697,7 +1697,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

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	2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java	2018-07-05 06:24:47 UTC (rev 15432)
@@ -423,7 +423,6 @@
             + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        Thread.sleep(200);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/BeforeUnloadEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/BeforeUnloadEventTest.java	2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/BeforeUnloadEventTest.java	2018-07-05 06:24:47 UTC (rev 15432)
@@ -82,7 +82,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(String.join(" ", getExpectedAlerts()),  driver.getTitle());
+        assertTitle(driver, String.join(" ", getExpectedAlerts()));
     }
 
     /**
@@ -106,7 +106,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(String.join(" ", getExpectedAlerts()),  driver.getTitle());
+        assertTitle(driver, String.join(" ", getExpectedAlerts()));
     }
 
     /**
@@ -131,7 +131,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(String.join(" ", getExpectedAlerts()),  driver.getTitle());
+        assertTitle(driver, String.join(" ", getExpectedAlerts()));
     }
 
     /**
@@ -156,7 +156,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(String.join(" ", getExpectedAlerts()),  driver.getTitle());
+        assertTitle(driver, String.join(" ", getExpectedAlerts()));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java	2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java	2018-07-05 06:24:47 UTC (rev 15432)
@@ -289,7 +289,7 @@
         final WebDriver driver = loadPage2(html);
         driver.findElement(By.id("clickMe")).click();
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -412,7 +412,7 @@
         final WebDriver driver = loadPage2(html);
         driver.findElement(By.id("typeHere")).sendKeys("a");
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java	2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java	2018-07-05 06:24:47 UTC (rev 15432)
@@ -71,7 +71,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(String.join(" ", getExpectedAlerts()),  driver.getTitle());
+        assertTitle(driver, String.join(" ", getExpectedAlerts()));
     }
 
     /**
@@ -100,7 +100,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(String.join(" ", getExpectedAlerts()),  driver.getTitle());
+        assertTitle(driver, String.join(" ", getExpectedAlerts()));
     }
 
     /**
@@ -155,7 +155,7 @@
             + "</script></body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(String.join(" ", getExpectedAlerts()),  driver.getTitle());
+        assertTitle(driver, String.join(" ", getExpectedAlerts()));
     }
 
     /**
@@ -186,6 +186,6 @@
             + "</script></body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(String.join(" ", getExpectedAlerts()),  driver.getTitle());
+        assertTitle(driver, String.join(" ", getExpectedAlerts()));
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MouseEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MouseEventTest.java	2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MouseEventTest.java	2018-07-05 06:24:47 UTC (rev 15432)
@@ -229,7 +229,7 @@
 
         setExpectedAlerts();
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("Mouse Event coordinates", driver.getTitle());
+        assertTitle(driver, "Mouse Event coordinates");
 
         final WebElement textarea = driver.findElement(By.id("myTextarea"));
         assertEquals("", textarea.getText());

[HtmlUnit] SVN: [15431] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host

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

Revision: 15431
          http://sourceforge.net/p/htmlunit/code/15431
Author:   rbri
Date:     2018-07-05 06:23:56 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
try to make our test suite more robust (when running in real browsers)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PromiseTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window3Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java	2018-07-05 06:23:37 UTC (rev 15430)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java	2018-07-05 06:23:56 UTC (rev 15431)
@@ -766,10 +766,10 @@
                 + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals("page1", driver.getTitle());
+        assertTitle(driver, "page1");
 
         loadPage2(html2, URL_SECOND);
-        assertEquals("page2", driver.getTitle());
+        assertTitle(driver, "page2");
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java	2018-07-05 06:23:37 UTC (rev 15430)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java	2018-07-05 06:23:56 UTC (rev 15431)
@@ -307,9 +307,9 @@
         final String secondContent = "<html><head><title>Second</title></head><body></body></html>";
 
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
-        final WebDriver webdriver = loadPageWithAlerts2(html);
+        final WebDriver driver = loadPage2(html);
 
-        assertEquals("Second", webdriver.getTitle());
+        assertTitle(driver, "Second");
     }
 
     /**
@@ -333,14 +333,14 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
         getMockWebConnection().setResponse(URL_THIRD, thirdContent);
 
-        final WebDriver webdriver = loadPageWithAlerts2(startContent);
-        webdriver.get(URL_SECOND.toExternalForm());
+        final WebDriver driver = loadPageWithAlerts2(startContent);
+        driver.get(URL_SECOND.toExternalForm());
 
-        assertEquals("Third Page", webdriver.getTitle());
+        assertTitle(driver, "Third Page");
 
         // navigate back
-        webdriver.navigate().back();
-        assertEquals("First Page", webdriver.getTitle());
+        driver.navigate().back();
+        assertTitle(driver, "First Page");
     }
 
     /**
@@ -363,9 +363,9 @@
                 + "<body onload='alert(\"on-load\")'></body></html>";
 
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
-        final WebDriver webdriver = loadPageWithAlerts2(html);
+        final WebDriver driver = loadPageWithAlerts2(html);
 
-        assertEquals("Second", webdriver.getTitle());
+        assertTitle(driver, "Second");
         assertEquals(2, getMockWebConnection().getRequestCount());
     }
 
@@ -387,9 +387,8 @@
 
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
 
-        final WebDriver webdriver = loadPageWithAlerts2(firstContent);
-
-        assertEquals("Second Page", webdriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(firstContent);
+        assertTitle(driver, "Second Page");
     }
 
     /**
@@ -410,7 +409,7 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
 
         final WebDriver driver = loadPage2(firstContent, URL_FIRST);
-        assertEquals("Second", driver.getTitle());
+        assertTitle(driver, "Second");
     }
 
     /**
@@ -434,7 +433,7 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
         final WebDriver driver = loadPageWithAlerts2(firstContent);
 
-        assertEquals("Second", driver.getTitle());
+        assertTitle(driver, "Second");
         assertEquals(2, getMockWebConnection().getRequestCount());
     }
 
@@ -456,7 +455,7 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
 
         final WebDriver driver = loadPage2(firstContent, URL_FIRST);
-        assertEquals("Second", driver.getTitle());
+        assertTitle(driver, "Second");
     }
 
     /**
@@ -480,7 +479,7 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
         final WebDriver driver = loadPageWithAlerts2(firstContent);
 
-        assertEquals("Second", driver.getTitle());
+        assertTitle(driver, "Second");
         assertEquals(2, getMockWebConnection().getRequestCount());
     }
 
@@ -558,7 +557,8 @@
         getMockWebConnection().setResponse(URL_SECOND, secondHtml);
 
         final WebDriver driver = loadPage2(firstHtml);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PromiseTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PromiseTest.java	2018-07-05 06:23:37 UTC (rev 15430)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PromiseTest.java	2018-07-05 06:23:56 UTC (rev 15431)
@@ -1628,7 +1628,6 @@
               + "</html>";
 
         final WebDriver driver = loadPage2(html);
-        Thread.sleep(200);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java	2018-07-05 06:23:37 UTC (rev 15430)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java	2018-07-05 06:23:56 UTC (rev 15431)
@@ -1927,7 +1927,7 @@
         getMockWebConnection().setResponse(URL_SECOND, iframe);
         final WebDriver driver = loadPage2(html);
 
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -1988,11 +1988,11 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
 
         final WebDriver driver = loadPage2(firstContent);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
         assertEquals(1, driver.getWindowHandles().size());
 
         driver.findElement(By.id("link")).click();
-        assertEquals("Second", driver.getTitle());
+        assertTitle(driver, "Second");
 
         assertEquals(1, driver.getWindowHandles().size());
         assertEquals(new String[] {"", "second/"}, getMockWebConnection().getRequestedUrls(URL_FIRST));
@@ -2018,11 +2018,11 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
 
         final WebDriver driver = loadPage2(firstContent);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
         assertEquals(1, driver.getWindowHandles().size());
 
         driver.findElement(By.id("link")).click();
-        assertEquals("Second", driver.getTitle());
+        assertTitle(driver, "Second");
 
         assertEquals(1, driver.getWindowHandles().size());
         assertEquals(new String[] {"", "second/"}, getMockWebConnection().getRequestedUrls(URL_FIRST));
@@ -2048,11 +2048,11 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
 
         final WebDriver driver = loadPage2(firstContent);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
         assertEquals(1, driver.getWindowHandles().size());
 
         driver.findElement(By.id("link")).click();
-        assertEquals("Second", driver.getTitle());
+        assertTitle(driver, "Second");
 
         assertEquals(1, driver.getWindowHandles().size());
         assertEquals(new String[] {"", "second/"}, getMockWebConnection().getRequestedUrls(URL_FIRST));

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window3Test.java	2018-07-05 06:23:37 UTC (rev 15430)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window3Test.java	2018-07-05 06:23:56 UTC (rev 15431)
@@ -109,7 +109,7 @@
         getMockWebConnection().setResponse(urlThird, thirdContent);
 
         final WebDriver driver = loadPageWithAlerts2(firstContent);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -180,7 +180,7 @@
         getMockWebConnection().setResponse(urlThird, thirdContent);
 
         final WebDriver driver = loadPageWithAlerts2(firstContent);
-        assertEquals("First", driver.getTitle());
+        assertTitle(driver, "First");
     }
 
     /**
@@ -227,7 +227,7 @@
         getMockWebConnection().setResponse(urlFourth, fourthContent);
 
         final WebDriver driver = loadPageWithAlerts2(firstContent);
-        assertEquals("first", driver.getTitle());
+        assertTitle(driver, "first");
     }
 
     /**
@@ -290,7 +290,7 @@
         setExpectedAlerts(expectedAlerts);
 
         final WebDriver driver = loadPageWithAlerts2(firstContent);
-        assertEquals("first", driver.getTitle());
+        assertTitle(driver, "first");
     }
 
     /**
@@ -1515,7 +1515,7 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
 
         final WebDriver driver = loadPage2(firstContent, URL_FIRST);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

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	2018-07-05 06:23:37 UTC (rev 15430)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java	2018-07-05 06:23:56 UTC (rev 15431)
@@ -2035,7 +2035,7 @@
                 + "</html>");
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

[HtmlUnit] SVN: [15430] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host/css/CSSSelectorTest.java

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

Revision: 15430
          http://sourceforge.net/p/htmlunit/code/15430
Author:   rbri
Date:     2018-07-05 06:23:37 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java	2018-07-05 06:22:42 UTC (rev 15429)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java	2018-07-05 06:23:37 UTC (rev 15430)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.css;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -1000,7 +1000,7 @@
     @Test
     @Alerts(DEFAULT = {"0", "undefined", "1", "[object HTMLInputElement]", "id2"},
             IE = {"1", "[object HTMLBodyElement]", "1", "[object HTMLInputElement]", "id2"})
-    @BuggyWebDriver(FF)
+    @BuggyWebDriver(FF52)
     public void focus() throws Exception {
         final String html = "<html><head><title>First</title>\n"
             + "<meta http-equiv='X-UA-Compatible' content='IE=edge'>\n"

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

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

Revision: 15429
          http://sourceforge.net/p/htmlunit/code/15429
Author:   rbri
Date:     2018-07-05 06:22:42 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-07-05 06:11:38 UTC (rev 15428)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-07-05 06:22:42 UTC (rev 15429)
@@ -126,7 +126,7 @@
         // FF60
         FIREFOX_60.applicationVersion_ = "5.0 (Windows)";
         FIREFOX_60.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0";
-        FIREFOX_60.buildId_ = "20180605201706";
+        FIREFOX_60.buildId_ = "20180621121604";
         FIREFOX_60.productSub_ = "20100101";
         FIREFOX_60.headerNamesOrdered_ = new String[] {
             HttpHeader.HOST,
@@ -152,7 +152,7 @@
         // FF52
         FIREFOX_52.applicationVersion_ = "5.0 (Windows)";
         FIREFOX_52.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:52.0) Gecko/20100101 Firefox/52.0";
-        FIREFOX_52.buildId_ = "20180430140610";
+        FIREFOX_52.buildId_ = "20180621064021";
         FIREFOX_52.productSub_ = "20100101";
         FIREFOX_52.headerNamesOrdered_ = new String[] {
             HttpHeader.HOST,

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java	2018-07-05 06:11:38 UTC (rev 15428)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java	2018-07-05 06:22:42 UTC (rev 15429)
@@ -385,7 +385,7 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF60 = "20180605201706",
+            FF60 = "20180621121604",
             FF52 = "20180621064021")
     public void buildID() throws Exception {
         final String html

[HtmlUnit] SVN: [15428] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit

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

Revision: 15428
          http://sourceforge.net/p/htmlunit/code/15428
Author:   rbri
Date:     2018-07-05 06:11:38 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
try to make our test suite more robust (when running in real browsers)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLink2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/PostponedActionTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement2Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement2Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -59,6 +59,6 @@
             + "</body></html>";
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -352,7 +352,7 @@
         if (params.size() > 0) {
             assertEquals(getExpectedAlerts()[2], params.get(0).getName() + "-" + params.get(0).getValue());
         }
-        assertEquals(getExpectedAlerts()[3], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[3]);
     }
 
     /**
@@ -702,7 +702,7 @@
 
         final int expectedReqCount = Integer.parseInt(getExpectedAlerts()[0]);
         assertEquals(expectedReqCount, getMockWebConnection().getRequestCount());
-        assertEquals(getExpectedAlerts()[1], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[1]);
 
         shutDownRealIE();
     }
@@ -740,7 +740,7 @@
 
         final int expectedReqCount = Integer.parseInt(getExpectedAlerts()[0]);
         assertEquals(expectedReqCount, getMockWebConnection().getRequestCount());
-        assertEquals(getExpectedAlerts()[1], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[1]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -534,7 +534,7 @@
         final WebDriver driver = loadPage2(firstHtml);
 
         driver.findElement(By.id("myCheckbox")).click();
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -558,7 +558,7 @@
         final WebDriver driver = loadPage2(firstHtml);
 
         driver.findElement(By.id("myCheckbox")).click();
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -235,8 +235,8 @@
                 + "</form>\n"
                 + "</body></html>";
 
-        loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+        final WebDriver driver = loadPage2(html);
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -275,8 +275,8 @@
                 + "</form>\n"
                 + "</body></html>";
 
-        loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+        final WebDriver driver = loadPage2(html);
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -15,7 +15,6 @@
 package com.gargoylesoftware.htmlunit.html;
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 
 import java.net.URL;
 
@@ -100,11 +99,9 @@
     @Alerts(DEFAULT = "second [object HTMLFormElement] third [object HTMLFormElement] "
                         + "parent [object HTMLFormElement]",
             CHROME = "second undefined third [object HTMLFormElement] "
-                        + "parent [object HTMLFormElement]",
-            FF60 = "second undefined third [object HTMLFormElement] "
-                    + "parent [object HTMLFormElement]")
+                        + "parent [object HTMLFormElement]")
     // real FF sometimes alerts 'third' before 'second'
-    @NotYetImplemented({CHROME, FF60})
+    @NotYetImplemented(CHROME)
     public void postponeLoading() throws Exception {
         final String html = "<FRAMESET rows='50%,*' "
                 + "onload=\"document.title += ' parent ' + window.parent.frames['third'].document.frm\">\n"
@@ -127,9 +124,9 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "second.html"), secondHtml);
         getMockWebConnection().setResponse(new URL(URL_FIRST, "third.html"), thirdHtml);
 
-        loadPage2(html);
+        final WebDriver driver = loadPage2(html);
         assertEquals(3, getMockWebConnection().getRequestCount());
-        assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -156,9 +153,9 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "second.html"), secondHtml);
         getMockWebConnection().setResponse(new URL(URL_FIRST, "third.html"), thirdHtml);
 
-        loadPage2(html);
+        final WebDriver driver = loadPage2(html);
         assertEquals(3, getMockWebConnection().getRequestCount());
-        assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -191,10 +188,9 @@
         getMockWebConnection().setResponse(new URL(URL_FIRST, "third.html"), thirdHtml);
         getMockWebConnection().setResponse(new URL(URL_FIRST, "fourth.html"), fourthHtml);
 
-        loadPage2(html);
-        Thread.sleep(400);
+        final WebDriver driver = loadPage2(html);
         assertEquals(4, getMockWebConnection().getRequestCount());
-        assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -144,7 +144,7 @@
         final WebDriver driver = loadPage2(framesContent);
 
         // top frame
-        assertEquals("Top Page", driver.getTitle());
+        assertTitle(driver, "Top Page");
         assertEquals("Body of top frame", driver.findElement(By.id("content")).getText());
 
         // left frame

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLink2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLink2Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLink2Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -231,9 +231,7 @@
                 + "</html>";
 
         final WebDriver driver = loadPage2(html);
-        Thread.sleep(200);
-        final String text = driver.getTitle();
-        assertEquals(String.join(";", getExpectedAlerts()), text);
+        assertTitle(driver, String.join(";", getExpectedAlerts()));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -170,7 +170,7 @@
             + "</body></html>";
 
         final WebDriver driver = loadPageWithAlerts2(html);
-        assertEquals("foo", driver.getTitle());
+        assertTitle(driver, "foo");
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -617,7 +617,7 @@
         final WebDriver driver = loadPage2(firstHtml);
 
         driver.findElement(By.id("radio")).click();
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -642,7 +642,7 @@
         final WebDriver driver = loadPage2(firstHtml);
 
         driver.findElement(By.id("radio")).click();
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -56,12 +56,12 @@
             + "<input type='submit' name='anotherButton' value='foo'/>\n"
             + "</form></body></html>";
 
-        final WebDriver wd = loadPageWithAlerts2(html);
+        final WebDriver driver = loadPageWithAlerts2(html);
 
-        final WebElement button = wd.findElement(By.name("button"));
+        final WebElement button = driver.findElement(By.name("button"));
         button.click();
 
-        assertEquals("foo", wd.getTitle());
+        assertTitle(driver, "foo");
 
         assertEquals(Collections.singletonList(new NameValuePair("button", "foo")),
             getMockWebConnection().getLastParameters());
@@ -102,12 +102,12 @@
 
         getMockWebConnection().setResponse(new URL(URL_FIRST, "foo.html"), secondHtml);
 
-        final WebDriver wd = loadPageWithAlerts2(html);
+        final WebDriver driver = loadPageWithAlerts2(html);
 
-        final WebElement button = wd.findElement(By.id("button1"));
+        final WebElement button = driver.findElement(By.id("button1"));
         button.click();
 
-        assertEquals("Second", wd.getTitle());
+        assertTitle(driver, "Second");
     }
 
     /**
@@ -185,11 +185,11 @@
         mockWebConnection.setResponse(new URL(URL_FIRST, "nextPage"),
             "<html><head><title>next page</title></head></html>");
 
-        final WebDriver wd = loadPageWithAlerts2(html);
-        final WebElement input = wd.findElement(By.name("btn"));
+        final WebDriver driver = loadPageWithAlerts2(html);
+        final WebElement input = driver.findElement(By.name("btn"));
         input.click();
 
-        assertEquals("next page", wd.getTitle());
+        assertTitle(driver, "next page");
         assertEquals(3, mockWebConnection.getRequestCount());
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -178,8 +178,8 @@
             + "</body>\n"
             + "</html>";
 
-        final WebDriver webdriver = loadPageWithAlerts2(html);
-        assertEquals("foo", webdriver.getTitle());
+        final WebDriver driver = loadPageWithAlerts2(html);
+        assertTitle(driver, "foo");
     }
 
     /**
@@ -290,7 +290,7 @@
             + "</script>\n"
             + "</body></html>";
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
 
         driver.findElement(By.id("button")).click();
         assertEquals(URL_FIRST + "?FromDate=inFirst", driver.getCurrentUrl());

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/PostponedActionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/PostponedActionTest.java	2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/PostponedActionTest.java	2018-07-05 06:11:38 UTC (rev 15428)
@@ -70,7 +70,7 @@
         conn.setResponse(new URL(URL_FIRST, "frame3.html"), thirdContent);
 
         final WebDriver driver = loadPage2(html);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -100,7 +100,7 @@
         getMockWebConnection().setResponse(URL_SECOND, secondContent);
 
         final WebDriver driver = loadPage2(firstContent);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 
     /**
@@ -138,7 +138,6 @@
         conn.setResponse(new URL(URL_FIRST, "iframe.html"), secondContent);
 
         final WebDriver driver = loadPage2(html);
-        Thread.sleep(1000);
-        assertEquals(getExpectedAlerts()[0], driver.getTitle());
+        assertTitle(driver, getExpectedAlerts()[0]);
     }
 }

[HtmlUnit] SVN: [15427] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit

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

Revision: 15427
          http://sourceforge.net/p/htmlunit/code/15427
Author:   rbri
Date:     2018-07-05 06:09:44 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
try to make our test suite more robust (when running in real browsers)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NoHttpResponseTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NoHttpResponseTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NoHttpResponseTest.java	2018-07-05 06:08:05 UTC (rev 15426)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NoHttpResponseTest.java	2018-07-05 06:09:44 UTC (rev 15427)
@@ -83,7 +83,7 @@
             try {
                 driver.get(URL_FIRST.toString());
                 driver.findElement(By.id("loginButton")).click();
-                assertEquals("right submit", driver.getTitle());
+                assertTitle(driver, "right submit");
             }
             finally {
                 miniServer.shutDown();

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java	2018-07-05 06:08:05 UTC (rev 15426)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java	2018-07-05 06:09:44 UTC (rev 15427)
@@ -63,6 +63,7 @@
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.ComparisonFailure;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.NoAlertPresentException;
@@ -1150,6 +1151,33 @@
     }
 
     /**
+     * Asserts the current title is equal to the expectation string.
+     * @param webdriver the driver in use
+     * @param expected the expected object
+     * @throws Exception in case of failure
+     */
+    protected void assertTitle(final WebDriver webdriver, final String expected) throws Exception {
+        if (useRealBrowser()) {
+            final long maxWait = System.currentTimeMillis() + DEFAULT_WAIT_TIME;
+
+            while (true) {
+                try {
+                    assertEquals(expected, webdriver.getTitle());
+                    break;
+                }
+                catch (final ComparisonFailure e) {
+                    if (System.currentTimeMillis() > maxWait) {
+                        throw e;
+                    }
+                    Thread.sleep(10);
+                }
+            }
+        }
+
+        assertEquals(expected, webdriver.getTitle());
+    }
+
+    /**
      * Release resources but DON'T close the browser if we are running with a real browser.
      * Note that HtmlUnitDriver is not cached by default, but that can be configured by {@link #isWebClientCached()}.
      */

[HtmlUnit] SVN: [15426] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit

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

Revision: 15426
          http://sourceforge.net/p/htmlunit/code/15426
Author:   rbri
Date:     2018-07-05 06:08:05 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
fix for new ie driver version

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java	2018-07-03 17:41:06 UTC (rev 15425)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java	2018-07-05 06:08:05 UTC (rev 15426)
@@ -46,7 +46,7 @@
                                 + ExternalTest.GECKO_DRIVER_.replace(".", "\\.") + ".*", Pattern.DOTALL),
             // ie
             Pattern.compile("Started InternetExplorerDriver server \\(\\d\\d\\-bit\\)\r?\n"
-                    + "3\\.8\\.0\\.0\r?\n"
+                    + ExternalTest.IE_DRIVER_.replace(".", "\\.") + "\r?\n"
                     + "Listening on port \\d*\r?\n"
                     + "Only local connections are allowed\r?\n"),
             // edge

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-07-03 17:41:06 UTC (rev 15425)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-07-05 06:08:05 UTC (rev 15426)
@@ -53,6 +53,8 @@
     static String CHROME_DRIVER_ = "2.40";
     /** Gecko driver. */
     static String GECKO_DRIVER_ = "0.21.0";
+    /** IE driver. */
+    static String IE_DRIVER_ = "3.13.0.0";
 
     /**
      * Tests that POM dependencies are the latest.

[HtmlUnit] [htmlunit:bugs] #1971 Scraping ASPX pages with HtmlUnit

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

When running my code i got 'JOSEPHINE         H                 SMITH                         '
What do you think you should get?


---

** [bugs:#1971] Scraping ASPX pages with HtmlUnit**

**Status:** pending
**Group:** 2.31
**Labels:** web scraping micrsoft asp.net aspx 
**Created:** Fri Jun 29, 2018 08:27 PM UTC by Trevor Maliborski
**Last Updated:** Tue Jul 03, 2018 02:26 PM UTC
**Owner:** RBRi


I'm currently trying to set up a web scraping tool for sites that present information from medical license databases. Many of the sites I've found and wish to use are .aspx sites. I haven't found much online that discusses scraping .aspx sites with HtmlUnit, and the information I have found has not been helpful.

The issue I'm having is similar to that which occurs on sites with AJAX: dynamic results are attached to the DOM when they arrive, but the DOM that HtmlUnit pulls from the headless browser only contains the static elements. I've tried pausing the scraper's main thread, tried using `waitForBackgroundJavascript()`,  and using more explicit waiting techniques, e.g. something like this, which is copied from the HtmlUnit site:
~~~
for (int i = 0; i < 20; i++) {
            if (condition_to_happen_after_js_execution) {
                break;
            }
            synchronized (page) {
                page.wait(500);
            }
}
~~~

Here's the code I have right now for scraping one of the sites:

~~~
private static String scrapeTexasDatabase(String firstName, String lastName) {
        try {
            WebClient webClient = new WebClient(BrowserVersion.CHROME);
            HtmlPage homePage = webClient.getPage("https://www.bon.texas.gov/forms/apninq.asp");

            HtmlTextInput firstNameField = homePage.getForms().get(1).getInputByName("firstname");
            HtmlTextInput lastNameField = homePage.getForms().get(1).getInputByName("lastname");

            firstNameField.setValueAttribute(firstName);
            lastNameField.setValueAttribute(lastName);

            HtmlSubmitInput searchButton = homePage.getForms().get(1).getInputByValue("Submit");
            HtmlPage resultsPage = searchButton.click();

            // this should be the inner text of a heading tag which includes the name of someone
            // from the Texas database, but instead no h2 elements are found at all
            String str = resultsPage.getElementsByTagName("h2").get(0).getTextContent();

            return str.trim();
        } catch (Exception e) {
            System.out.println("Caught exception: " + e);
        }

        return null;
    }
~~~

Searching for "Joesph Smith" on the Texas Nursing License site being used here yields a single result. After looking through the page source, I've found that an <h2> element is placed at the top of each result, a heading which holds a given license holder's name. This information is added dynamically but I still need to be able to scrape the information for each search result.

Any help would be appreciated!


---

Sent from sourceforge.net because htm...@li... is subscribed to https://sourceforge.net/p/htmlunit/bugs/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/htmlunit/admin/bugs/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.

[HtmlUnit] SVN: [15425] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host/NavigatorTest.java

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

Revision: 15425
          http://sourceforge.net/p/htmlunit/code/15425
Author:   rbri
Date:     2018-07-03 17:41:06 +0000 (Tue, 03 Jul 2018)
Log Message:
-----------
ff52 update

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java	2018-07-01 08:36:19 UTC (rev 15424)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java	2018-07-03 17:41:06 UTC (rev 15425)
@@ -386,7 +386,7 @@
     @Test
     @Alerts(DEFAULT = "undefined",
             FF60 = "20180605201706",
-            FF52 = "20180430140610")
+            FF52 = "20180621064021")
     public void buildID() throws Exception {
         final String html
             = "<html><head><title>First</title>\n"

[HtmlUnit] [htmlunit:bugs] #1967 Clicking button has stopped working and returns same web page

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

- **status**: open --> accepted
- **assigned_to**: RBRi
- **Comment**:

Will have a look at this during the next days.



---

** [bugs:#1967] Clicking button has stopped working and returns same web page**

**Status:** accepted
**Group:** 2.31
**Created:** Mon Jun 11, 2018 09:45 AM UTC by Martin Strange
**Last Updated:** Sun Jul 01, 2018 07:55 AM UTC
**Owner:** RBRi


Until recently, I have been running HtmlUnit 2.25. It was throwing up rhino errors but still allowed my code to click the edit button in a Google Sites web page to bring up the editable version of the page. My code has recently stopped working. Now when I call click() to click the edit button, the same web page is returned (easy to verify since the returned web page still contains the edit button and not the save button of the editable web page).

I have switched to HmtlUnit 2.31. The good news is the rhino errors have gone. But click() is still not advancing to the editable web page.

The problem doesn't seem likely to be a Javascript error, since once the right element is obtained I don't think Javascript is involved in the actual click() process. 

Here is my code:

~~~
:::java
// Set up the web client.
WebClient webClient = new WebClient(BrowserVersion.CHROME);

// Read in cookies file so that the Google Sites server will recognise
// me as logged in and return the logged in web page in the following 
// getPage call (code not shown here as this all works fine).

// Get logged in web page.
HtmlPage loggedInPage= webClient.getPage("https://sites.google.com/site/[my-web-page-at-google-sites]");

// Wait 2 secs just in case time is needed to execute Javascript.
 webClient.waitForBackgroundJavaScriptStartingBefore(2000);

// Get the element (edit button) to click.
HtmlElement element loggedInPage.getElementById("edit-start-btn");

// Check that element obtained is the correct edit button and all is
// looking good for clicking it.
System.out.println("Element about to be clicked is: +  element);  

// Click the edit button to get the editable web page.
HtmlPage editablePage = element.click();

// Have a look at the returned web page to see if it is the editable page.
System.out.println(editablePage.asXml());
~~~

Here is the web page code snippet containing the button I want to click:

~~~html
                  <div role="button" id="edit-start-btn" class="goog-inline-block jfk-button jfk-button-standard jfk-button-disabled" aria-disabled="true">
                    <span id="sites-collaborator-bar-edit-page-icon" class="sites-camelot-icon">                      
                    </span>
                  </div>
~~~


My code finds the element on the web page OK since the println that outputs details about the element about to be clicked corresponds correctly with the edit button shown in this web page code snippet above:

~~~
Element about to be clicked is: HtmlDivision[<div role="button" id="edit-start-btn" class="goog-inline-block jfk-button jfk-button-standard jfk-button-collapse-right collaborator-btn-collapse-right" aria-disabled="false" aria-label="Edit page" tabindex="0">]
~~~

Why does my code fail, and why should it have previously worked OK in HtmlUnit 2.25 and then suddenly stopped working?

I notice that the time now taken to perform the click() is at most a second or apparently instantaneous. When the code was working, it took a second or two. Could this indicate that HtmlUnit is not even going to the Google Sites server, perhaps returning the cached version of the same page instead? One thought I had but probably not relevant: could it be a focus issue? I know HtmlUnit has changed for text input in forms, now requiring the focus to be shifted to the form which wasn't the case before. Does the focus have to be shifted to a button before clicking it will work?

Many thanks if you can help.

I find HtmlUnit really useful in the work I do. It's an awesome tool and you guys do a fantastic job in developing and supporting it.


---

Sent from sourceforge.net because htm...@li... is subscribed to https://sourceforge.net/p/htmlunit/bugs/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/htmlunit/admin/bugs/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.

[HtmlUnit] SVN: [15424] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ general/huge/HostParentOfATest.java

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

Revision: 15424
          http://sourceforge.net/p/htmlunit/code/15424
Author:   rbri
Date:     2018-07-01 08:36:19 +0000 (Sun, 01 Jul 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfATest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfATest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfATest.java	2018-06-30 15:04:08 UTC (rev 15423)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfATest.java	2018-07-01 08:36:19 UTC (rev 15424)
@@ -264,6 +264,7 @@
     @Test
     @Alerts(DEFAULT = "true",
             IE = "false")
+    @NotYetImplemented(FF52)
     public void _AudioNode_AudioBufferSourceNode() throws Exception {
         test("AudioNode", "AudioBufferSourceNode");
     }
@@ -426,6 +427,7 @@
     @Test
     @Alerts(DEFAULT = "true",
             IE = "false")
+    @NotYetImplemented(FF52)
     public void _AudioNode_OscillatorNode() throws Exception {
         test("AudioNode", "OscillatorNode");
     }

[HtmlUnit] SVN: [15423] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ general/huge/HostParentOfDTest.java

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

Revision: 15423
          http://sourceforge.net/p/htmlunit/code/15423
Author:   rbri
Date:     2018-06-30 15:04:08 +0000 (Sat, 30 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfDTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfDTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfDTest.java	2018-06-30 13:12:59 UTC (rev 15422)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfDTest.java	2018-06-30 15:04:08 UTC (rev 15423)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 
 import java.util.Collection;
 
@@ -2623,6 +2624,7 @@
     @Test
     @Alerts(DEFAULT = "false",
             FF60 = "true")
+    @NotYetImplemented(FF60)
     public void _EventTarget_Animation() throws Exception {
         test("EventTarget", "Animation");
     }
@@ -2663,6 +2665,7 @@
     @Test
     @Alerts(DEFAULT = "true",
             IE = "false")
+    @NotYetImplemented(FF52)
     public void _EventTarget_AudioBufferSourceNode() throws Exception {
         test("EventTarget", "AudioBufferSourceNode");
     }
@@ -4028,6 +4031,7 @@
     @Test
     @Alerts(DEFAULT = "true",
             IE = "false")
+    @NotYetImplemented(FF52)
     public void _EventTarget_OscillatorNode() throws Exception {
         test("EventTarget", "OscillatorNode");
     }
@@ -5170,6 +5174,7 @@
     @Test
     @Alerts(DEFAULT = "false",
             FF60 = "true")
+    @NotYetImplemented(FF52)
     public void _Event_SpeechSynthesisErrorEvent() throws Exception {
         test("Event", "SpeechSynthesisErrorEvent");
     }

[HtmlUnit] SVN: [15422] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ javascript/host/Window.java

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

Revision: 15422
          http://sourceforge.net/p/htmlunit/code/15422
Author:   rbri
Date:     2018-06-30 13:12:59 +0000 (Sat, 30 Jun 2018)
Log Message:
-----------
fix javadoc

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2018-06-30 12:06:58 UTC (rev 15421)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2018-06-30 13:12:59 UTC (rev 15422)
@@ -576,9 +576,11 @@
     }
 
     /**
-     * Cancels a time-out previously set with the {@link #setTimeout(Object, int, Object)} method.
+     * Cancels a time-out previously set with the
+     * {@link #setTimeout(Context, Scriptable, Object[], Function)} method.
      *
-     * @param timeoutId identifier for the timeout to clear (returned by {@link #setTimeout(Object, int, Object)})
+     * @param timeoutId identifier for the timeout to clear
+     *        as returned by {@link #setTimeout(Context, Scriptable, Object[], Function)}
      */
     @JsxFunction
     public void clearTimeout(final int timeoutId) {
@@ -589,10 +591,11 @@
     }
 
     /**
-     * Cancels the interval previously started using the {@link #setInterval(Object, int, Object)} method.
+     * Cancels the interval previously started using the
+     * {@link #setInterval(Context, Scriptable, Object[], Function)} method.
      * Current implementation does nothing.
      * @param intervalID specifies the interval to cancel as returned by the
-     *        {@link #setInterval(Object, int, Object)} method
+     *        {@link #setInterval(Context, Scriptable, Object[], Function)} method
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms536353.aspx">MSDN documentation</a>
      */
     @JsxFunction

[HtmlUnit] [htmlunit:bugs] #1682 DOCTYPE starting with <? results in DOM without expected elements

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

- **status**: accepted --> closed
- **assigned_to**: Ahmed Ashour --> RBRi
- **Comment**:

Fixed.



---

** [bugs:#1682] DOCTYPE starting with <? results in DOM without expected elements**

**Status:** closed
**Group:** Latest SVN
**Created:** Sat May 09, 2015 06:10 AM UTC by Sebastian Cato
**Last Updated:** Fri Feb 02, 2018 06:34 PM UTC
**Owner:** RBRi


Hello,

Came across a site that didn't render the DOM I was expecting (lacking an HtmlForm node) in HtmlUnit. I isolated the problem to an incorrect doctype on the site, starting with <? instead of <!.

On trunk, r10440:

~~~~~
    @Test
    public void testDoctypeQuestionmark() throws Exception {
   	 final String content = "<?doctype html>\n" + 
   	 		"<html>\n" + 
   	 		"  <head>\n" + 
   	 		"  <title>foo</title>\n" + 
   	 		"  </head>\n" +  
   	 		"  <body>\n" +
   	 		"    <form action=\"#\" method=\"post\"> \n" + 
   	 		"	  <input type=\"text\" name=\"foo\">\n" + 
   	 		"	  <input type=\"submit\">\n" + 
   	 		"    </form>\n" + 
   	 		"  </body>\n" + 
   	 		"</html>\n";
   	 
        final MockWebConnection webConnection = new MockWebConnection();
        final URL url = new URL("http://www.example.com/");
        webConnection.setResponse(url, content);
        final WebClient client = new WebClient();
        client.setWebConnection(webConnection);

        final HtmlPage page = client.getPage(url);
        assertTrue(page.getForms().size() == 1);
        client.close();
    }
~~~~~


---

Sent from sourceforge.net because htm...@li... is subscribed to https://sourceforge.net/p/htmlunit/bugs/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/htmlunit/admin/bugs/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.