Skip to content

Commit 7286a92

Browse files
barancevbarancev
committed
[java] Changing browser names used in @ignore test annotation to better communicate the current state of browser support
1 parent 7447ced commit 7286a92

File tree

61 files changed

+467
-474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+467
-474
lines changed

‎java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -175,21 +175,21 @@ private Capabilities createCapabilities() {
175175
case CHROME:
176176
return new ChromeOptions();
177177

178-
case EDGE:
178+
case EDGE_HTML:
179179
return new EdgeHtmlOptions();
180180

181-
case CHROMIUMEDGE:
181+
case EDGIUM:
182182
return new EdgeOptions();
183183

184184
case IE:
185185
return new InternetExplorerOptions();
186186

187+
case LEGACY_FIREFOX_XPI:
187188
case FIREFOX:
188-
case MARIONETTE:
189189
return new FirefoxOptions();
190190

191+
case LEGACY_OPERA:
191192
case OPERA:
192-
case OPERABLINK:
193193
return new OperaOptions();
194194

195195
case SAFARI:

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
2626
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
2727
import static org.openqa.selenium.testing.drivers.Browser.CHROME;
28-
import static org.openqa.selenium.testing.drivers.Browser.CHROMIUMEDGE;
29-
import static org.openqa.selenium.testing.drivers.Browser.EDGE;
30-
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
28+
import static org.openqa.selenium.testing.drivers.Browser.EDGIUM;
29+
import static org.openqa.selenium.testing.drivers.Browser.EDGE_HTML;
30+
import static org.openqa.selenium.testing.drivers.Browser.LEGACY_FIREFOX_XPI;
3131
import static org.openqa.selenium.testing.drivers.Browser.HTMLUNIT;
3232
import static org.openqa.selenium.testing.drivers.Browser.IE;
33-
import static org.openqa.selenium.testing.drivers.Browser.MARIONETTE;
33+
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
3434
import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
3535
import static org.openqa.selenium.testing.TestUtilities.getFirefoxVersion;
3636
import static org.openqa.selenium.testing.TestUtilities.isFirefox;
@@ -388,11 +388,11 @@ public void testShouldHandleAlertOnPageLoadUsingGet() {
388388

389389
@Test
390390
@Ignore(value = CHROME, reason = "Hangs")
391-
@Ignore(value = CHROMIUMEDGE, reason = "Hangs")
392-
@Ignore(FIREFOX)
391+
@Ignore(value = EDGIUM, reason = "Hangs")
392+
@Ignore(LEGACY_FIREFOX_XPI)
393393
@Ignore(value = IE, reason = "Fails in versions 6 and 7")
394394
@Ignore(SAFARI)
395-
@Ignore(EDGE)
395+
@Ignore(EDGE_HTML)
396396
@NoDriverAfterTest
397397
public void testShouldNotHandleAlertInAnotherWindow() {
398398
String pageWithOnLoad = appServer.create(new Page()
@@ -412,10 +412,10 @@ public void testShouldNotHandleAlertInAnotherWindow() {
412412

413413
@Test
414414
@Ignore(value = CHROME, reason = "Chrome does not trigger alerts on unload")
415-
@Ignore(value = CHROMIUMEDGE, reason = "Edge does not trigger alerts on unload")
415+
@Ignore(value = EDGIUM, reason = "Edge does not trigger alerts on unload")
416416
@NotYetImplemented(HTMLUNIT)
417417
@Ignore(SAFARI)
418-
@NotYetImplemented(EDGE)
418+
@NotYetImplemented(EDGE_HTML)
419419
public void testShouldHandleAlertOnPageUnload() {
420420
assumeFalse("Firefox 27+ does not trigger alerts on before unload",
421421
isFirefox(driver) && getFirefoxVersion(driver) >= 27);
@@ -438,11 +438,11 @@ public void testShouldHandleAlertOnPageUnload() {
438438
}
439439

440440
@Test
441-
@Ignore(value = FIREFOX, reason = "Non W3C conformant")
441+
@Ignore(value = LEGACY_FIREFOX_XPI, reason = "Non W3C conformant")
442442
@Ignore(value = HTMLUNIT, reason = "Non W3C conformant")
443443
@Ignore(value = CHROME, reason = "Non W3C conformant")
444-
@Ignore(value = CHROMIUMEDGE, reason = "Non W3C conformant")
445-
@Ignore(EDGE)
444+
@Ignore(value = EDGIUM, reason = "Non W3C conformant")
445+
@Ignore(EDGE_HTML)
446446
public void testShouldImplicitlyHandleAlertOnPageBeforeUnload() {
447447
String blank = appServer.create(new Page().withTitle("Success"));
448448
driver.get(appServer.create(new Page()
@@ -458,11 +458,11 @@ public void testShouldImplicitlyHandleAlertOnPageBeforeUnload() {
458458

459459
@Test
460460
@Ignore(value = CHROME, reason = "Chrome does not trigger alerts on unload")
461-
@Ignore(value = CHROMIUMEDGE, reason = "Chrome does not trigger alerts on unload")
461+
@Ignore(value = EDGIUM, reason = "Chrome does not trigger alerts on unload")
462462
@NotYetImplemented(HTMLUNIT)
463463
@Ignore(SAFARI)
464464
@Ignore(value = IE, reason = "IE driver automatically dismisses alerts on window close")
465-
@NotYetImplemented(EDGE)
465+
@NotYetImplemented(EDGE_HTML)
466466
public void testShouldHandleAlertOnWindowClose() {
467467
assumeFalse("Firefox 27+ does not trigger alerts on unload",
468468
isFirefox(driver) && getFirefoxVersion(driver) >= 27);
@@ -494,9 +494,9 @@ public void testShouldHandleAlertOnWindowClose() {
494494

495495
@Test
496496
@Ignore(value = HTMLUNIT, reason = "https://github.com/SeleniumHQ/htmlunit-driver/issues/57")
497-
@NotYetImplemented(value = MARIONETTE,
497+
@NotYetImplemented(value = FIREFOX,
498498
reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1279211")
499-
@NotYetImplemented(EDGE)
499+
@NotYetImplemented(EDGE_HTML)
500500
public void testIncludesAlertTextInUnhandledAlertException() {
501501
driver.get(alertPage("cheese"));
502502

‎java/client/test/org/openqa/selenium/ClearTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import static org.assertj.core.api.Assertions.assertThat;
2121
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2222
import static org.openqa.selenium.testing.drivers.Browser.CHROME;
23-
import static org.openqa.selenium.testing.drivers.Browser.CHROMIUMEDGE;
24-
import static org.openqa.selenium.testing.drivers.Browser.EDGE;
25-
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
23+
import static org.openqa.selenium.testing.drivers.Browser.EDGIUM;
24+
import static org.openqa.selenium.testing.drivers.Browser.EDGE_HTML;
25+
import static org.openqa.selenium.testing.drivers.Browser.LEGACY_FIREFOX_XPI;
2626
import static org.openqa.selenium.testing.drivers.Browser.HTMLUNIT;
2727
import static org.openqa.selenium.testing.drivers.Browser.IE;
28-
import static org.openqa.selenium.testing.drivers.Browser.MARIONETTE;
28+
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
2929
import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
3030

3131
import org.junit.Test;
@@ -139,11 +139,11 @@ public void shouldBeAbleToClearRangeInput() {
139139

140140
@Test
141141
@NotYetImplemented(CHROME)
142-
@NotYetImplemented(CHROMIUMEDGE)
142+
@NotYetImplemented(EDGIUM)
143+
@NotYetImplemented(LEGACY_FIREFOX_XPI)
143144
@NotYetImplemented(FIREFOX)
144-
@NotYetImplemented(MARIONETTE)
145145
@NotYetImplemented(IE)
146-
@NotYetImplemented(EDGE)
146+
@NotYetImplemented(EDGE_HTML)
147147
@NotYetImplemented(SAFARI)
148148
public void shouldBeAbleToClearCheckboxInput() {
149149
shouldBeAbleToClearInput(By.name("checkbox_input"), "Checkbox");

‎java/client/test/org/openqa/selenium/ClickScrollingTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
2424
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
2525
import static org.openqa.selenium.testing.drivers.Browser.ALL;
26-
import static org.openqa.selenium.testing.drivers.Browser.EDGE;
27-
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
26+
import static org.openqa.selenium.testing.drivers.Browser.EDGE_HTML;
27+
import static org.openqa.selenium.testing.drivers.Browser.LEGACY_FIREFOX_XPI;
2828
import static org.openqa.selenium.testing.drivers.Browser.HTMLUNIT;
2929
import static org.openqa.selenium.testing.drivers.Browser.IE;
30-
import static org.openqa.selenium.testing.drivers.Browser.MARIONETTE;
30+
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
3131
import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
3232

3333
import org.junit.Test;
@@ -112,7 +112,7 @@ public void testShouldBeAbleToClickOnAnElementHiddenByYOverflow() {
112112

113113
@Test
114114
@Ignore(value = IE, issue = "716")
115-
@Ignore(value = FIREFOX, issue = "716")
115+
@Ignore(value = LEGACY_FIREFOX_XPI, issue = "716")
116116
public void testShouldBeAbleToClickOnAnElementPartiallyHiddenByOverflow() {
117117
driver.get(appServer.whereIs("scrolling_tests/page_with_partially_hidden_element.html"));
118118

@@ -133,7 +133,7 @@ public void testShouldNotScrollOverflowElementsWhichAreVisible() {
133133

134134
@Test
135135
@NotYetImplemented(IE)
136-
@NotYetImplemented(FIREFOX)
136+
@NotYetImplemented(LEGACY_FIREFOX_XPI)
137137
public void testShouldNotScrollIfAlreadyScrolledAndElementIsInView() {
138138
driver.get(appServer.whereIs("scroll3.html"));
139139
driver.findElement(By.id("button2")).click();
@@ -152,7 +152,7 @@ public void testShouldBeAbleToClickRadioButtonScrolledIntoView() {
152152
@Test
153153
@Ignore(value = IE, reason = "IE has special overflow handling")
154154
@NotYetImplemented(SAFARI)
155-
@NotYetImplemented(EDGE)
155+
@NotYetImplemented(EDGE_HTML)
156156
public void testShouldScrollOverflowElementsIfClickPointIsOutOfViewButElementIsInView() {
157157
driver.get(appServer.whereIs("scroll5.html"));
158158
driver.findElement(By.id("inner")).click();
@@ -162,7 +162,7 @@ public void testShouldScrollOverflowElementsIfClickPointIsOutOfViewButElementIsI
162162
@SwitchToTopAfterTest
163163
@Test
164164
@NotYetImplemented(SAFARI)
165-
@NotYetImplemented(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1314462")
165+
@NotYetImplemented(value = FIREFOX, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1314462")
166166
public void testShouldBeAbleToClickElementInAFrameThatIsOutOfView() {
167167
driver.get(appServer.whereIs("scrolling_tests/page_with_frame_out_of_view.html"));
168168
driver.switchTo().frame("frame");
@@ -231,10 +231,10 @@ private void onlyPassIfNotOnMac(int mozIssue, Runnable toCheck) {
231231
toCheck.run();
232232
assumeFalse(
233233
"It appears https://github.com/mozilla/geckodriver/issues/" + mozIssue + " is fixed",
234-
Platform.getCurrent() == Platform.MAC && Browser.detect() == MARIONETTE);
234+
Platform.getCurrent() == Platform.MAC && Browser.detect() == FIREFOX);
235235
} catch (Throwable e) {
236236
// Swallow the exception, as this is expected for Firefox on OS X
237-
if (!(Platform.getCurrent() == Platform.MAC && Browser.detect() == MARIONETTE)) {
237+
if (!(Platform.getCurrent() == Platform.MAC && Browser.detect() == FIREFOX)) {
238238
throw e;
239239
}
240240
}
@@ -256,7 +256,7 @@ private long getScrollTop() {
256256
@SwitchToTopAfterTest
257257
@Test
258258
@NotYetImplemented(SAFARI)
259-
@NotYetImplemented(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1314462")
259+
@NotYetImplemented(value = FIREFOX, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1314462")
260260
public void testShouldBeAbleToClickElementInATallFrame() {
261261
driver.get(appServer.whereIs("scrolling_tests/page_with_tall_frame.html"));
262262
driver.switchTo().frame("tall_frame");

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
2525
import static org.openqa.selenium.testing.drivers.Browser.ALL;
2626
import static org.openqa.selenium.testing.drivers.Browser.CHROME;
27-
import static org.openqa.selenium.testing.drivers.Browser.CHROMIUMEDGE;
28-
import static org.openqa.selenium.testing.drivers.Browser.EDGE;
29-
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
27+
import static org.openqa.selenium.testing.drivers.Browser.EDGIUM;
28+
import static org.openqa.selenium.testing.drivers.Browser.EDGE_HTML;
29+
import static org.openqa.selenium.testing.drivers.Browser.LEGACY_FIREFOX_XPI;
3030
import static org.openqa.selenium.testing.drivers.Browser.IE;
31-
import static org.openqa.selenium.testing.drivers.Browser.MARIONETTE;
31+
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
3232
import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
3333

3434
import org.junit.Before;
@@ -131,7 +131,7 @@ public void testCanClickOnAnElementWithTopSetToANegativeNumber() {
131131

132132
@Test
133133
@NotYetImplemented(SAFARI)
134-
@NotYetImplemented(EDGE)
134+
@NotYetImplemented(EDGE_HTML)
135135
public void testShouldSetRelatedTargetForMouseOver() {
136136
driver.get(pages.javascriptPage);
137137

@@ -206,7 +206,7 @@ public void testCanClickOnALinkThatContainsTextWrappedInASpan() {
206206
}
207207

208208
@Test
209-
@NotYetImplemented(value = MARIONETTE, reason = "https://github.com/mozilla/geckodriver/issues/653")
209+
@NotYetImplemented(value = FIREFOX, reason = "https://github.com/mozilla/geckodriver/issues/653")
210210
@NotYetImplemented(SAFARI)
211211
public void testCanClickOnALinkThatContainsEmbeddedBlockElements() {
212212
driver.findElement(By.id("embeddedBlock")).click();
@@ -240,7 +240,7 @@ public void testClicksASurroundingStrongTag() {
240240

241241
@Test
242242
@Ignore(IE)
243-
@NotYetImplemented(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1502636")
243+
@NotYetImplemented(value = FIREFOX, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1502636")
244244
@NotYetImplemented(SAFARI)
245245
public void testCanClickAnImageMapArea() {
246246
driver.get(appServer.whereIs("click_tests/google_map.html"));
@@ -257,8 +257,8 @@ public void testCanClickAnImageMapArea() {
257257
}
258258

259259
@Test
260-
@Ignore(FIREFOX)
261-
@NotYetImplemented(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1422272")
260+
@Ignore(LEGACY_FIREFOX_XPI)
261+
@NotYetImplemented(value = FIREFOX, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1422272")
262262
@NotYetImplemented(SAFARI)
263263
public void testShouldBeAbleToClickOnAnElementGreaterThanTwoViewports() {
264264
String url = appServer.whereIs("click_too_big.html");
@@ -350,11 +350,11 @@ public void testShouldBeAbleToClickOnASpanThatWrapsToTheNextLine() {
350350

351351
@Test
352352
@Ignore(CHROME)
353-
@Ignore(CHROMIUMEDGE)
353+
@Ignore(EDGIUM)
354354
@Ignore(IE)
355-
@Ignore(MARIONETTE)
355+
@Ignore(FIREFOX)
356356
@NotYetImplemented(SAFARI)
357-
@NotYetImplemented(EDGE)
357+
@NotYetImplemented(EDGE_HTML)
358358
public void testShouldBeAbleToClickOnAPartiallyOverlappedLinkThatWrapsToTheNextLine() {
359359
driver.get(appServer.whereIs("click_tests/wrapped_overlapping_elements.html"));
360360

‎java/client/test/org/openqa/selenium/ContentEditableTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
import static org.assertj.core.api.Assertions.assertThat;
2121
import static org.junit.Assume.assumeFalse;
22-
import static org.openqa.selenium.testing.drivers.Browser.EDGE;
22+
import static org.openqa.selenium.testing.drivers.Browser.EDGE_HTML;
2323
import static org.openqa.selenium.testing.drivers.Browser.IE;
24-
import static org.openqa.selenium.testing.drivers.Browser.MARIONETTE;
24+
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
2525
import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
2626
import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
2727
import static org.openqa.selenium.testing.TestUtilities.isFirefox;
@@ -39,7 +39,7 @@ public void switchToDefaultContent() {
3939
}
4040

4141
@Test
42-
@NotYetImplemented(value = MARIONETTE)
42+
@NotYetImplemented(value = FIREFOX)
4343
public void testTypingIntoAnIFrameWithContentEditableOrDesignModeSet() {
4444
driver.get(pages.richTextPage);
4545

@@ -56,7 +56,7 @@ public void testTypingIntoAnIFrameWithContentEditableOrDesignModeSet() {
5656
}
5757

5858
@Test
59-
@NotYetImplemented(value = MARIONETTE)
59+
@NotYetImplemented(value = FIREFOX)
6060
@NotYetImplemented(SAFARI)
6161
public void testNonPrintableCharactersShouldWorkWithContentEditableOrDesignModeSet() {
6262
assumeFalse("FIXME: Fails in Firefox on Linux with synthesized events",
@@ -86,8 +86,8 @@ public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
8686

8787
@Test
8888
@NotYetImplemented(SAFARI)
89-
@NotYetImplemented(EDGE)
90-
@NotYetImplemented(value = MARIONETTE, reason = "https://github.com/mozilla/geckodriver/issues/667")
89+
@NotYetImplemented(EDGE_HTML)
90+
@NotYetImplemented(value = FIREFOX, reason = "https://github.com/mozilla/geckodriver/issues/667")
9191
public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue() {
9292
driver.get(pages.readOnlyPage);
9393
WebElement editable = driver.findElement(By.id("content-editable"));
@@ -114,8 +114,8 @@ public void testShouldBeAbleToTypeIntoTinyMCE() {
114114
@Test
115115
@NotYetImplemented(value = IE, reason = "Prepends text")
116116
@NotYetImplemented(value = SAFARI, reason = "Prepends text")
117-
@NotYetImplemented(value = MARIONETTE, reason = "https://github.com/mozilla/geckodriver/issues/667")
118-
@NotYetImplemented(EDGE)
117+
@NotYetImplemented(value = FIREFOX, reason = "https://github.com/mozilla/geckodriver/issues/667")
118+
@NotYetImplemented(EDGE_HTML)
119119
public void testShouldAppendToTinyMCE() {
120120
driver.get(appServer.whereIs("tinymce.html"));
121121
driver.switchTo().frame("mce_0_ifr");
@@ -128,7 +128,7 @@ public void testShouldAppendToTinyMCE() {
128128
}
129129

130130
@Test
131-
@NotYetImplemented(value = MARIONETTE, reason = "Doesn't write anything")
131+
@NotYetImplemented(value = FIREFOX, reason = "Doesn't write anything")
132132
@NotYetImplemented(value = SAFARI, reason = "Prepends text")
133133
public void appendsTextToEndOfContentEditableWithMultipleTextNodes() {
134134
driver.get(appServer.whereIs("content-editable.html"));

‎java/client/test/org/openqa/selenium/CookieImplementationTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import static org.junit.Assume.assumeTrue;
2222
import static org.openqa.selenium.testing.drivers.Browser.ALL;
2323
import static org.openqa.selenium.testing.drivers.Browser.CHROME;
24-
import static org.openqa.selenium.testing.drivers.Browser.CHROMIUMEDGE;
24+
import static org.openqa.selenium.testing.drivers.Browser.EDGIUM;
2525
import static org.openqa.selenium.testing.drivers.Browser.IE;
26-
import static org.openqa.selenium.testing.drivers.Browser.MARIONETTE;
26+
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
2727
import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
2828

2929
import org.junit.Before;
@@ -204,9 +204,9 @@ public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() {
204204
@SwitchToTopAfterTest
205205
@Test
206206
@NotYetImplemented(value = CHROME, reason = "https://bugs.chromium.org/p/chromedriver/issues/detail?id=3153")
207-
@NotYetImplemented(value = CHROMIUMEDGE, reason = "https://bugs.chromium.org/p/chromedriver/issues/detail?id=3153")
207+
@NotYetImplemented(value = EDGIUM, reason = "https://bugs.chromium.org/p/chromedriver/issues/detail?id=3153")
208208
@Ignore(SAFARI)
209-
@NotYetImplemented(value = MARIONETTE, reason = "https://github.com/mozilla/geckodriver/issues/1104")
209+
@NotYetImplemented(value = FIREFOX, reason = "https://github.com/mozilla/geckodriver/issues/1104")
210210
public void testGetCookiesInAFrame() {
211211
driver.get(domainHelper.getUrlForFirstValidHostname("/common/animals"));
212212
Cookie cookie1 = new Cookie.Builder("fish", "cod").path("/common/animals").build();

0 commit comments

Comments
 (0)