Skip to content

Commit

Permalink
Unignoring passed (locally) htmlunit tests and ignoring failed (on tr…
Browse files Browse the repository at this point in the history
…avis) marionette tests
  • Loading branch information
barancev committed Apr 6, 2017
1 parent eb0c0af commit 860ded4
Show file tree
Hide file tree
Showing 18 changed files with 5 additions and 68 deletions.
1 change: 0 additions & 1 deletion java/client/test/org/openqa/selenium/AlertsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,6 @@ public void testIncludesAlertTextInUnhandledAlertException() {

@NoDriverAfterTest
@Test
@Ignore(HTMLUNIT)
public void testCanQuitWhenAnAlertIsPresent() {
driver.get(pages.alertsPage);
driver.findElement(By.id("alert")).click();
Expand Down
6 changes: 0 additions & 6 deletions java/client/test/org/openqa/selenium/ContentEditableTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assume.assumeFalse;
import static org.openqa.selenium.testing.Driver.CHROME;
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
import static org.openqa.selenium.testing.Driver.IE;
import static org.openqa.selenium.testing.Driver.MARIONETTE;
import static org.openqa.selenium.testing.Driver.SAFARI;
Expand All @@ -35,7 +34,6 @@
import org.openqa.selenium.testing.Ignore;
import org.openqa.selenium.testing.JUnit4TestBase;
import org.openqa.selenium.testing.JavascriptEnabled;
import org.openqa.selenium.testing.NotYetImplemented;

public class ContentEditableTest extends JUnit4TestBase {

Expand Down Expand Up @@ -87,7 +85,6 @@ public void testNonPrintableCharactersShouldWorkWithContentEditableOrDesignModeS

@Test
@Ignore(value = SAFARI, reason = "cannot type on contentEditable with synthetic events, issue 3127")
@Ignore(HTMLUNIT)
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
driver.get(pages.readOnlyPage);
Expand All @@ -102,7 +99,6 @@ public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
@Ignore(CHROME)
@Ignore(IE)
@Ignore(SAFARI)
@Ignore(HTMLUNIT)
@Ignore(MARIONETTE)
public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue() {
driver.get(pages.readOnlyPage);
Expand All @@ -117,7 +113,6 @@ public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue()
@Test
@Ignore(IE)
@Ignore(value = SAFARI, reason = "cannot type on contentEditable with synthetic events, issue 3127")
@Ignore(HTMLUNIT)
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testShouldBeAbleToTypeIntoTinyMCE() {
driver.get(appServer.whereIs("tinymce.html"));
Expand All @@ -135,7 +130,6 @@ public void testShouldBeAbleToTypeIntoTinyMCE() {
@Ignore(CHROME)
@Ignore(IE)
@Ignore(value = SAFARI, reason = "cannot type on contentEditable with synthetic events, issue 3127")
@Ignore(HTMLUNIT)
@Ignore(MARIONETTE)
public void testShouldAppendToTinyMCE() {
driver.get(appServer.whereIs("tinymce.html"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ public void testShouldEmitOnClickEventsWhenSelectingElements() {
@JavascriptEnabled
@Test
@Ignore(value = IE, reason = "Only fires the onchange event when the checkbox loses the focus")
@Ignore(value = HTMLUNIT, reason = "HtmlUnit: default mode is IE8 now")
public void testShouldEmitOnChangeEventsWhenChangingTheStateOfACheckbox() {
driver.get(pages.javascriptPage);
WebElement checkbox = driver.findElement(By.id("checkbox"));
Expand Down Expand Up @@ -385,7 +384,6 @@ public void testSubmittingFormFromFormInputTextElementShouldFireOnSubmitForThatF
@Test
@Ignore(value = SAFARI, reason = "Does not yet support file uploads, issue 4220")
@Ignore(MARIONETTE)
@Ignore(HTMLUNIT)
public void testUploadingFileShouldFireOnChangeEvent() throws IOException {
driver.get(pages.formPage);
WebElement uploadElement = driver.findElement(By.id("upload"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
import static org.openqa.selenium.testing.Driver.MARIONETTE;
import static org.openqa.selenium.testing.TestUtilities.catchThrowable;

Expand Down Expand Up @@ -319,7 +318,6 @@ public void testGetAttributeDoesNotReturnAnObjectForSvgProperties() {
}

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

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

@Test
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testCanRetrieveTheCurrentValueOfATextFormField_textArea() {
driver.get(pages.formPage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ public void shouldBeAbleToReturnArraysOfWebElementsFromAsyncScripts() {

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

@JavascriptEnabled
@Test
@Ignore(HTMLUNIT)
public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithAZeroTimeout() {
driver.get(pages.ajaxyPage);
Throwable t = catchThrowable(
Expand All @@ -191,7 +189,6 @@ public void shouldNotTimeoutIfScriptCallsbackInsideAZeroTimeout() {

@JavascriptEnabled
@Test
@Ignore(HTMLUNIT)
public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithLongTimeout() {
driver.manage().timeouts().setScriptTimeout(500, TimeUnit.MILLISECONDS);
driver.get(pages.ajaxyPage);
Expand Down
16 changes: 1 addition & 15 deletions java/client/test/org/openqa/selenium/FormHandlingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
import static org.openqa.selenium.testing.Driver.IE;
import static org.openqa.selenium.testing.Driver.MARIONETTE;
import static org.openqa.selenium.testing.Driver.PHANTOMJS;
Expand Down Expand Up @@ -102,7 +101,6 @@ public void testShouldNotBeAbleToSubmitAFormThatDoesNotExist() {
}

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

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

@Test
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testShouldEnterDataIntoFormFields() {
driver.get(pages.xhtmlTestPage);
Expand All @@ -166,7 +162,6 @@ public void testShouldEnterDataIntoFormFields() {
@Test
@Ignore(value = SAFARI, reason = "issue 4220")
@Ignore(MARIONETTE)
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
public void testShouldBeAbleToAlterTheContentsOfAFileUploadInputElement() throws IOException {
driver.get(pages.formPage);
WebElement uploadElement = driver.findElement(By.id("upload"));
Expand All @@ -184,7 +179,6 @@ public void testShouldBeAbleToAlterTheContentsOfAFileUploadInputElement() throws
@Test
@Ignore(value = SAFARI, reason = "issue 4220")
@Ignore(MARIONETTE)
@Ignore(HTMLUNIT)
public void testShouldBeAbleToSendKeysToAFileUploadInputElementInAnXhtmlDocument()
throws IOException {
assumeFalse("IE before 9 doesn't handle pages served with an XHTML content type,"
Expand Down Expand Up @@ -229,7 +223,7 @@ public void testShouldBeAbleToUploadTheSameFileTwice() throws IOException {
}

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

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

@Test
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testSendingKeyboardEventsShouldAppendTextInTextAreas() {
driver.get(pages.formPage);
Expand All @@ -278,7 +270,6 @@ public void testEmptyTextBoxesShouldReturnAnEmptyStringNotNull() {
@Ignore(PHANTOMJS)
@Ignore(SAFARI)
@Ignore(MARIONETTE)
@Ignore(HTMLUNIT)
public void handleFormWithJavascriptAction() {
String url = appServer.whereIs("form_handling_js_submit.html");
driver.get(url);
Expand All @@ -293,7 +284,6 @@ public void handleFormWithJavascriptAction() {

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

@Test
@Ignore(SAFARI)
@Ignore(HTMLUNIT)
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testCanClickOnASubmitButtonNestedSpan() {
checkSubmitButton("internal_span_submit");
}

@Test
@Ignore(SAFARI)
@Ignore(HTMLUNIT)
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testCanClickOnAnImplicitSubmitButton() {
assumeFalse(isIe6(driver) || isIe7(driver) );
Expand All @@ -320,7 +308,6 @@ public void testCanClickOnAnImplicitSubmitButton() {
@Test
@Ignore(IE)
@Ignore(SAFARI)
@Ignore(HTMLUNIT)
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testCanClickOnAnExternalSubmitButton() {
checkSubmitButton("external_explicit_submit");
Expand All @@ -329,7 +316,6 @@ public void testCanClickOnAnExternalSubmitButton() {
@Test
@Ignore(IE)
@Ignore(SAFARI)
@Ignore(HTMLUNIT)
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testCanClickOnAnExternalImplicitSubmitButton() {
checkSubmitButton("external_implicit_submit");
Expand Down
2 changes: 0 additions & 2 deletions java/client/test/org/openqa/selenium/FrameSwitchingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@ public void testShouldBeAbleToFindElementsInIframesByXPath() {
}

@Test
@Ignore(HTMLUNIT)
@Ignore(IE)
@Ignore(PHANTOMJS)
@Ignore(SAFARI)
Expand All @@ -405,7 +404,6 @@ public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrl() {
}

@Test
@Ignore(HTMLUNIT)
@Ignore(IE)
@Ignore(PHANTOMJS)
@Ignore(SAFARI)
Expand Down
3 changes: 0 additions & 3 deletions java/client/test/org/openqa/selenium/I18nTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public void testCn() {
}

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

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

@Test
@Ignore(value = MARIONETTE, reason = "Doesn't handle first codepoint correctly.")
@Ignore(HTMLUNIT)
@Ignore(value = CHROME, reason = "ChromeDriver only supports characters in the BMP")
public void testEnteringSupplementaryCharacters() {
assumeFalse("IE: versions less thank 10 have issue 5069",
Expand Down
1 change: 0 additions & 1 deletion java/client/test/org/openqa/selenium/PageLoadingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,6 @@ public void testShouldNotHangIfDocumentOpenCallIsNeverFollowedByDocumentCloseCal
// if @NoDriverAfterTest can be removed from some other tests in this class.
@NoDriverAfterTest
@Test
@Ignore(HTMLUNIT)
@Ignore(PHANTOMJS)
@Ignore(FIREFOX)
@Ignore(value = SAFARI, reason = "issue 687, comment 41")
Expand Down
2 changes: 0 additions & 2 deletions java/client/test/org/openqa/selenium/ProxySettingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ public void canConfigureManualHttpProxy() {
}

@Test
@Ignore(HTMLUNIT)
@Ignore(SAFARI)
@Ignore(PHANTOMJS)
@NeedsLocalEnvironment
Expand All @@ -126,7 +125,6 @@ public void canConfigureProxyThroughPACFile() {
}

@Test
@Ignore(HTMLUNIT)
@Ignore(SAFARI)
@Ignore(PHANTOMJS)
@NeedsLocalEnvironment
Expand Down
7 changes: 0 additions & 7 deletions java/client/test/org/openqa/selenium/ReferrerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ public static void readPages() throws IOException {
* does not have a proxy configured.
*/
@Test
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
@NeedsLocalEnvironment
public void basicHistoryNavigationWithoutAProxy() {
testServer1.start();
Expand All @@ -143,7 +142,6 @@ public void basicHistoryNavigationWithoutAProxy() {
* Tests navigation across multiple domains when the browser does not have a proxy configured.
*/
@Test
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
@NeedsLocalEnvironment
public void crossDomainHistoryNavigationWithoutAProxy() {

Expand Down Expand Up @@ -174,7 +172,6 @@ public void crossDomainHistoryNavigationWithoutAProxy() {
* configured to use a proxy that permits direct access to that domain.
*/
@Test
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
@NeedsLocalEnvironment
public void basicHistoryNavigationWithADirectProxy() {
testServer1.start();
Expand Down Expand Up @@ -203,7 +200,6 @@ public void basicHistoryNavigationWithADirectProxy() {
* permits direct access to those domains.
*/
@Test
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
@NeedsLocalEnvironment
public void crossDomainHistoryNavigationWithADirectProxy() {
testServer1.start();
Expand Down Expand Up @@ -238,7 +234,6 @@ public void crossDomainHistoryNavigationWithADirectProxy() {
* redirects the second domain to another host.
*/
@Test
@Ignore(HTMLUNIT)
@Ignore(MARIONETTE)
@NeedsLocalEnvironment
public void crossDomainHistoryNavigationWithAProxiedHost() {
Expand Down Expand Up @@ -279,7 +274,6 @@ public void crossDomainHistoryNavigationWithAProxiedHost() {
* to connect directly to the target server.
*/
@Test
@Ignore(HTMLUNIT)
@Ignore(MARIONETTE)
@NeedsLocalEnvironment
public void crossDomainHistoryNavigationWhenProxyInterceptsHostRequests() {
Expand Down Expand Up @@ -319,7 +313,6 @@ public void crossDomainHistoryNavigationWhenProxyInterceptsHostRequests() {
@Test
@Ignore(value = IE,
reason = "IEDriver does not disable automatic proxy caching, causing this test to fail, issue 6629")
@Ignore(HTMLUNIT)
@Ignore(MARIONETTE)
@Ignore(value = FIREFOX, travis=true)
@NeedsLocalEnvironment
Expand Down
2 changes: 0 additions & 2 deletions java/client/test/org/openqa/selenium/TextHandlingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ public void testShouldRetainTheFormatingOfTextWithinAPreElementThatIsWithinARegu

@Test
@Ignore(value = IE, reason = "IE: inserts \r\n instead of \n")
@Ignore(HTMLUNIT)
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea() {
driver.get(pages.formPage);
Expand All @@ -209,7 +208,6 @@ public void testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea() {
}

@Test
@Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
public void testShouldBeAbleToEnterDatesAfterFillingInOtherValuesFirst() {
driver.get(pages.formPage);
Expand Down
Loading

0 comments on commit 860ded4

Please sign in to comment.