Skip to content

Commit 22399e6

Browse files
committed
Deleting outdated assumes for unsupported Firefox version
1 parent 4108c6f commit 22399e6

File tree

5 files changed

+6
-37
lines changed

5 files changed

+6
-37
lines changed

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,19 @@
1717

1818
package org.openqa.selenium;
1919

20-
import org.junit.Test;
21-
import org.openqa.selenium.testing.Ignore;
22-
import org.openqa.selenium.testing.JUnit4TestBase;
23-
import org.openqa.selenium.testing.NotYetImplemented;
24-
25-
import java.util.List;
26-
2720
import static org.junit.Assert.assertEquals;
2821
import static org.junit.Assert.assertNotNull;
2922
import static org.junit.Assume.assumeFalse;
3023
import static org.openqa.selenium.WaitingConditions.elementTextToEqual;
3124
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
32-
import static org.openqa.selenium.testing.TestUtilities.isFirefox30;
33-
import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
3425
import static org.openqa.selenium.testing.TestUtilities.isOldIe;
3526

27+
import org.junit.Test;
28+
import org.openqa.selenium.testing.JUnit4TestBase;
29+
import org.openqa.selenium.testing.NotYetImplemented;
30+
31+
import java.util.List;
32+
3633
public class SvgElementTest extends JUnit4TestBase {
3734

3835
@NotYetImplemented(HTMLUNIT)

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ protected ExtensionConnection connectTo(FirefoxBinary binary, FirefoxProfile pro
102102

103103
@Test
104104
public void shouldGetMeaningfulExceptionOnBrowserDeath() {
105-
assumeFalse("This test does not work on firefox 3.0, 3.5 on linux",
106-
TestUtilities.getEffectivePlatform().is(Platform.LINUX) &&
107-
(TestUtilities.isFirefox30(driver) || TestUtilities.isFirefox35(driver)));
108-
109105
ConnectionCapturingDriver driver2 = new ConnectionCapturingDriver();
110106
driver2.get(pages.formPage);
111107

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@ public void testSendingKeysWithShiftPressed() {
146146
@JavascriptEnabled
147147
@Test
148148
public void testSendingKeysToActiveElement() {
149-
assumeFalse("This test fails due to a bug in Firefox 9. For more details, see: " +
150-
"https://bugzilla.mozilla.org/show_bug.cgi?id=696020",
151-
TestUtilities.isFirefox9(driver));
152-
153149
driver.get(pages.bodyTypingPage);
154150

155151
Action someKeys = getBuilder(driver).sendKeys("ab").build();

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static org.junit.Assert.fail;
2323
import static org.junit.Assume.assumeFalse;
2424
import static org.junit.Assume.assumeTrue;
25-
import static org.openqa.selenium.WaitingConditions.elementTextToContain;
2625
import static org.openqa.selenium.WaitingConditions.elementTextToEqual;
2726
import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
2827
import static org.openqa.selenium.support.ui.ExpectedConditions.not;
@@ -35,8 +34,6 @@
3534
import static org.openqa.selenium.testing.Ignore.Driver.REMOTE;
3635
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
3736
import static org.openqa.selenium.testing.TestUtilities.isFirefox;
38-
import static org.openqa.selenium.testing.TestUtilities.isFirefox30;
39-
import static org.openqa.selenium.testing.TestUtilities.isFirefox35;
4037
import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
4138

4239
import org.junit.Test;
@@ -273,8 +270,6 @@ public void testMousePositionIsNotPreservedInActionsChain() {
273270
@NotYetImplemented(HTMLUNIT)
274271
@Test
275272
public void testMovingIntoAnImageEnclosedInALink() {
276-
assumeFalse("No way to compensate for accessibility-provided offsets on Firefox 3.0 or 3.5",
277-
isFirefox30(driver) || isFirefox35(driver));
278273
assumeFalse(isFirefox(driver) && isNativeEventsEnabled(driver));
279274

280275
driver.get(pages.linkedImage);

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,6 @@ public static boolean isOldIe(WebDriver driver) {
9090
}
9191
}
9292

93-
public static boolean isFirefox30(WebDriver driver) {
94-
return isFirefox(driver)
95-
&& getUserAgent(driver).contains("Firefox/3.0.");
96-
}
97-
98-
public static boolean isFirefox35(WebDriver driver) {
99-
return isFirefox(driver)
100-
&& getUserAgent(driver).contains("Firefox/3.5.");
101-
}
102-
103-
public static boolean isFirefox9(WebDriver driver) {
104-
return isFirefox(driver)
105-
&& getUserAgent(driver).contains("Firefox/9.0");
106-
}
107-
10893
public static boolean isChrome(WebDriver driver) {
10994
return getUserAgent(driver).contains("Chrome");
11095
}

0 commit comments

Comments
 (0)