Cleaning native event checks out of the tests

Author: barancev

Rakefile

@@ -109,7 +109,6 @@ task :tests => [
   "//java/client/test/org/openqa/selenium/htmlunit:test_basic",
   "//java/client/test/org/openqa/selenium/htmlunit:test_js",
   "//java/client/test/org/openqa/selenium/firefox:test_synthesized",
-  "//java/client/test/org/openqa/selenium/firefox:test_native",
   "//java/client/test/org/openqa/selenium/ie:test",
   "//java/client/test/org/openqa/selenium/chrome:test",
   "//java/client/test/org/openqa/selenium/opera:test_blink",
@@ -179,7 +178,6 @@ task :test_grid => [
 task :test_ie => [ "//java/client/test/org/openqa/selenium/ie:test:run" ]
 task :test_jobbie => [ :test_ie ]
 task :test_firefox => [ "//java/client/test/org/openqa/selenium/firefox:test_synthesized:run" ]
-task :test_firefox_native => [ "//java/client/test/org/openqa/selenium/firefox:test_native:run" ]
 task :test_opera => [ "//java/client/test/org/openqa/selenium/opera:test_blink:run" ]
 task :test_remote_server => [ '//java/server/test/org/openqa/selenium/remote/server:small-tests:run' ]
 task :test_remote => [

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

@@ -23,7 +23,6 @@
 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.support.ui.ExpectedConditions.alertIsPresent;
 import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
 import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
@@ -34,12 +33,8 @@
 import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
 import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
-import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
 import static org.openqa.selenium.testing.TestUtilities.getFirefoxVersion;
 import static org.openqa.selenium.testing.TestUtilities.isFirefox;
-import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
-
-import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,6 +46,8 @@
 import org.openqa.selenium.testing.NeedsLocalEnvironment;
 import org.openqa.selenium.testing.NotYetImplemented;
 
+import java.util.Set;
+
 @Ignore({PHANTOMJS, SAFARI})
 public class AlertsTest extends JUnit4TestBase {
 
@@ -275,11 +272,6 @@ public void testSwitchingToMissingAlertThrows() throws Exception {
   @JavascriptEnabled
   @Test
   public void testSwitchingToMissingAlertInAClosedWindowThrows() throws Exception {
-    assumeFalse("This test does not fail on itself, but it causes the subsequent tests to fail",
-                isFirefox(driver) &&
-                isNativeEventsEnabled(driver) &&
-                getEffectivePlatform().is(Platform.LINUX));
-
     String mainWindow = driver.getWindowHandle();
     try {
       driver.findElement(By.id("open-new-window")).click();
@@ -465,12 +457,6 @@ public void testShouldHandleAlertOnPageBeforeUnloadAtQuit() {
   @NotYetImplemented(value = HTMLUNIT,
     reason = "HtmlUnit: runs on the same test thread.")
   public void testShouldHandleAlertOnWindowClose() {
-    if (isFirefox(driver) &&
-        isNativeEventsEnabled(driver) &&
-        getEffectivePlatform().is(Platform.LINUX)) {
-      System.err.println("x_ignore_nofocus can cause a firefox crash here. Ignoring test. See issue 2987.");
-      assumeTrue(false);
-    }
     assumeFalse("Firefox 27 does not trigger alerts on unload",
         isFirefox(driver) && getFirefoxVersion(driver) >= 27);
     String mainWindow = driver.getWindowHandle();

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

@@ -29,10 +29,8 @@
 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.SAFARI;
-import static org.openqa.selenium.testing.TestUtilities.isChrome;
 import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
-import static org.openqa.selenium.testing.TestUtilities.isFirefox;
-import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
+import static org.openqa.selenium.testing.TestUtilities.isChrome;
 
 import org.junit.After;
 import org.junit.Before;
@@ -163,14 +161,7 @@ public void testShouldSetRelatedTargetForMouseOver() {
 
     String log = driver.findElement(By.id("result")).getText();
 
-    // Note: It is not guaranteed that the relatedTarget property of the mouseover
-    // event will be the parent, when using native events. Only check that the mouse
-    // has moved to this element, not that the parent element was the related target.
-    if (isNativeEventsEnabled(driver)) {
-      assertTrue("Should have moved to this element.", log.startsWith("parent matches?"));
-    } else {
-      assertEquals("parent matches? true", log);
-    }
+    assertEquals("parent matches? true", log);
   }
 
   @JavascriptEnabled
@@ -299,10 +290,8 @@ public void testShouldBeAbleToClickOnAnElementGreaterThanTwoViewports() {
 
   @Test
   @Ignore(value = {CHROME, MARIONETTE},
-      reason = "Chrome: failed, Firefox: failed with native event")
+      reason = "Chrome: failed")
   public void testShouldBeAbleToClickOnAnElementInFrameGreaterThanTwoViewports() {
-    assumeFalse(isFirefox(driver) && isNativeEventsEnabled(driver));
-
     String url = appServer.whereIs("click_too_big_in_frame.html");
     driver.get(url);
 
@@ -374,7 +363,6 @@ public void testShouldBeAbleToClickOnALinkThatWrapsToTheNextLine() {
   @Test
   @Ignore(value = {MARIONETTE})
   public void testShouldBeAbleToClickOnASpanThatWrapsToTheNextLine() {
-    assumeFalse(isFirefox(driver) && isNativeEventsEnabled(driver));
     driver.get(appServer.whereIs("click_tests/span_that_wraps.html"));
 
     driver.findElement(By.id("span")).click();

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

@@ -92,10 +92,6 @@ public void testEnteringSupplementaryCharacters() {
     assumeFalse("IE: versions less thank 10 have issue 5069",
                 TestUtilities.isInternetExplorer(driver) &&
                 TestUtilities.getIEVersion(driver) < 10);
-    assumeFalse("FF: native events at linux broke it - see issue 5069",
-                TestUtilities.isFirefox(driver) &&
-                TestUtilities.isNativeEventsEnabled(driver) &&
-                TestUtilities.getEffectivePlatform().is(Platform.LINUX));
     driver.get(pages.chinesePage);
 
     String input = "";
@@ -132,8 +128,6 @@ public void testShouldBeAbleToReturnTheTextInAPage() {
   public void testShouldBeAbleToActivateIMEEngine() throws InterruptedException {
     assumeTrue("IME is supported on Linux only.",
                TestUtilities.getEffectivePlatform().is(Platform.LINUX));
-    assumeTrue("Native events are disabled, IME will not work.",
-               TestUtilities.isNativeEventsEnabled(driver));
 
     driver.get(pages.formPage);
 
@@ -175,16 +169,14 @@ public void testShouldBeAbleToActivateIMEEngine() throws InterruptedException {
         + " It was:" + elementValue, elementValue.equals(tokyo));
   }
 
-  @Ignore(value = {IE, CHROME},
+  @Ignore(value = {IE, CHROME, FIREFOX},
       reason = "Not implemented on anything other than"
           + "Firefox/Linux at the moment.")
   @NotYetImplemented(HTMLUNIT)
   @Test
   public void testShouldBeAbleToInputJapanese() {
     assumeTrue("IME is supported on Linux only.",
                TestUtilities.getEffectivePlatform().is(Platform.LINUX));
-    assumeTrue("Native events are disabled, IME will not work.",
-               TestUtilities.isNativeEventsEnabled(driver));
 
     driver.get(pages.formPage);
 

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

@@ -48,9 +48,7 @@
 import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
 import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
 import static org.openqa.selenium.testing.TestUtilities.isChrome;
-import static org.openqa.selenium.testing.TestUtilities.isFirefox;
 import static org.openqa.selenium.testing.TestUtilities.isLocal;
-import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
 
 import org.junit.After;
 import org.junit.Test;
@@ -423,7 +421,6 @@ public void testShouldTimeoutIfAPageTakesTooLongToLoad() {
   @NoDriverAfterTest // Subsequent tests sometimes fail on Firefox.
   @Test
   public void testShouldTimeoutIfAPageTakesTooLongToLoadAfterClick() {
-    assumeFalse(isFirefox(driver) && isNativeEventsEnabled(driver));
     // Fails on Chrome 44 (and higher?) https://code.google.com/p/chromedriver/issues/detail?id=1125
     assumeFalse(
         "chrome".equals(((HasCapabilities) driver).getCapabilities().getBrowserName())

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

@@ -24,7 +24,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.testing.Ignore.Driver.ALL;
 import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
@@ -35,18 +34,16 @@
 import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
 import static org.openqa.selenium.testing.TestUtilities.getFirefoxVersion;
 import static org.openqa.selenium.testing.TestUtilities.isFirefox;
-import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
+
+import com.google.common.base.Joiner;
 
 import org.junit.Test;
-import org.openqa.selenium.remote.CapabilityType;
 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.drivers.Browser;
 
-import com.google.common.base.Joiner;
-
 public class TypingTest extends JUnit4TestBase {
 
   @JavascriptEnabled
@@ -569,10 +566,6 @@ public void testChordReveseShiftHomeSelectionDeletes() {
   public void testChordControlCutAndPaste() {
     assumeFalse("FIXME: macs don't have HOME keys, would PGUP work?",
                 getEffectivePlatform().is(Platform.MAC));
-    assumeFalse("FIXME: Fails in Firefox on Linux with native events",
-                isFirefox(driver) &&
-                isNativeEventsEnabled(driver) &&
-                getEffectivePlatform().is(Platform.LINUX));
 
     driver.get(pages.javascriptPage);
 
@@ -683,7 +676,6 @@ public void testTypingIntoAnIFrameWithContentEditableOrDesignModeSet() {
   public void testNonPrintableCharactersShouldWorkWithContentEditableOrDesignModeSet() {
     assumeFalse("FIXME: Fails in Firefox on Linux with synthesized events",
                 isFirefox(driver) &&
-                !isNativeEventsEnabled(driver) &&
                 (getEffectivePlatform().is(Platform.LINUX) || getEffectivePlatform().is(Platform.MAC)));
 
     driver.get(pages.richTextPage);

java/client/test/org/openqa/selenium/firefox/BUCK

@@ -14,23 +14,6 @@ java_test(name = 'test-synthesized',
   ],
 )
 
-java_test(name = 'test-native',
-  srcs = [
-    'SynthesizedFirefoxDriverTests.java'
-  ],
-  vm_args = [
-    '-Dselenium.browser=ff',
-    '-D"selenium.browser.native_events=true',
-  ],
-  deps = [
-    ':tests',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//java/client/test/org/openqa/selenium/testing:test-base',
-    '//java/client/test/org/openqa/selenium:large-tests',
-    '//third_party/java/junit:junit',
-  ],
-)
-
 java_library(name = 'tests',
   srcs = glob(['*Test.java', 'internal/*.java']) + [
     'FirefoxSpecificTests.java',

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

@@ -104,20 +104,6 @@ public void testEnableRotatableCapability() {
     }
   }
 
-  @Test
-  public void enableNativeEventCapability() {
-    assumeFalse(TestUtilities.getEffectivePlatform().is(Platform.MAC));
-
-    configureCapability(CapabilityType.HAS_NATIVE_EVENTS, true);
-  }
-
-  @Test
-  public void disableNativeEventCapability() {
-    assumeFalse(TestUtilities.getEffectivePlatform().is(Platform.MAC));
-
-    configureCapability(CapabilityType.HAS_NATIVE_EVENTS, false);
-  }
-
   private void configureCapability(String capability, boolean isEnabled) {
     DesiredCapabilities requiredCaps = new DesiredCapabilities();
     requiredCaps.setCapability(capability, isEnabled);
@@ -131,25 +117,6 @@ private void configureCapability(String capability, boolean isEnabled) {
         isEnabled == (Boolean) caps.getCapability(capability));
   }
 
-  @Test
-  public void requiredNativeEventCapabilityShouldHavePriority() {
-    assumeFalse(TestUtilities.getEffectivePlatform().is(Platform.MAC));
-
-    DesiredCapabilities desiredCaps = new DesiredCapabilities();
-    desiredCaps.setCapability(HAS_NATIVE_EVENTS, false);
-    DesiredCapabilities requiredCaps = new DesiredCapabilities();
-    requiredCaps.setCapability(HAS_NATIVE_EVENTS, true);
-    WebDriverBuilder builder = new WebDriverBuilder().setDesiredCapabilities(desiredCaps).
-        setRequiredCapabilities(requiredCaps);
-    localDriver = builder.get();
-
-    Capabilities caps = ((HasCapabilities)localDriver).getCapabilities();
-    assertTrue("The native events capability should be included in " +
-        "capabilities for the session", caps.getCapability(HAS_NATIVE_EVENTS) != null);
-    assertTrue("Native events capability should be set enabled",
-        (Boolean) caps.getCapability(HAS_NATIVE_EVENTS));
-  }
-
   @After
   public void quitDriver() {
     if (this.localDriver != null) {

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

@@ -27,7 +27,6 @@
 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.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
@@ -45,7 +44,6 @@
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.ParallelTestRunner;
 import org.openqa.selenium.ParallelTestRunner.Worker;
-import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.environment.GlobalTestEnvironment;
@@ -57,7 +55,6 @@
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.NeedsLocalEnvironment;
-import org.openqa.selenium.testing.TestUtilities;
 import org.openqa.selenium.testing.drivers.SauceDriver;
 import org.openqa.selenium.testing.drivers.SynthesizedFirefoxDriver;
 import org.openqa.selenium.testing.drivers.WebDriverBuilder;
@@ -487,9 +484,6 @@ private static String randomString() {
 
   @Test
   public void multipleFirefoxDriversRunningConcurrently() throws Exception {
-    assumeFalse("Unfortunately native events on linux mean mucking around with the window's focus",
-                TestUtilities.getEffectivePlatform().is(Platform.LINUX) && TestUtilities.isNativeEventsEnabled(driver));
-
     int numThreads;
     if (!SauceDriver.shouldUseSauce()) {
       numThreads = 6;

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

@@ -32,7 +32,6 @@
     FirefoxDriverTest.class,
     // FirefoxDriverUtilitiesTest.class, // TODO: Fix these tests
     FirefoxProfileTest.class,
-    NativeEventsTest.class,
     NewProfileExtensionConnectionTest.class,
     PreferencesTest.class,
     SocketLockTest.class,