1) Unignoring tests that are implemented in HtmlUnit 2.20

2) Explicitly ignoring HTML5 tests in HtmlUnit because it defines itself as FF38 now.
SeleniumHQ · Mar 2, 2016 · d450727 · d450727
1 parent eeecc29
commit d450727
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 9 deletions.
diff --git a/java/client/test/org/openqa/selenium/ElementFindingTest.java b/java/client/test/org/openqa/selenium/ElementFindingTest.java
@@ -22,7 +22,6 @@
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
 import org.openqa.selenium.testing.NeedsFreshDriver;
-import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.SwitchToTopAfterTest;
 import org.openqa.selenium.testing.TestUtilities;
 
@@ -34,7 +33,6 @@
 import static org.junit.Assert.fail;
 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.REMOTE;
@@ -399,7 +397,6 @@ public void testFindingALinkByXpathUsingContainsKeywordShouldWork() {
   }
 
   @Ignore({IE, MARIONETTE, SAFARI})
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void testShouldBeAbleToFindElementByXPathWithNamespace() {
     driver.get(pages.svgPage);

diff --git a/java/client/test/org/openqa/selenium/FormHandlingTest.java b/java/client/test/org/openqa/selenium/FormHandlingTest.java
@@ -37,7 +37,6 @@
 import org.junit.Test;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
-import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.TestUtilities;
 
 import java.io.File;
@@ -296,15 +295,13 @@ public void testCanClickOnAnImplicitSubmitButton() {
 
   @Ignore(value = {IE, SAFARI},
           reason = "IE: failed; Others: untested")
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void testCanClickOnAnExternalSubmitButton() {
     checkSubmitButton("external_explicit_submit");
   }
 
   @Ignore(value = {IE, SAFARI},
       reason = "IE: failed; Others: untested")
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void testCanClickOnAnExternalImplicitSubmitButton() {
     checkSubmitButton("external_implicit_submit");

diff --git a/java/client/test/org/openqa/selenium/TextHandlingTest.java b/java/client/test/org/openqa/selenium/TextHandlingTest.java
@@ -243,7 +243,6 @@ public void testShouldReturnEmptyStringWhenTagIsSelfClosing() {
     assertThat(text, equalTo(""));
   }
 
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void testShouldNotTrimSpacesWhenLineWraps() {
     driver.get(pages.simpleTestPage);

diff --git a/java/client/test/org/openqa/selenium/VisibilityTest.java b/java/client/test/org/openqa/selenium/VisibilityTest.java
@@ -263,7 +263,6 @@ public void tooSmallAWindowWithOverflowHiddenIsNotAProblem() {
 
   @Test
   @Ignore(IE)
-  @NotYetImplemented(HTMLUNIT)
   public void shouldShowElementNotVisibleWithHiddenAttribute() {
     String url = appServer.whereIs("hidden.html");
     driver.get(url);

diff --git a/java/client/test/org/openqa/selenium/html5/Html5CapabilitiesTest.java b/java/client/test/org/openqa/selenium/html5/Html5CapabilitiesTest.java
@@ -25,6 +25,7 @@
 import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_LOCATION_CONTEXT;
 import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_SQL_DATABASE;
 import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_WEB_STORAGE;
+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;
@@ -42,7 +43,7 @@
 import org.openqa.selenium.testing.TestUtilities;
 import org.openqa.selenium.testing.drivers.WebDriverBuilder;
 
-@Ignore({IE, SAFARI, MARIONETTE})
+@Ignore({HTMLUNIT, IE, SAFARI, MARIONETTE})
 public class Html5CapabilitiesTest extends JUnit4TestBase {
 
   private WebDriver localDriver;

diff --git a/third_party/java/htmlunit/htmlunit-driver-2.20.0-SNAPSHOT-sources.jar b/third_party/java/htmlunit/htmlunit-driver-2.20.0-SNAPSHOT-sources.jar