Implementing proper assumes for native events. Skipped tests should not be

counted as passed

Author: barancev

java/client/test/org/openqa/selenium/RenderedWebElementTest.java

@@ -127,9 +127,7 @@ public void testShouldAllowInheritedStylesToBeUsed() {
       reason = "HtmlUnit: Advanced mouse actions only implemented in rendered browsers. Firefox: hover is broken again.")
   @Test
   public void testShouldAllowUsersToHoverOverElements() {
-    if (!hasInputDevices()) {
-      return;
-    }
+    assumeTrue(hasInputDevices());
 
     driver.get(pages.javascriptPage);
 
@@ -157,9 +155,7 @@ public Boolean call() throws Exception {
       reason = "HtmlUnit: Advanced mouse actions only implemented in rendered browsers")
   @Test
   public void testHoverPersists() throws Exception {
-    if (!hasInputDevices()) {
-      return;
-    }
+    assumeTrue(hasInputDevices());
 
     // This test passes on IE. When running in Firefox on Windows, the test
     // will fail if the mouse cursor is not in the window. Solution: Maximize.
@@ -203,9 +199,7 @@ public Boolean call() throws Exception {
   @NeedsLocalEnvironment
   @Test
   public void testPersistentHoverCanBeTurnedOff() throws Exception {
-    if (!hasInputDevices()) {
-      return;
-    }
+    assumeTrue(hasInputDevices());
 
     assumeTrue(TestUtilities.isInternetExplorer(driver));
     // Destroy the previous driver to make sure the hovering thread is
@@ -314,9 +308,7 @@ public void testCorrectlyDetectMapElementsAreShown() {
   @JavascriptEnabled
   @Test
   public void testCanClickOnSuckerFishMenuItem() throws Exception {
-    if (!hasInputDevices()) {
-      return;
-    }
+    assumeTrue(hasInputDevices());
 
     driver.get(pages.javascriptPage);
 
@@ -338,10 +330,7 @@ public void testCanClickOnSuckerFishMenuItem() throws Exception {
       reason = "Advanced mouse actions only implemented in rendered browsers")
   @Test
   public void testMovingMouseByRelativeOffset() {
-    if (!hasInputDevices()) {
-      System.out.println("Skipping move by offset test: no input devices");
-      return;
-    }
+    assumeTrue(hasInputDevices());
 
     driver.get(pages.mouseTrackerPage);
 
@@ -362,10 +351,7 @@ public void testMovingMouseByRelativeOffset() {
       reason = "Advanced mouse actions only implemented in rendered browsers")
   @Test
   public void testMovingMouseToRelativeElementOffset() {
-    if (!hasInputDevices()) {
-      System.out.println("Skipping move to offset test: no input devices: %s");
-      return;
-    }
+    assumeTrue(hasInputDevices());
 
     driver.get(pages.mouseTrackerPage);
 
@@ -383,10 +369,7 @@ public void testMovingMouseToRelativeElementOffset() {
       reason = "Advanced mouse actions only implemented in rendered browsers")
   @Test
   public void testMovingMouseToRelativeZeroElementOffset() {
-    if (!hasInputDevices()) {
-      System.out.println("Skipping move to offset test: no input devices");
-      return;
-    }
+    assumeTrue(hasInputDevices());
 
     driver.get(pages.mouseTrackerPage);
 
@@ -404,10 +387,7 @@ public void testMovingMouseToRelativeZeroElementOffset() {
   @Ignore(value = {HTMLUNIT, OPERA}, reason = "Advanced mouse actions only implemented in rendered browsers")
   @Test
   public void testMoveRelativeToBody() {
-    if (!hasInputDevices()) {
-      System.out.println(String.format("Skipping move to offset test: no input devices"));
-      return;
-    }
+    assumeTrue(hasInputDevices());
 
     try {
       driver.get(pages.mouseTrackerPage);

java/client/test/org/openqa/selenium/SvgElementTest.java

@@ -17,9 +17,7 @@
 
 package org.openqa.selenium;
 
-import org.junit.Before;
 import org.junit.Test;
-import org.openqa.selenium.internal.FindsByCssSelector;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 
@@ -28,11 +26,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 import static org.openqa.selenium.TestWaiter.waitFor;
 import static org.openqa.selenium.WaitingConditions.elementTextToEqual;
 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.OPERA;
 import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE;
 import static org.openqa.selenium.testing.TestUtilities.isFirefox30;
@@ -46,16 +42,12 @@ public class SvgElementTest extends JUnit4TestBase {
   @Test
   public void testShouldClickOnGraphVisualElements() {
     assumeFalse("IE version < 9 doesn't support SVG", isOldIe(driver));
+    assumeFalse("Firefox 3.0 with native events doesn't support SVG",
+                isFirefox30(driver) && isNativeEventsEnabled(driver));
 
     driver.get(pages.svgPage);
     WebElement svg = driver.findElement(By.cssSelector("svg"));
 
-    if (isFirefox30(driver) && isNativeEventsEnabled(driver)) {
-      System.out.println("Not testing SVG elements with Firefox 3.0 and native events as" +
-                         " this functionality is not working.");
-      return;
-    }
-
     List<WebElement> groupElements = svg.findElements(By.cssSelector("g"));
     assertEquals(5, groupElements.size());
 
@@ -85,17 +77,13 @@ private static WebElement findAppleElement(List<WebElement> textElements) {
   @Test
   public void testShouldClickOnGraphTextElements() {
     assumeFalse("IE version < 9 doesn't support SVG", isOldIe(driver));
+    assumeFalse("Firefox 3.0 with native events doesn't support SVG",
+                isFirefox30(driver) && isNativeEventsEnabled(driver));
 
     driver.get(pages.svgPage);
     WebElement svg = driver.findElement(By.cssSelector("svg"));
     List<WebElement> textElements = svg.findElements(By.cssSelector("text"));
 
-    if (isFirefox30(driver) && isNativeEventsEnabled(driver)) {
-      System.out.println("Not testing SVG elements with Firefox 3.0 and native events as" +
-                         " this functionality is not working.");
-      return;
-    }
-
     WebElement appleElement = findAppleElement(textElements);
     assertNotNull(appleElement);
 

java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java

@@ -65,6 +65,8 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 import static org.openqa.selenium.TestWaiter.waitFor;
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.WaitingConditions.pageTitleToBe;
@@ -103,11 +105,10 @@ protected ExtensionConnection connectTo(FirefoxBinary binary, FirefoxProfile pro
 
   @Test
   public void shouldGetMeaningfulExceptionOnBrowserDeath() {
-    if (TestUtilities.getEffectivePlatform().is(Platform.LINUX) && 
-        (TestUtilities.isFirefox30(driver) || TestUtilities.isFirefox35(driver))) {
-        // This test does not work on firefox 3.0, 3.5 on linux.
-        return;
-    }
+    assumeFalse("This test does not work on firefox 3.0, 3.5 on linux",
+                TestUtilities.getEffectivePlatform().is(Platform.LINUX) &&
+                (TestUtilities.isFirefox30(driver) || TestUtilities.isFirefox35(driver)));
+
     ConnectionCapturingDriver driver2 = new ConnectionCapturingDriver();
     driver2.get(pages.formPage);
 
@@ -261,9 +262,8 @@ private void sleepBecauseWindowsTakeTimeToOpen() {
   @NoDriverAfterTest
   @Test
   public void focusRemainsInOriginalWindowWhenOpeningNewWindow() {
-    if (platformHasNativeEvents() == false) {
-      return;
-    }
+    assumeTrue(platformHasNativeEvents());
+
     // Scenario: Open a new window, make sure the current window still gets
     // native events (keyboard events in this case).
 
@@ -285,9 +285,8 @@ public void focusRemainsInOriginalWindowWhenOpeningNewWindow() {
   @NoDriverAfterTest
   @Test
   public void switchingWindowSwitchesFocus() {
-    if (platformHasNativeEvents() == false) {
-      return;
-    }
+    assumeTrue(platformHasNativeEvents());
+
     // Scenario: Open a new window, switch to it, make sure it gets native events.
     // Then switch back to the original window, make sure it gets native events.
 
@@ -330,9 +329,8 @@ public void switchingWindowSwitchesFocus() {
   @NoDriverAfterTest
   @Test
   public void closingWindowAndSwitchingToOriginalSwitchesFocus() {
-    if (platformHasNativeEvents() == false) {
-      return;
-    }
+    assumeTrue(platformHasNativeEvents());
+
     // Scenario: Open a new window, switch to it, close it, switch back to the
     // original window - make sure it gets native events.
 
@@ -481,12 +479,8 @@ private static String randomString() {
 
   @Test
   public void multipleFirefoxDriversRunningConcurrently() throws Exception {
-    // Unfortunately native events on linux mean mucking around with the
-    // window's focus. this breaks multiple drivers.
-    if (TestUtilities.isNativeEventsEnabled(driver) &&
-        Platform.getCurrent().is(Platform.LINUX)) {
-      return;
-    }
+    assumeFalse("Unfortunately native events on linux mean mucking around with the window's focus",
+                Platform.getCurrent().is(Platform.LINUX) && TestUtilities.isNativeEventsEnabled(driver));
 
     int numThreads;
     if (!SauceDriver.shouldUseSauce()) {

java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java

@@ -33,6 +33,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 import static org.openqa.selenium.TestWaiter.waitFor;
 import static org.openqa.selenium.WaitingConditions.elementTextToContain;
 import static org.openqa.selenium.WaitingConditions.elementTextToEqual;
@@ -272,13 +274,11 @@ public void testMousePositionIsNotPreservedInActionsChain() {
           reason = "Behaviour not finalized yet regarding linked images.")
   @Test
   public void testMovingIntoAnImageEnclosedInALink() {
+    assumeFalse("No way to compensate for accessibility-provided offsets on Firefox 3.0 or 3.5",
+                isFirefox30(driver) || isFirefox35(driver));
+
     driver.get(pages.linkedImage);
 
-    if (isFirefox30(driver) || isFirefox35(driver)) {
-      System.out.println("Not performing testMovingIntoAnImageEnclosedInALink - no way to " +
-                         "compensate for accessibility-provided offsets on Firefox 3.0 or 3.5");
-      return;
-    }
     // Note: For some reason, the Accessibility API in Firefox will not be available before we
     // click on something. As a work-around, click on a different element just to get going.
     driver.findElement(By.id("linkToAnchorOnThisPage")).click();
@@ -316,10 +316,7 @@ private int getFieldValue(Map<String, Object> sizeRect, String fieldName) {
           reason = "Not implemented yet.")
   @Test
   public void testMovingMousePastViewPort() {
-    if (!isNativeEventsEnabled(driver)) {
-      System.out.println("Skipping testMovingMousePastViewPort: Native events are disabled.");
-      return;
-    }
+    assumeTrue(isNativeEventsEnabled(driver));
 
     driver.get(pages.javascriptPage);
 
@@ -355,12 +352,7 @@ public void testMovingMousePastViewPort() {
           reason = "Not implemented yet.")
   @Test
   public void testMovingMouseBackAndForthPastViewPort() {
-
-    if (isFirefox(driver) && !isNativeEventsEnabled(driver)) {
-      System.out.println("Skipping testMovingMouseBackAndForthPastViewPort: " +
-                         "Native events are disabled.");
-      return;
-    }
+    assumeTrue(!isFirefox(driver) || isNativeEventsEnabled(driver));
 
     driver.get(pages.veryLargeCanvas);
 

java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java

@@ -31,6 +31,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeTrue;
 import static org.openqa.selenium.TestWaiter.waitFor;
 import static org.openqa.selenium.WaitingConditions.elementToExist;
 import static org.openqa.selenium.testing.Ignore.Driver.ANDROID;
@@ -59,11 +60,9 @@ public class CombinedInputActionsTest extends JUnit4TestBase {
   @JavascriptEnabled
   @Test
   public void testClickingOnFormElements() {
-    if (!isNativeEventsEnabled(driver) || (!getEffectivePlatform().is(Platform.LINUX))) {
-      System.out.println("Skipping testClickingOnFormElements: Only works with native events" +
-          " on Linux.");
-      return;
-    }
+    assumeTrue("Only works with native events on Linux",
+               isNativeEventsEnabled(driver) && getEffectivePlatform().is(Platform.LINUX));
+
     driver.get(pages.formSelectionPage);
 
     List<WebElement> options = driver.findElements(By.tagName("option"));
@@ -90,11 +89,8 @@ public void testClickingOnFormElements() {
   @Ignore({ANDROID, IE, REMOTE, IPHONE, OPERA})
   @Test
   public void testSelectingMultipleItems() {
-    if (!isNativeEventsEnabled(driver) || (!getEffectivePlatform().is(Platform.LINUX))) {
-      System.out.println("Skipping testClickingOnFormElements: Only works with native events" +
-          " on Linux.");
-      return;
-    }
+    assumeTrue("Only works with native events on Linux",
+               isNativeEventsEnabled(driver) && getEffectivePlatform().is(Platform.LINUX));
 
     driver.get(pages.selectableItemsPage);
 
@@ -227,11 +223,8 @@ public void testChordControlCutAndPaste() {
   @Ignore({HTMLUNIT, OPERA, IE})
   @Test
   public void testCombiningShiftAndClickResultsInANewWindow() {
-    if (!isNativeEventsEnabled(driver) || (!getEffectivePlatform().is(Platform.LINUX))) {
-      System.out.println("Skipping testCombiningShiftAndClickResultsInANewWindow: " +
-          "Only works with native events on Linux.");
-      return;
-    }
+    assumeTrue("Only works with native events on Linux",
+               isNativeEventsEnabled(driver) && getEffectivePlatform().is(Platform.LINUX));
 
     driver.get(pages.linkedImage);
     WebElement link = driver.findElement(By.id("link"));
@@ -253,11 +246,8 @@ public void testCombiningShiftAndClickResultsInANewWindow() {
   @Ignore({HTMLUNIT, OPERA, OPERA_MOBILE, IPHONE, IE})
   @Test
   public void testHoldingDownShiftKeyWhileClicking() {
-    if (!isNativeEventsEnabled(driver) || (!getEffectivePlatform().is(Platform.LINUX))) {
-      System.out.println("Skipping testHoldingDownShiftKeyWhileClicking: " +
-          "Only works with native events on Linux.");
-      return;
-    }
+    assumeTrue("Only works with native events on Linux",
+               isNativeEventsEnabled(driver) && getEffectivePlatform().is(Platform.LINUX));
 
     driver.get(pages.clickEventPage);
 

java/client/test/org/openqa/selenium/testing/TestUtilities.java

@@ -21,7 +21,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.junit.Before;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.JavascriptExecutor;