HtmlUnit: unignoring several tests that can work with JS off

Author: barancev

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

@@ -18,9 +18,9 @@
 package org.openqa.selenium;
 
 import org.junit.Test;
-import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
+import org.openqa.selenium.testing.NotYetImplemented;
 
 import static org.junit.Assert.assertEquals;
 import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
@@ -30,7 +30,7 @@ public class AtomsInjectionTest extends JUnit4TestBase {
   /** http://code.google.com/p/selenium/issues/detail?id=1333 */
   @JavascriptEnabled
   @Test
-  @Ignore({MARIONETTE})
+  @NotYetImplemented({MARIONETTE})
   public void testInjectingAtomShouldNotTrampleOnUnderscoreGlobal() {
     driver.get(pages.underscorePage);
     driver.findElement(By.tagName("body"));

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

@@ -21,6 +21,7 @@
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
+import org.openqa.selenium.testing.NotYetImplemented;
 
 import java.util.List;
 
@@ -153,7 +154,7 @@ public void testFindElementByLinkText() {
   }
 
   @Test
-  @Ignore(value = {MARIONETTE}, reason = "Marionette: https://bugzilla.mozilla.org/show_bug.cgi?id=1204496")
+  @NotYetImplemented(value = {MARIONETTE}, reason = "Marionette: https://bugzilla.mozilla.org/show_bug.cgi?id=1204496")
   public void testFindElementsByLinkTest() {
     driver.get(pages.nestedPage);
     WebElement element = driver.findElement(By.name("div1"));
@@ -204,7 +205,6 @@ public void testShouldFindChildrenByTagName() {
     assertEquals(2, elements.size());
   }
 
-  @JavascriptEnabled
   @Test
   public void testShouldBeAbleToFindAnElementByCssSelector() {
     driver.get(pages.nestedPage);
@@ -215,7 +215,6 @@ public void testShouldBeAbleToFindAnElementByCssSelector() {
     assertEquals("2", element.getAttribute("id"));
   }
 
-  @JavascriptEnabled
   @Test
   public void testShouldBeAbleToFindAnElementByCss3Selector() {
     driver.get(pages.nestedPage);
@@ -226,7 +225,6 @@ public void testShouldBeAbleToFindAnElementByCss3Selector() {
     assertEquals("2", element.getAttribute("id"));
   }
 
-  @JavascriptEnabled
   @Test
   public void testShouldBeAbleToFindElementsByCssSelector() {
     driver.get(pages.nestedPage);
@@ -291,7 +289,8 @@ public void testFindingByCssShouldNotIncludeParentElementIfSameTagType() {
     assertEquals("child", child.getAttribute("id"));
   }
 
-  @Ignore(value = {REMOTE, MARIONETTE}, reason = "Marionette: https://bugzilla.mozilla.org/show_bug.cgi?id=1204496")
+  @Ignore({REMOTE})
+  @NotYetImplemented(value = {MARIONETTE}, reason = "Marionette: https://bugzilla.mozilla.org/show_bug.cgi?id=1204496")
   @Test
   public void testFindMultipleElements() {
     driver.get(pages.simpleTestPage);
@@ -324,7 +323,7 @@ public void testLinkWithTrailingSpace() {
   }
 
   @Test
-  @Ignore(MARIONETTE)
+  @NotYetImplemented(MARIONETTE)
   public void testElementCanGetLinkByLinkTestIgnoringTrailingWhitespace() {
     driver.get(pages.simpleTestPage);
     WebElement elem = driver.findElement(By.id("links"));

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

@@ -18,7 +18,6 @@
 package org.openqa.selenium;
 
 import org.junit.Test;
-import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 
 import static org.junit.Assert.assertEquals;