Skip to content

Commit 655a5d5

Browse files
barancevbarancev
committed
Unignoring marionette tests passed after sendKeys rework
1 parent b462925 commit 655a5d5

File tree

9 files changed

+26
-39
lines changed

9 files changed

+26
-39
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ public void testClearingAnElementShouldCauseTheOnChangeHandlerToFire() {
273273
assertThat(result.getText(), equalTo("Cleared"));
274274
}
275275

276-
@Ignore(MARIONETTE)
277276
@JavascriptEnabled
278277
@Test
279278
public void testSendingKeysToAnotherElementShouldCauseTheBlurEventToFire() {
@@ -287,7 +286,6 @@ public void testSendingKeysToAnotherElementShouldCauseTheBlurEventToFire() {
287286
assertEventFired("blur");
288287
}
289288

290-
@Ignore(MARIONETTE)
291289
@JavascriptEnabled
292290
@Test
293291
public void testSendingKeysToAnElementShouldCauseTheFocusEventToFire() {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ public void testGetAttributeDoesNotReturnAnObjectForSvgProperties() {
303303
}
304304

305305
@Test
306-
@Ignore(value = {MARIONETTE}, reason = "sendKeys issue")
307306
public void testCanRetrieveTheCurrentValueOfATextFormField_textInput() {
308307
driver.get(pages.formPage);
309308
WebElement element = driver.findElement(By.id("working"));
@@ -313,7 +312,6 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_textInput() {
313312
}
314313

315314
@Test
316-
@Ignore(value = {MARIONETTE}, reason = "sendKeys issue")
317315
public void testCanRetrieveTheCurrentValueOfATextFormField_emailInput() {
318316
driver.get(pages.formPage);
319317
WebElement element = driver.findElement(By.id("email"));
@@ -323,7 +321,6 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_emailInput() {
323321
}
324322

325323
@Test
326-
@Ignore(value = {MARIONETTE}, reason = "sendKeys issue")
327324
public void testCanRetrieveTheCurrentValueOfATextFormField_textArea() {
328325
driver.get(pages.formPage);
329326
WebElement element = driver.findElement(By.id("emptyTextArea"));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public void testShouldNotFindElementByClassWhenTheNameQueriedIsShorterThanCandid
307307
driver.findElement(By.className("nameB"));
308308
}
309309

310-
@Ignore(value = {CHROME}, reason = "throws WebDriverException")
310+
@Ignore(value = {CHROME, MARIONETTE}, reason = "throws WebDriverException")
311311
@Test(expected = NoSuchElementException.class)
312312
public void testFindingASingleElementByEmptyClassNameShouldThrow() {
313313
driver.get(pages.xhtmlTestPage);

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public void testShouldNotBeAbleToSubmitAFormThatDoesNotExist() {
104104
}
105105

106106
@Test
107-
@Ignore(MARIONETTE)
108107
public void testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue() {
109108
driver.get(pages.javascriptPage);
110109
WebElement textarea = driver.findElement(By.id("keyUpArea"));
@@ -114,7 +113,6 @@ public void testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue() {
114113
}
115114

116115
@Test
117-
@Ignore(MARIONETTE)
118116
public void testSendKeysKeepsCapitalization() {
119117
driver.get(pages.javascriptPage);
120118
WebElement textarea = driver.findElement(By
@@ -135,7 +133,6 @@ public void testShouldSubmitAFormUsingTheNewlineLiteral() {
135133
assertTrue(driver.getCurrentUrl().endsWith("?x=name"));
136134
}
137135

138-
@Ignore({MARIONETTE})
139136
@Test
140137
public void testShouldSubmitAFormUsingTheEnterKey() {
141138
driver.get(pages.formPage);
@@ -147,7 +144,6 @@ public void testShouldSubmitAFormUsingTheEnterKey() {
147144
}
148145

149146
@Test
150-
@Ignore(MARIONETTE)
151147
public void testShouldEnterDataIntoFormFields() {
152148
driver.get(pages.xhtmlTestPage);
153149
WebElement element = driver.findElement(By.xpath("//form[@name='someForm']/input[@id='username']"));
@@ -226,7 +222,6 @@ public void testShouldBeAbleToUploadTheSameFileTwice() throws IOException {
226222
}
227223

228224
@Test
229-
@Ignore(MARIONETTE)
230225
public void testSendingKeyboardEventsShouldAppendTextInInputs() {
231226
driver.get(pages.formPage);
232227
WebElement element = driver.findElement(By.id("working"));
@@ -284,28 +279,28 @@ public void handleFormWithJavascriptAction() {
284279
assertEquals("Tasty cheese", text);
285280
}
286281

287-
@Ignore(value = {SAFARI, MARIONETTE}, reason = "untested")
282+
@Ignore(value = {SAFARI}, reason = "untested")
288283
@Test
289284
public void testCanClickOnASubmitButton() {
290285
checkSubmitButton("internal_explicit_submit");
291286
}
292287

293-
@Ignore(value = {SAFARI, MARIONETTE}, reason = "untested")
288+
@Ignore(value = {SAFARI}, reason = "untested")
294289
@Test
295290
public void testCanClickOnAnImplicitSubmitButton() {
296291
assumeFalse(isIe6(driver) || isIe7(driver) );
297292
checkSubmitButton("internal_implicit_submit");
298293
}
299294

300-
@Ignore(value = {IE, SAFARI, MARIONETTE},
295+
@Ignore(value = {IE, SAFARI},
301296
reason = "IE: failed; Others: untested")
302297
@NotYetImplemented(HTMLUNIT)
303298
@Test
304299
public void testCanClickOnAnExternalSubmitButton() {
305300
checkSubmitButton("external_explicit_submit");
306301
}
307302

308-
@Ignore(value = {IE, SAFARI, MARIONETTE},
303+
@Ignore(value = {IE, SAFARI},
309304
reason = "IE: failed; Others: untested")
310305
@NotYetImplemented(HTMLUNIT)
311306
@Test

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public void testCn() {
6464
driver.findElement(By.linkText(Messages.getString("I18nTest.link1"))).click();
6565
}
6666

67-
@Ignore({MARIONETTE})
6867
@Test
6968
public void testEnteringHebrewTextFromLeftToRight() {
7069
driver.get(pages.chinesePage);
@@ -75,7 +74,6 @@ public void testEnteringHebrewTextFromLeftToRight() {
7574
assertEquals(shalom, input.getAttribute("value"));
7675
}
7776

78-
@Ignore({MARIONETTE})
7977
@Test
8078
public void testEnteringHebrewTextFromRightToLeft() {
8179
driver.get(pages.chinesePage);
@@ -89,8 +87,7 @@ public void testEnteringHebrewTextFromRightToLeft() {
8987
@Test
9088
@Ignore(
9189
value = {MARIONETTE, CHROME},
92-
reason = "MARIONETTE: not checked, "
93-
+ "CHROME: ChromeDriver only supports characters in the BMP")
90+
reason = "CHROME: ChromeDriver only supports characters in the BMP")
9491
public void testEnteringSupplementaryCharacters() {
9592
assumeFalse("IE: versions less thank 10 have issue 5069",
9693
TestUtilities.isInternetExplorer(driver) &&
@@ -129,8 +126,7 @@ public void testShouldBeAbleToReturnTheTextInAPage() {
129126

130127
@NeedsFreshDriver
131128
@Ignore(value = {IE, CHROME, FIREFOX},
132-
reason = "Not implemented on anything other than"
133-
+ "Firefox/Linux at the moment.")
129+
reason = "Not implemented on anything other than Firefox/Linux at the moment.")
134130
@NotYetImplemented(HTMLUNIT)
135131
@Test
136132
public void testShouldBeAbleToActivateIMEEngine() throws InterruptedException {

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import static org.junit.Assume.assumeFalse;
2626
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
2727
import static org.openqa.selenium.testing.Ignore.Driver.IE;
28-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
2928

3029
import static org.hamcrest.Matchers.containsString;
3130
import static org.hamcrest.Matchers.endsWith;
@@ -190,7 +189,7 @@ public void testShouldRetainTheFormatingOfTextWithinAPreElementThatIsWithinARegu
190189
"after pre"));
191190
}
192191

193-
@Ignore(value = {IE, MARIONETTE}, reason = "IE: inserts \r\n instead of \n")
192+
@Ignore(value = {IE}, reason = "IE: inserts \r\n instead of \n")
194193
@Test
195194
public void testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea() {
196195
driver.get(pages.formPage);
@@ -207,7 +206,6 @@ public void testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea() {
207206
assertThat(seenText, equalTo(expectedText));
208207
}
209208

210-
@Ignore(value = {MARIONETTE})
211209
@Test
212210
public void testShouldBeAbleToEnterDatesAfterFillingInOtherValuesFirst() {
213211
driver.get(pages.formPage);
@@ -354,8 +352,7 @@ public void testTextOfATextAreaShouldBeEqualToItsDefaultText() {
354352
}
355353

356354
@Test
357-
@Ignore(value = {IE, MARIONETTE},
358-
reason = "IE: failed, other: untested")
355+
@Ignore(value = {IE})
359356
@NotYetImplemented(HTMLUNIT)
360357
public void testTextOfATextAreaShouldBeEqualToItsDefaultTextEvenAfterTyping() {
361358
driver.get(pages.formPage);
@@ -367,8 +364,7 @@ public void testTextOfATextAreaShouldBeEqualToItsDefaultTextEvenAfterTyping() {
367364

368365
@Test
369366
@JavascriptEnabled
370-
@Ignore(value = {IE},
371-
reason = "IE: failed, other: untested")
367+
@Ignore(value = {IE})
372368
@NotYetImplemented(HTMLUNIT)
373369
public void testTextOfATextAreaShouldBeEqualToItsDefaultTextEvenAfterChangingTheValue() {
374370
driver.get(pages.formPage);

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848

4949
import com.google.common.base.Joiner;
5050

51-
@Ignore(MARIONETTE)
5251
public class TypingTest extends JUnit4TestBase {
5352

5453
@JavascriptEnabled
@@ -370,6 +369,7 @@ public void testLowerCaseAlphaKeys() {
370369

371370
@JavascriptEnabled
372371
@Test
372+
@Ignore(MARIONETTE)
373373
public void testUppercaseAlphaKeys() {
374374
driver.get(pages.javascriptPage);
375375

@@ -385,6 +385,7 @@ public void testUppercaseAlphaKeys() {
385385

386386
@JavascriptEnabled
387387
@Test
388+
@Ignore(MARIONETTE)
388389
public void testAllPrintableKeys() {
389390
driver.get(pages.javascriptPage);
390391

@@ -450,6 +451,7 @@ public void testDeleteAndBackspaceKeys() {
450451
@JavascriptEnabled
451452
@NotYetImplemented(HTMLUNIT)
452453
@Test
454+
@Ignore(MARIONETTE)
453455
public void testSpecialSpaceKeys() {
454456
driver.get(pages.javascriptPage);
455457

@@ -462,6 +464,7 @@ public void testSpecialSpaceKeys() {
462464
@JavascriptEnabled
463465
@NotYetImplemented(HTMLUNIT)
464466
@Test
467+
@Ignore(MARIONETTE)
465468
public void testNumberpadKeys() {
466469
driver.get(pages.javascriptPage);
467470

@@ -507,6 +510,7 @@ public void testShiftSelectionDeletes() {
507510
@JavascriptEnabled
508511
@NotYetImplemented(HTMLUNIT)
509512
@Test
513+
@Ignore(MARIONETTE)
510514
public void testChordControlHomeShiftEndDelete() {
511515
assumeFalse("FIXME: macs don't have HOME keys, would PGUP work?",
512516
getEffectivePlatform().is(Platform.MAC));
@@ -529,6 +533,7 @@ public void testChordControlHomeShiftEndDelete() {
529533
@JavascriptEnabled
530534
@NotYetImplemented(HTMLUNIT)
531535
@Test
536+
@Ignore(MARIONETTE)
532537
public void testChordReveseShiftHomeSelectionDeletes() {
533538
assumeFalse("FIXME: macs don't have HOME keys, would PGUP work?",
534539
getEffectivePlatform().is(Platform.MAC));
@@ -562,6 +567,7 @@ public void testChordReveseShiftHomeSelectionDeletes() {
562567
@JavascriptEnabled
563568
@NotYetImplemented(HTMLUNIT)
564569
@Test
570+
@Ignore(MARIONETTE)
565571
public void testChordControlCutAndPaste() {
566572
assumeFalse("FIXME: macs don't have HOME keys, would PGUP work?",
567573
getEffectivePlatform().is(Platform.MAC));
@@ -634,7 +640,7 @@ public void testShouldNotTypeIntoElementsThatPreventKeyDownEvents() {
634640
}
635641

636642
@JavascriptEnabled
637-
@Ignore(value = PHANTOMJS)
643+
@Ignore(value = {PHANTOMJS})
638644
@NotYetImplemented(HTMLUNIT)
639645
@Test
640646
public void testGenerateKeyPressEventEvenWhenElementPreventsDefault() {
@@ -650,7 +656,7 @@ public void testGenerateKeyPressEventEvenWhenElementPreventsDefault() {
650656
}
651657

652658
@JavascriptEnabled
653-
@Ignore(value = {SAFARI}, reason = "Safari: cannot type on contentEditable with synthetic events")
659+
@Ignore(value = {SAFARI, MARIONETTE}, reason = "Safari: cannot type on contentEditable with synthetic events")
654660
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
655661
@Test
656662
public void testTypingIntoAnIFrameWithContentEditableOrDesignModeSet() {
@@ -676,6 +682,7 @@ public void testTypingIntoAnIFrameWithContentEditableOrDesignModeSet() {
676682
@NotYetImplemented(HTMLUNIT)
677683
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
678684
@Test
685+
@Ignore(MARIONETTE)
679686
public void testNonPrintableCharactersShouldWorkWithContentEditableOrDesignModeSet() {
680687
assumeFalse("FIXME: Fails in Firefox on Linux with synthesized events",
681688
isFirefox(driver) &&
@@ -701,7 +708,7 @@ public void testShouldBeAbleToTypeOnAnEmailInputField() {
701708
assertThat(email.getAttribute("value"), equalTo("foobar"));
702709
}
703710

704-
@Ignore(value = HTMLUNIT, reason = "inconsistent test")
711+
@Ignore(value = {HTMLUNIT}, reason = "inconsistent test")
705712
@Test
706713
public void testShouldBeAbleToTypeOnANumberInputField() {
707714
driver.get(pages.formPage);
@@ -736,7 +743,7 @@ public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue()
736743
assertThat(editable.getText(), equalTo(initialText + ", edited"));
737744
}
738745

739-
@Ignore(value = {IE, SAFARI, HTMLUNIT},
746+
@Ignore(value = {IE, SAFARI, HTMLUNIT, MARIONETTE},
740747
reason = "Untested browsers;" +
741748
" Safari: cannot type on contentEditable with synthetic events",
742749
issues = {3127})
@@ -755,7 +762,7 @@ public void testShouldBeAbleToTypeIntoTinyMCE() {
755762
}
756763

757764
@JavascriptEnabled
758-
@Ignore(value = SAFARI, reason = "Untested")
765+
@Ignore(value = {SAFARI}, reason = "Untested")
759766
@Test
760767
public void canSafelyTypeOnElementThatIsRemovedFromTheDomOnKeyPress() {
761768
driver.get(appServer.whereIs("key_tests/remove_on_keypress.html"));

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
2727
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
2828
import static org.openqa.selenium.testing.Ignore.Driver.IE;
29-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
3029
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
3130
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
3231

@@ -47,7 +46,7 @@
4746
/**
4847
* Demonstrates how to use WebDriver with a file input element.
4948
*/
50-
@Ignore(value = {SAFARI, MARIONETTE}, issues = {4220})
49+
@Ignore(value = {SAFARI}, issues = {4220})
5150
public class UploadTest extends JUnit4TestBase {
5251

5352
private static final String LOREM_IPSUM_TEXT = "lorem ipsum dolor sit amet";
@@ -83,7 +82,7 @@ public void testFileUploading() throws Exception {
8382
}
8483

8584
@Test
86-
@Ignore(value = {CHROME, IE, MARIONETTE, PHANTOMJS, SAFARI})
85+
@Ignore(value = {CHROME, IE, PHANTOMJS, SAFARI})
8786
public void testCleanFileInput() throws Exception {
8887
driver.get(pages.uploadPage);
8988
WebElement element = driver.findElement(By.id("upload"));

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ public void testShouldNotBeAbleToClickOnAnElementThatIsNotDisplayed() {
115115
}
116116

117117
@Test
118-
@Ignore(MARIONETTE)
119-
public void testShouldNotBeAbleToTypeAnElementThatIsNotDisplayed() {
118+
public void testShouldNotBeAbleToTypeToAnElementThatIsNotDisplayed() {
120119
driver.get(pages.javascriptPage);
121120
WebElement element = driver.findElement(By.id("unclickable"));
122121

0 commit comments

Comments
 (0)