Unignoring tests that seem to be fixed in Firefox

Author: barancev

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

@@ -49,7 +49,7 @@
 public class ClickTest extends JUnit4TestBase {
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     driver.get(pages.clicksPage);
   }
 
@@ -365,7 +365,6 @@ public void testShouldBeAbleToClickOnAPartiallyOverlappedLinkThatWrapsToTheNextL
   }
 
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/615")
   public void clickingOnADisabledElementIsANoOp() {
     driver.get(appServer.whereIs("click_tests/disabled_element.html"));
 

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

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium;
 
+import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -469,7 +470,6 @@ public void testClickEventsShouldBubble() {
 
   @Test
   @Ignore(IE)
-  @Ignore(MARIONETTE)
   @Ignore(SAFARI)
   @Ignore(HTMLUNIT)
   public void testClickOverlappingElements() {
@@ -478,7 +478,8 @@ public void testClickOverlappingElements() {
     WebElement element = driver.findElement(By.id("under"));
     Throwable t = catchThrowable(element::click);
     assertThat(t, instanceOf(WebDriverException.class));
-    assertThat(t.getMessage(), containsString("Other element would receive the click"));
+    assertThat(t.getMessage(), anyOf(containsString("Other element would receive the click"),
+                                     containsString("is not clickable at point")));
   }
 
   @Test
@@ -528,7 +529,6 @@ public void testNativelyClickOverlappingElements() {
   @Test
   @Ignore(SAFARI)
   @Ignore(HTMLUNIT)
-  @Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1417821")
   public void testClickAnElementThatDisappear() {
     assumeFalse(isOldIe(driver));
     driver.get(appServer.whereIs("click_tests/disappearing_element.html"));

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

@@ -787,7 +787,6 @@ public void testShouldNotBeAbleToLocateASingleElementOnABlankPage() {
 
   @SwitchToTopAfterTest
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/934")
   public void testAnElementFoundInADifferentFrameIsStale() {
     driver.get(pages.missedJsReferencePage);
     driver.switchTo().frame("inner");

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

@@ -21,11 +21,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.openqa.selenium.testing.Driver.MARIONETTE;
 
 import org.junit.Test;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 
 public class ElementSelectingTest extends JUnit4TestBase {
@@ -45,28 +43,24 @@ public void testShouldBeAbleToSelectAnEnabledUnselectedRadioButton() {
   }
 
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/615")
   public void testShouldNotBeAbleToSelectADisabledCheckbox() {
     driver.get(pages.formPage);
     assertCannotSelect(disabledUnselectedCheckbox());
   }
 
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/615")
   public void testShouldNotBeAbleToSelectADisabledCheckboxDisabledWithRandomString() {
     driver.get(pages.formPage);
     assertCannotSelect(randomlyDisabledSelectedCheckbox());
   }
 
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/615")
   public void testShouldNotBeAbleToSelectADisabledRadioButton() {
     driver.get(pages.formPage);
     assertCannotSelect(disabledUnselectedRadioButton());
   }
 
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/615")
   public void testShouldNotBeAbleToSelectADisabledRadioButtonDisabledWithRandomString() {
     driver.get(pages.formPage);
     assertCannotSelect(randomlyDisabledUnselectedRadioButton());
@@ -146,28 +140,24 @@ public void testShouldBeAbleToSelectSelectableRadioButtonByClickingOnIt() {
   }
 
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/615")
   public void testClickingDisabledSelectedCheckboxShouldBeNoop() {
     driver.get(pages.formPage);
     assertClickingPreservesCurrentlySelectedStatus(randomlyDisabledSelectedCheckbox());
   }
 
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/615")
   public void testClickingDisabledUnselectedCheckboxShouldBeNoop() {
     driver.get(pages.formPage);
     assertClickingPreservesCurrentlySelectedStatus(disabledUnselectedCheckbox());
   }
 
   @Test
-  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/615")
   public void testClickingDisabledSelectedRadioButtonShouldBeNoop() {
     driver.get(pages.formPage);
     assertClickingPreservesCurrentlySelectedStatus(disabledSelectedRadioButton());
   }
 
   @Test
-  @Ignore(MARIONETTE)
   public void testClickingDisabledUnselectedRadioButtonShouldBeNoop() {
     driver.get(pages.formPage);
     assertClickingPreservesCurrentlySelectedStatus(disabledUnselectedRadioButton());

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

@@ -50,7 +50,7 @@
 public class FrameSwitchingTest extends JUnit4TestBase {
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     try {
       driver.switchTo().defaultContent();
     } catch (Exception e) {
@@ -299,8 +299,7 @@ public void testShouldContinueToReferToTheSameFrameOnceItHasBeenSelected() {
 
   @Test
   @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/614")
-  public void testShouldFocusOnTheReplacementWhenAFrameFollowsALinkToA_TopTargetedPage()
-      throws Exception {
+  public void testShouldFocusOnTheReplacementWhenAFrameFollowsALinkToA_TopTargetedPage() {
     driver.get(pages.framesetPage);
 
     driver.switchTo().frame(0);

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

@@ -24,14 +24,11 @@
 import static org.openqa.selenium.testing.TestUtilities.catchThrowable;
 
 import org.junit.Test;
-import org.openqa.selenium.testing.Driver;
-import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 
 public class StaleElementReferenceTest extends JUnit4TestBase {
 
   @Test
-  @Ignore(value = Driver.MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1410799")
   public void testOldPage() {
     driver.get(pages.simpleTestPage);
     WebElement elem = driver.findElement(By.id("links"));