HtmlUnitDriver: add .getBrowserVersion()

.getBrowserVersion() is helpful to know
what is the currently simulated browser.

This commit also changes TestUtilities.isFirefox()
, .isInternetExplorer() and .isChrome()
to return true if the underlying HtmlUnit
BrowserVersion is FF/IE/Chrome.

Signed-off-by: Luke Inman-Semerau <[email protected]>

Author: asashour

Diff for: java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java

@@ -324,6 +324,14 @@ private WebClient createWebClient(BrowserVersion version) {
     return modifyWebClient(client);
   }
 
+  /**
+   * Get the simulated {@code BrowserVersion}.
+   * @return the used {@code BrowserVersion}
+   */
+  public BrowserVersion getBrowserVersion() {
+    return webClient.getBrowserVersion();
+  }
+
   /**
    * Create the underlying WebClient, but don't set any fields on it.
    *

Diff for: java/client/test/org/openqa/selenium/SvgDocumentTest.java

@@ -17,26 +17,23 @@
 
 package org.openqa.selenium;
 
-import org.junit.Test;
-import org.openqa.selenium.testing.Ignore;
-import org.openqa.selenium.testing.JUnit4TestBase;
-import org.openqa.selenium.testing.NotYetImplemented;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeFalse;
 import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
-import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
 import static org.openqa.selenium.testing.TestUtilities.getFirefoxVersion;
 import static org.openqa.selenium.testing.TestUtilities.isFirefox;
 import static org.openqa.selenium.testing.TestUtilities.isOldIe;
 
+import org.junit.Test;
+import org.openqa.selenium.testing.Ignore;
+import org.openqa.selenium.testing.JUnit4TestBase;
+
 @Ignore(value = SAFARI,
         reason = "Safari: SafariDriver cannot manipulate SVG documents")
 public class SvgDocumentTest extends JUnit4TestBase {
 
   @Test
-  @NotYetImplemented(HTMLUNIT)
   @Ignore(value = CHROME, reason = "chromedriver needs to update atoms for latest SVG support")
   public void testClickOnSvgElement() {
     assumeFalse("IE version < 9 doesn't support SVG", isOldIe(driver));
@@ -51,7 +48,6 @@ public void testClickOnSvgElement() {
   }
 
   @Test
-  @NotYetImplemented(HTMLUNIT)
   public void testExecuteScriptInSvgDocument() {
     assumeFalse("IE version < 9 doesn't support SVG", isOldIe(driver));
 

Diff for: java/client/test/org/openqa/selenium/WindowSwitchingTest.java

@@ -29,6 +29,7 @@
 import static org.openqa.selenium.WaitingConditions.windowHandleCountToBe;
 import static org.openqa.selenium.WaitingConditions.windowHandleCountToBeGreaterThan;
 import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent;
+import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Ignore.Driver.IE;
 import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Ignore.Driver.REMOTE;
@@ -40,6 +41,7 @@
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
+import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.TestUtilities;
 import org.openqa.selenium.testing.drivers.Browser;
 
@@ -201,6 +203,7 @@ public void testShouldBeAbleToIterateOverAllOpenWindows() {
   @JavascriptEnabled
   @Test
   @Ignore(MARIONETTE)
+  @NotYetImplemented(HTMLUNIT)
   public void testClickingOnAButtonThatClosesAnOpenWindowDoesNotCauseTheBrowserToHang()
       throws Exception {
     assumeFalse(Browser.detect() == Browser.opera &&
@@ -241,6 +244,7 @@ public void testClickingOnAButtonThatClosesAnOpenWindowDoesNotCauseTheBrowserToH
   @JavascriptEnabled
   @Test
   @Ignore(MARIONETTE)
+  @NotYetImplemented(HTMLUNIT)
   public void testCanCallGetWindowHandlesAfterClosingAWindow() throws Exception {
     assumeFalse(Browser.detect() == Browser.opera &&
                 TestUtilities.getEffectivePlatform().is(Platform.WINDOWS));

Diff for: java/client/test/org/openqa/selenium/testing/TestUtilities.java

@@ -38,6 +38,9 @@ public static boolean isNativeEventsEnabled(WebDriver driver) {
   }
 
   public static String getUserAgent(WebDriver driver) {
+    if (driver instanceof HtmlUnitDriver) {
+      return ((HtmlUnitDriver) driver).getBrowserVersion().getUserAgent();
+    }
     try {
       return (String) ((JavascriptExecutor) driver).executeScript(
         "return navigator.userAgent;");
@@ -52,14 +55,12 @@ public static String getUserAgent(WebDriver driver) {
   }
 
   public static boolean isFirefox(WebDriver driver) {
-    return !(driver instanceof HtmlUnitDriver)
-        && getUserAgent(driver).contains("Firefox");
+    return getUserAgent(driver).contains("Firefox");
   }
 
   public static boolean isInternetExplorer(WebDriver driver) {
     String userAgent = getUserAgent(driver);
-    return !(driver instanceof HtmlUnitDriver)
-        && (userAgent.contains("MSIE") || userAgent.contains("Trident"));
+    return userAgent.contains("MSIE") || userAgent.contains("Trident");
   }
 
   public static boolean isIe6(WebDriver driver) {
@@ -76,6 +77,10 @@ public static boolean isOldIe(WebDriver driver) {
     if (!isInternetExplorer(driver)) {
       return false;
     }
+    if (driver instanceof HtmlUnitDriver) {
+      String applicationVersion = ((HtmlUnitDriver) driver).getBrowserVersion().getApplicationVersion();
+      return Double.parseDouble(applicationVersion.split(" ")[0]) < 5;
+    }
     try {
       String jsToExecute = "return parseInt(window.navigator.appVersion.split(' ')[0]);";
       // IE9 is trident version 5.  IE9 is the start of new IE.
@@ -101,8 +106,7 @@ public static boolean isFirefox9(WebDriver driver) {
   }
 
   public static boolean isChrome(WebDriver driver) {
-    return !(driver instanceof HtmlUnitDriver)
-        && getUserAgent(driver).contains("Chrome");
+    return getUserAgent(driver).contains("Chrome");
   }
 
   public static boolean isOldChromedriver(WebDriver driver) {