[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 =