Skip to content

Commit 860ded4

Browse files
committed
Unignoring passed (locally) htmlunit tests and ignoring failed (on travis) marionette tests
1 parent eb0c0af commit 860ded4

18 files changed

+5
-68
lines changed

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

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

477477
@NoDriverAfterTest
478478
@Test
479-
@Ignore(HTMLUNIT)
480479
public void testCanQuitWhenAnAlertIsPresent() {
481480
driver.get(pages.alertsPage);
482481
driver.findElement(By.id("alert")).click();

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static org.junit.Assert.assertThat;
2424
import static org.junit.Assume.assumeFalse;
2525
import static org.openqa.selenium.testing.Driver.CHROME;
26-
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
2726
import static org.openqa.selenium.testing.Driver.IE;
2827
import static org.openqa.selenium.testing.Driver.MARIONETTE;
2928
import static org.openqa.selenium.testing.Driver.SAFARI;
@@ -35,7 +34,6 @@
3534
import org.openqa.selenium.testing.Ignore;
3635
import org.openqa.selenium.testing.JUnit4TestBase;
3736
import org.openqa.selenium.testing.JavascriptEnabled;
38-
import org.openqa.selenium.testing.NotYetImplemented;
3937

4038
public class ContentEditableTest extends JUnit4TestBase {
4139

@@ -87,7 +85,6 @@ public void testNonPrintableCharactersShouldWorkWithContentEditableOrDesignModeS
8785

8886
@Test
8987
@Ignore(value = SAFARI, reason = "cannot type on contentEditable with synthetic events, issue 3127")
90-
@Ignore(HTMLUNIT)
9188
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
9289
public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
9390
driver.get(pages.readOnlyPage);
@@ -102,7 +99,6 @@ public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
10299
@Ignore(CHROME)
103100
@Ignore(IE)
104101
@Ignore(SAFARI)
105-
@Ignore(HTMLUNIT)
106102
@Ignore(MARIONETTE)
107103
public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue() {
108104
driver.get(pages.readOnlyPage);
@@ -117,7 +113,6 @@ public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue()
117113
@Test
118114
@Ignore(IE)
119115
@Ignore(value = SAFARI, reason = "cannot type on contentEditable with synthetic events, issue 3127")
120-
@Ignore(HTMLUNIT)
121116
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
122117
public void testShouldBeAbleToTypeIntoTinyMCE() {
123118
driver.get(appServer.whereIs("tinymce.html"));
@@ -135,7 +130,6 @@ public void testShouldBeAbleToTypeIntoTinyMCE() {
135130
@Ignore(CHROME)
136131
@Ignore(IE)
137132
@Ignore(value = SAFARI, reason = "cannot type on contentEditable with synthetic events, issue 3127")
138-
@Ignore(HTMLUNIT)
139133
@Ignore(MARIONETTE)
140134
public void testShouldAppendToTinyMCE() {
141135
driver.get(appServer.whereIs("tinymce.html"));

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ public void testShouldEmitOnClickEventsWhenSelectingElements() {
231231
@JavascriptEnabled
232232
@Test
233233
@Ignore(value = IE, reason = "Only fires the onchange event when the checkbox loses the focus")
234-
@Ignore(value = HTMLUNIT, reason = "HtmlUnit: default mode is IE8 now")
235234
public void testShouldEmitOnChangeEventsWhenChangingTheStateOfACheckbox() {
236235
driver.get(pages.javascriptPage);
237236
WebElement checkbox = driver.findElement(By.id("checkbox"));
@@ -385,7 +384,6 @@ public void testSubmittingFormFromFormInputTextElementShouldFireOnSubmitForThatF
385384
@Test
386385
@Ignore(value = SAFARI, reason = "Does not yet support file uploads, issue 4220")
387386
@Ignore(MARIONETTE)
388-
@Ignore(HTMLUNIT)
389387
public void testUploadingFileShouldFireOnChangeEvent() throws IOException {
390388
driver.get(pages.formPage);
391389
WebElement uploadElement = driver.findElement(By.id("upload"));

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import static org.junit.Assert.assertThat;
3131
import static org.junit.Assert.assertTrue;
3232
import static org.junit.Assume.assumeFalse;
33-
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
3433
import static org.openqa.selenium.testing.Driver.MARIONETTE;
3534
import static org.openqa.selenium.testing.TestUtilities.catchThrowable;
3635

@@ -319,7 +318,6 @@ public void testGetAttributeDoesNotReturnAnObjectForSvgProperties() {
319318
}
320319

321320
@Test
322-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
323321
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
324322
public void testCanRetrieveTheCurrentValueOfATextFormField_textInput() {
325323
driver.get(pages.formPage);
@@ -330,7 +328,6 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_textInput() {
330328
}
331329

332330
@Test
333-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
334331
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
335332
public void testCanRetrieveTheCurrentValueOfATextFormField_emailInput() {
336333
driver.get(pages.formPage);
@@ -341,7 +338,6 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_emailInput() {
341338
}
342339

343340
@Test
344-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
345341
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
346342
public void testCanRetrieveTheCurrentValueOfATextFormField_textArea() {
347343
driver.get(pages.formPage);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ public void shouldBeAbleToReturnArraysOfWebElementsFromAsyncScripts() {
162162

163163
@JavascriptEnabled
164164
@Test
165-
@Ignore(HTMLUNIT)
166165
public void shouldTimeoutIfScriptDoesNotInvokeCallback() {
167166
driver.get(pages.ajaxyPage);
168167
// Script is expected to be async and explicitly callback, so this should timeout.
@@ -172,7 +171,6 @@ public void shouldTimeoutIfScriptDoesNotInvokeCallback() {
172171

173172
@JavascriptEnabled
174173
@Test
175-
@Ignore(HTMLUNIT)
176174
public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithAZeroTimeout() {
177175
driver.get(pages.ajaxyPage);
178176
Throwable t = catchThrowable(
@@ -191,7 +189,6 @@ public void shouldNotTimeoutIfScriptCallsbackInsideAZeroTimeout() {
191189

192190
@JavascriptEnabled
193191
@Test
194-
@Ignore(HTMLUNIT)
195192
public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithLongTimeout() {
196193
driver.manage().timeouts().setScriptTimeout(500, TimeUnit.MILLISECONDS);
197194
driver.get(pages.ajaxyPage);

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import static org.junit.Assert.assertTrue;
2727
import static org.junit.Assume.assumeFalse;
2828
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
29-
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
3029
import static org.openqa.selenium.testing.Driver.IE;
3130
import static org.openqa.selenium.testing.Driver.MARIONETTE;
3231
import static org.openqa.selenium.testing.Driver.PHANTOMJS;
@@ -102,7 +101,6 @@ public void testShouldNotBeAbleToSubmitAFormThatDoesNotExist() {
102101
}
103102

104103
@Test
105-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
106104
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
107105
public void testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue() {
108106
driver.get(pages.javascriptPage);
@@ -113,7 +111,6 @@ public void testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue() {
113111
}
114112

115113
@Test
116-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
117114
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
118115
public void testSendKeysKeepsCapitalization() {
119116
driver.get(pages.javascriptPage);
@@ -147,7 +144,6 @@ public void testShouldSubmitAFormUsingTheEnterKey() {
147144
}
148145

149146
@Test
150-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
151147
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
152148
public void testShouldEnterDataIntoFormFields() {
153149
driver.get(pages.xhtmlTestPage);
@@ -166,7 +162,6 @@ public void testShouldEnterDataIntoFormFields() {
166162
@Test
167163
@Ignore(value = SAFARI, reason = "issue 4220")
168164
@Ignore(MARIONETTE)
169-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
170165
public void testShouldBeAbleToAlterTheContentsOfAFileUploadInputElement() throws IOException {
171166
driver.get(pages.formPage);
172167
WebElement uploadElement = driver.findElement(By.id("upload"));
@@ -184,7 +179,6 @@ public void testShouldBeAbleToAlterTheContentsOfAFileUploadInputElement() throws
184179
@Test
185180
@Ignore(value = SAFARI, reason = "issue 4220")
186181
@Ignore(MARIONETTE)
187-
@Ignore(HTMLUNIT)
188182
public void testShouldBeAbleToSendKeysToAFileUploadInputElementInAnXhtmlDocument()
189183
throws IOException {
190184
assumeFalse("IE before 9 doesn't handle pages served with an XHTML content type,"
@@ -229,7 +223,7 @@ public void testShouldBeAbleToUploadTheSameFileTwice() throws IOException {
229223
}
230224

231225
@Test
232-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
226+
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
233227
public void testSendingKeyboardEventsShouldAppendTextInInputs() {
234228
driver.get(pages.formPage);
235229
WebElement element = driver.findElement(By.id("working"));
@@ -243,7 +237,6 @@ public void testSendingKeyboardEventsShouldAppendTextInInputs() {
243237
}
244238

245239
@Test
246-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
247240
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
248241
public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue() {
249242
driver.get(pages.formPage);
@@ -255,7 +248,6 @@ public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue()
255248
}
256249

257250
@Test
258-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
259251
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
260252
public void testSendingKeyboardEventsShouldAppendTextInTextAreas() {
261253
driver.get(pages.formPage);
@@ -278,7 +270,6 @@ public void testEmptyTextBoxesShouldReturnAnEmptyStringNotNull() {
278270
@Ignore(PHANTOMJS)
279271
@Ignore(SAFARI)
280272
@Ignore(MARIONETTE)
281-
@Ignore(HTMLUNIT)
282273
public void handleFormWithJavascriptAction() {
283274
String url = appServer.whereIs("form_handling_js_submit.html");
284275
driver.get(url);
@@ -293,7 +284,6 @@ public void handleFormWithJavascriptAction() {
293284

294285
@Test
295286
@Ignore(SAFARI)
296-
@Ignore(HTMLUNIT)
297287
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
298288
public void testCanClickOnASubmitButton() {
299289
checkSubmitButton("internal_explicit_submit");
@@ -302,15 +292,13 @@ public void testCanClickOnASubmitButton() {
302292

303293
@Test
304294
@Ignore(SAFARI)
305-
@Ignore(HTMLUNIT)
306295
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
307296
public void testCanClickOnASubmitButtonNestedSpan() {
308297
checkSubmitButton("internal_span_submit");
309298
}
310299

311300
@Test
312301
@Ignore(SAFARI)
313-
@Ignore(HTMLUNIT)
314302
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
315303
public void testCanClickOnAnImplicitSubmitButton() {
316304
assumeFalse(isIe6(driver) || isIe7(driver) );
@@ -320,7 +308,6 @@ public void testCanClickOnAnImplicitSubmitButton() {
320308
@Test
321309
@Ignore(IE)
322310
@Ignore(SAFARI)
323-
@Ignore(HTMLUNIT)
324311
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
325312
public void testCanClickOnAnExternalSubmitButton() {
326313
checkSubmitButton("external_explicit_submit");
@@ -329,7 +316,6 @@ public void testCanClickOnAnExternalSubmitButton() {
329316
@Test
330317
@Ignore(IE)
331318
@Ignore(SAFARI)
332-
@Ignore(HTMLUNIT)
333319
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
334320
public void testCanClickOnAnExternalImplicitSubmitButton() {
335321
checkSubmitButton("external_implicit_submit");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ public void testShouldBeAbleToFindElementsInIframesByXPath() {
392392
}
393393

394394
@Test
395-
@Ignore(HTMLUNIT)
396395
@Ignore(IE)
397396
@Ignore(PHANTOMJS)
398397
@Ignore(SAFARI)
@@ -405,7 +404,6 @@ public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrl() {
405404
}
406405

407406
@Test
408-
@Ignore(HTMLUNIT)
409407
@Ignore(IE)
410408
@Ignore(PHANTOMJS)
411409
@Ignore(SAFARI)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public void testCn() {
6666
}
6767

6868
@Test
69-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
7069
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
7170
public void testEnteringHebrewTextFromLeftToRight() {
7271
driver.get(pages.chinesePage);
@@ -78,7 +77,6 @@ public void testEnteringHebrewTextFromLeftToRight() {
7877
}
7978

8079
@Test
81-
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
8280
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
8381
public void testEnteringHebrewTextFromRightToLeft() {
8482
driver.get(pages.chinesePage);
@@ -91,7 +89,6 @@ public void testEnteringHebrewTextFromRightToLeft() {
9189

9290
@Test
9391
@Ignore(value = MARIONETTE, reason = "Doesn't handle first codepoint correctly.")
94-
@Ignore(HTMLUNIT)
9592
@Ignore(value = CHROME, reason = "ChromeDriver only supports characters in the BMP")
9693
public void testEnteringSupplementaryCharacters() {
9794
assumeFalse("IE: versions less thank 10 have issue 5069",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ public void testShouldNotHangIfDocumentOpenCallIsNeverFollowedByDocumentCloseCal
425425
// if @NoDriverAfterTest can be removed from some other tests in this class.
426426
@NoDriverAfterTest
427427
@Test
428-
@Ignore(HTMLUNIT)
429428
@Ignore(PHANTOMJS)
430429
@Ignore(FIREFOX)
431430
@Ignore(value = SAFARI, reason = "issue 687, comment 41")

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ public void canConfigureManualHttpProxy() {
9999
}
100100

101101
@Test
102-
@Ignore(HTMLUNIT)
103102
@Ignore(SAFARI)
104103
@Ignore(PHANTOMJS)
105104
@NeedsLocalEnvironment
@@ -126,7 +125,6 @@ public void canConfigureProxyThroughPACFile() {
126125
}
127126

128127
@Test
129-
@Ignore(HTMLUNIT)
130128
@Ignore(SAFARI)
131129
@Ignore(PHANTOMJS)
132130
@NeedsLocalEnvironment

0 commit comments

Comments
 (0)