Skip to content

Commit e212e3a

Browse files
barancevbarancev
committed
Java: Unignoring tests in marionette
1 parent cb5dff3 commit e212e3a

13 files changed

+33
-66
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void testShouldAllowAUserToSetTheValueOfAPrompt() {
167167
wait.until(textInElementLocated(By.id("text"), "cheese"));
168168
}
169169

170-
@Ignore(value = {CHROME, MARIONETTE},
170+
@Ignore(value = {CHROME},
171171
reason = "Marionette: https://github.com/jgraham/wires/issues/17")
172172
@JavascriptEnabled
173173
@Test
@@ -225,7 +225,6 @@ public void testAlertShouldNotAllowAdditionalCommandsIfDismissed() {
225225
fail("Expected NoAlertPresentException");
226226
}
227227

228-
@Ignore(MARIONETTE)
229228
@JavascriptEnabled
230229
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
231230
@Test
@@ -241,7 +240,6 @@ public void testShouldAllowUsersToAcceptAnAlertInAFrame() {
241240
assertEquals("Testing Alerts", driver.getTitle());
242241
}
243242

244-
@Ignore(MARIONETTE)
245243
@JavascriptEnabled
246244
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
247245
@Test

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void testShouldBeAbleToClickElementInAFrameThatIsOutOfView() {
160160

161161
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
162162
@Test
163-
@Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested")
163+
@Ignore(value = {SAFARI}, reason = "not tested")
164164
public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrame() {
165165
driver.get(appServer.whereIs("scrolling_tests/page_with_scrolling_frame.html"));
166166
driver.switchTo().frame("scrolling_frame");
@@ -181,7 +181,7 @@ public void testShouldNotBeAbleToClickElementThatIsOutOfViewInANonScrollableFram
181181

182182
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
183183
@Test
184-
@Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested")
184+
@Ignore(value = {SAFARI}, reason = "not tested")
185185
public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrameThatIsOutOfView() {
186186
driver.get(appServer.whereIs("scrolling_tests/page_with_scrolling_frame_out_of_view.html"));
187187
driver.switchTo().frame("scrolling_frame");
@@ -192,7 +192,7 @@ public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrameThatIsOutOfView
192192

193193
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
194194
@Test
195-
@Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested")
195+
@Ignore(value = {SAFARI}, reason = "not tested")
196196
public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrame() {
197197
driver.get(appServer.whereIs("scrolling_tests/page_with_nested_scrolling_frames.html"));
198198
driver.switchTo().frame("scrolling_frame");
@@ -204,7 +204,7 @@ public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrame() {
204204

205205
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
206206
@Test
207-
@Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested")
207+
@Ignore(value = {SAFARI}, reason = "not tested")
208208
public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrameThatIsOutOfView() {
209209
driver.get(appServer.whereIs("scrolling_tests/page_with_nested_scrolling_frames_out_of_view.html"));
210210
driver.switchTo().frame("scrolling_frame");
@@ -216,7 +216,6 @@ public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrameThatIsOut
216216

217217
@JavascriptEnabled
218218
@Test
219-
@Ignore(value = {MARIONETTE}, reason = "getSize issue https://bugzilla.mozilla.org/show_bug.cgi?id=1199925")
220219
public void testShouldNotScrollWhenGettingElementSize() {
221220
driver.get(appServer.whereIs("scroll3.html"));
222221
long scrollTop = getScrollTop();

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public void testCanClickOnALinkAndFollowIt() {
6161
wait.until(titleIs("XHTML Test Page"));
6262
}
6363

64-
@Ignore(value = {MARIONETTE}, reason = "Not tested.")
6564
@Test
6665
public void testCanClickOnALinkThatOverflowsAndFollowIt() {
6766
driver.findElement(By.id("overflowLink")).click();
@@ -131,7 +130,6 @@ public void testJsLocatedElementsCanUpdateFramesIfFoundSomehowElse() {
131130

132131
@JavascriptEnabled
133132
@Test
134-
@Ignore(value = {MARIONETTE}, reason = "sendKeys is not standard compliant yet")
135133
public void testCanClickOnAnElementWithTopSetToANegativeNumber() {
136134
String page = appServer.whereIs("styledPage.html");
137135
driver.get(page);
@@ -151,7 +149,7 @@ public void testShouldClickOnFirstBoundingClientRectWithNonZeroSize() {
151149
}
152150

153151
@JavascriptEnabled
154-
@Ignore(value = {CHROME}, reason = "Not implemented")
152+
@Ignore(value = {CHROME, MARIONETTE}, reason = "Not implemented")
155153
@Test
156154
public void testShouldSetRelatedTargetForMouseOver() {
157155
driver.get(pages.javascriptPage);
@@ -165,7 +163,7 @@ public void testShouldSetRelatedTargetForMouseOver() {
165163

166164
@JavascriptEnabled
167165
@NoDriverAfterTest
168-
@Ignore(value = {SAFARI, MARIONETTE}, reason = "Safari: issue 3693")
166+
@Ignore(value = {SAFARI}, reason = "Safari: issue 3693")
169167
@Test
170168
public void testShouldOnlyFollowHrefOnce() {
171169
driver.get(pages.clicksPage);

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ public void testCannotGetCookiesWithPathDifferingOnlyInCase() {
236236
}
237237

238238
@Test
239-
@Ignore(MARIONETTE)
240239
public void testShouldNotGetCookieOnDifferentDomain() {
241240
assumeTrue(domainHelper.checkHasValidAlternateHostname());
242241

@@ -371,7 +370,6 @@ public void testCookieEqualityAfterSetAndGet() {
371370
}
372371

373372
@Test
374-
@Ignore(MARIONETTE)
375373
public void testRetainsCookieExpiry() {
376374
Cookie addedCookie =
377375
new Cookie.Builder("fish", "cod")
@@ -385,7 +383,7 @@ public void testRetainsCookieExpiry() {
385383
assertEquals(addedCookie.getExpiry(), retrieved.getExpiry());
386384
}
387385

388-
@Ignore(value = {IE, PHANTOMJS, SAFARI, MARIONETTE})
386+
@Ignore(value = {IE, PHANTOMJS, SAFARI})
389387
@Test
390388
public void canHandleSecureCookie() {
391389
driver.get(domainHelper.getSecureUrlForFirstValidHostname("animals"));
@@ -403,7 +401,7 @@ public void canHandleSecureCookie() {
403401
assertNotNull(retrieved);
404402
}
405403

406-
@Ignore(value = {IE, PHANTOMJS, SAFARI, MARIONETTE})
404+
@Ignore(value = {IE, PHANTOMJS, SAFARI})
407405
@Test
408406
public void testRetainsCookieSecure() {
409407
driver.get(domainHelper.getSecureUrlForFirstValidHostname("animals"));
@@ -438,7 +436,6 @@ public void canHandleHttpOnlyCookie() {
438436
assertNotNull(retrieved);
439437
}
440438

441-
@Ignore(reason = "Needs jetty upgrade (servlet api 3)")
442439
@Test
443440
public void testRetainsHttpOnlyFlag() {
444441
Cookie addedCookie =
@@ -486,7 +483,7 @@ public void testDeleteNotExistedCookie() {
486483
driver.manage().deleteCookieNamed(key);
487484
}
488485

489-
@Ignore(value = {CHROME, FIREFOX, IE, PHANTOMJS, SAFARI, MARIONETTE})
486+
@Ignore(value = {CHROME, FIREFOX, IE, PHANTOMJS, SAFARI})
490487
@Test
491488
public void testShouldDeleteOneOfTheCookiesWithTheSameName() {
492489
driver.get(domainHelper.getUrlForFirstValidHostname("/common/animals"));
@@ -609,7 +606,6 @@ private void addCookieOnServerSide(Cookie cookie) {
609606
}
610607

611608
@Test
612-
@Ignore(MARIONETTE)
613609
public void deleteAllCookies() throws Exception {
614610
assumeTrue(domainHelper.checkHasValidAlternateHostname());
615611

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public void testGetCssValueShouldReturnStandardizedColour() {
6565

6666
@JavascriptEnabled
6767
@Test
68-
@Ignore(MARIONETTE)
6968
public void testShouldAllowInheritedStylesToBeUsed() {
7069
driver.get(pages.javascriptPage);
7170

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

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public void testShouldNotBeAbleToLocateByIdMultipleElementsThatDoNotExist() {
9191
}
9292

9393
@Test(expected = NoSuchElementException.class)
94-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
9594
public void testFindingASingleElementByEmptyIdShouldThrow() {
9695
driver.get(pages.formPage);
9796
driver.findElement(By.id(""));
@@ -157,29 +156,25 @@ public void testShouldNotBeAbleToLocateByNameMultipleElementsThatDoNotExist() {
157156
}
158157

159158
@Test(expected = NoSuchElementException.class)
160-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
161159
public void testFindingASingleElementByEmptyNameShouldThrow() {
162160
driver.get(pages.formPage);
163161
driver.findElement(By.name(""));
164162
}
165163

166164
@Test
167-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
168165
public void testFindingMultipleElementsByEmptyNameShouldReturnEmptyList() {
169166
driver.get(pages.formPage);
170167
List<WebElement> elements = driver.findElements(By.name(""));
171168
assertThat(elements.size(), is(0));
172169
}
173170

174171
@Test(expected = NoSuchElementException.class)
175-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
176172
public void testFindingASingleElementByNameWithSpaceShouldThrow() {
177173
driver.get(pages.formPage);
178174
driver.findElement(By.name("nonexistent button"));
179175
}
180176

181177
@Test
182-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
183178
public void testFindingMultipleElementsByNameWithSpaceShouldReturnEmptyList() {
184179
driver.get(pages.formPage);
185180
List<WebElement> elements = driver.findElements(By.name("nonexistent button"));
@@ -218,14 +213,12 @@ public void testShouldNotBeAbleToLocateByTagNameMultipleElementsThatDoNotExist()
218213
}
219214

220215
@Test(expected = NoSuchElementException.class)
221-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
222216
public void testFindingASingleElementByEmptyTagNameShouldThrow() {
223217
driver.get(pages.formPage);
224218
driver.findElement(By.tagName(""));
225219
}
226220

227221
@Test(expected = NoSuchElementException.class)
228-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
229222
public void testFindingMultipleElementsByEmptyTagNameShouldThrow() {
230223
driver.get(pages.formPage);
231224
driver.findElements(By.tagName(""));
@@ -304,14 +297,14 @@ public void testShouldNotFindElementByClassWhenTheNameQueriedIsShorterThanCandid
304297
driver.findElement(By.className("nameB"));
305298
}
306299

307-
@Ignore(value = {CHROME, MARIONETTE}, reason = "throws WebDriverException")
300+
@Ignore(value = {CHROME}, reason = "throws WebDriverException")
308301
@Test(expected = NoSuchElementException.class)
309302
public void testFindingASingleElementByEmptyClassNameShouldThrow() {
310303
driver.get(pages.xhtmlTestPage);
311304
driver.findElement(By.className(""));
312305
}
313306

314-
@Ignore(value = {CHROME, MARIONETTE}, reason = "Chrome: throws WebDriverException")
307+
@Ignore(value = {CHROME}, reason = "Chrome: throws WebDriverException")
315308
@Test(expected = NoSuchElementException.class)
316309
public void testFindingMultipleElementsByEmptyClassNameShouldThrow() {
317310
driver.get(pages.xhtmlTestPage);
@@ -332,7 +325,7 @@ public void testFindingMultipleElementsByCompoundClassNameShouldThrow() {
332325
driver.findElements(By.className("a b"));
333326
}
334327

335-
@Ignore(value = {CHROME, MARIONETTE}, reason = "Chrome: throws InvalidElementStateException")
328+
@Ignore(value = {CHROME}, reason = "Chrome: throws InvalidElementStateException")
336329
@Test(expected = NoSuchElementException.class)
337330
public void testFindingASingleElementByInvalidClassNameShouldThrow() {
338331
driver.get(pages.xhtmlTestPage);
@@ -427,14 +420,12 @@ public void testShouldThrowAnExceptionWhenThereIsNoLinkToClick() {
427420
driver.findElement(By.xpath("//a[@id='Not here']"));
428421
}
429422

430-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
431423
@Test(expected = InvalidSelectorException.class)
432424
public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInvalidInDriverFindElement() {
433425
driver.get(pages.formPage);
434426
driver.findElement(By.xpath("this][isnot][valid"));
435427
}
436428

437-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
438429
@Test(expected = InvalidSelectorException.class)
439430
public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInvalidInDriverFindElements() {
440431
assumeFalse("Ignoring xpath error test in IE6", TestUtilities.isIe6(driver));
@@ -443,15 +434,13 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInval
443434
driver.findElements(By.xpath("this][isnot][valid"));
444435
}
445436

446-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
447437
@Test(expected = InvalidSelectorException.class)
448438
public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInvalidInElementFindElement() {
449439
driver.get(pages.formPage);
450440
WebElement body = driver.findElement(By.tagName("body"));
451441
body.findElement(By.xpath("this][isnot][valid"));
452442
}
453443

454-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
455444
@Test(expected = InvalidSelectorException.class)
456445
public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInvalidInElementFindElements() {
457446
assumeFalse("Ignoring xpath error test in IE6", TestUtilities.isIe6(driver));
@@ -461,14 +450,12 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInval
461450
body.findElements(By.xpath("this][isnot][valid"));
462451
}
463452

464-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
465453
@Test(expected = InvalidSelectorException.class)
466454
public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInDriverFindElement() {
467455
driver.get(pages.formPage);
468456
driver.findElement(By.xpath("count(//input)"));
469457
}
470458

471-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
472459
@Test(expected = InvalidSelectorException.class)
473460
public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInDriverFindElements() {
474461
assumeFalse("Ignoring xpath error test in IE6", TestUtilities.isIe6(driver));
@@ -477,7 +464,6 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInDr
477464
driver.findElements(By.xpath("count(//input)"));
478465
}
479466

480-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
481467
@Test(expected = InvalidSelectorException.class)
482468
public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInElementFindElement() {
483469
driver.get(pages.formPage);
@@ -486,7 +472,6 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInEl
486472
body.findElement(By.xpath("count(//input)"));
487473
}
488474

489-
@Ignore(value = MARIONETTE, reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1204504")
490475
@Test(expected = InvalidSelectorException.class)
491476
public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInElementFindElements() {
492477
assumeFalse("Ignoring xpath error test in IE6", TestUtilities.isIe6(driver));
@@ -566,32 +551,32 @@ public void testShouldNotFindElementsByCssSelectorWhenThereIsNoSuchElement() {
566551
assertThat(elements.size(), is(0));
567552
}
568553

569-
@Ignore(value = {CHROME, MARIONETTE},
570-
reason = "Chrome: throws WebDriverException, Marionette: throws InvalidElementStateException")
554+
@Ignore(value = {CHROME},
555+
reason = "Chrome: throws WebDriverException")
571556
@Test(expected = NoSuchElementException.class)
572557
public void testFindingASingleElementByEmptyCssSelectorShouldThrow() {
573558
driver.get(pages.xhtmlTestPage);
574559
driver.findElement(By.cssSelector(""));
575560
}
576561

577-
@Ignore(value = {CHROME, MARIONETTE},
578-
reason = "Chrome: throws WebDriverException, Marionette: throws InvalidElementStateException")
562+
@Ignore(value = {CHROME},
563+
reason = "Chrome: throws WebDriverException")
579564
@Test(expected = NoSuchElementException.class)
580565
public void testFindingMultipleElementsByEmptyCssSelectorShouldThrow() {
581566
driver.get(pages.xhtmlTestPage);
582567
driver.findElements(By.cssSelector(""));
583568
}
584569

585-
@Ignore(value = {CHROME, MARIONETTE},
586-
reason = "Chrome: throws InvalidElementStateException, Marionette: throws InvalidElementStateException")
570+
@Ignore(value = {CHROME},
571+
reason = "Chrome: throws InvalidElementStateException")
587572
@Test(expected = NoSuchElementException.class)
588573
public void testFindingASingleElementByInvalidCssSelectorShouldThrow() {
589574
driver.get(pages.xhtmlTestPage);
590575
driver.findElement(By.cssSelector("//a/b/c[@id='1']"));
591576
}
592577

593-
@Ignore(value = {CHROME, MARIONETTE},
594-
reason = "Chrome: throws InvalidElementStateException, Marionette: throws InvalidElementStateException")
578+
@Ignore(value = {CHROME},
579+
reason = "Chrome: throws InvalidElementStateException")
595580
@Test(expected = NoSuchElementException.class)
596581
public void testFindingMultipleElementsByInvalidCssSelectorShouldThrow() {
597582
assumeFalse("Ignoring test for lack of error in CSS in IE6", TestUtilities.isIe6(driver));

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ public void testSendingKeyboardEventsShouldAppendTextInInputs() {
232232
}
233233

234234
@Test
235-
@Ignore(MARIONETTE)
236235
public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue() {
237236
driver.get(pages.formPage);
238237
WebElement element = driver.findElement(By.id("inputWithText"));
@@ -243,7 +242,6 @@ public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue()
243242
}
244243

245244
@Test
246-
@Ignore(MARIONETTE)
247245
public void testSendingKeyboardEventsShouldAppendTextInTextAreas() {
248246
driver.get(pages.formPage);
249247
WebElement element = driver.findElement(By.id("withText"));

0 commit comments

Comments
 (0)