Java: Escape spaces in the ID when translating "find elements by ID" to the W3C protocol.

Add tests for finding elements by IDs that contain spaces or other CSS special characters.

Author: juangj

common/src/web/nestedElements.html

@@ -5,6 +5,15 @@
   <div id="test_id_div">
   	<p id="test_id">inside</p>
   </div>
+  <div id="test_special_chars">
+    <p id="white space">space</p>
+    <p id="css#.chars">css escapes</p>
+  </div>
+  <div id="test_special_chars_2">
+    <p id="white space">second copy for testing plural findElements</p>
+    <p id="css#.chars">second copy</p>
+  </div>
+
 <form method="get" action="resultPage.html" name="form1" style="display: block">
     Here's a checkbox: <input type="checkbox" id="checky" name="checky" value="furrfu"/><br/>
     <select name="selectomatic" id="1">
@@ -152,4 +161,4 @@
   <span class="oneother">But not me</span>
 </div>
 </body>
-</html>
+</html>

java/client/src/org/openqa/selenium/remote/http/W3CHttpCommandCodec.java

@@ -342,7 +342,7 @@ private Map<String, String> asElement(Object id) {
   }
 
   private String cssEscape(String using) {
-    using = using.replaceAll("(['\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])", "\\\\$1");
+    using = using.replaceAll("([\\s'\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])", "\\\\$1");
     if (using.length() > 0 && Character.isDigit(using.charAt(0))) {
       using = "\\" + Integer.toString(30 + Integer.parseInt(using.substring(0,1))) + " " + using.substring(1);
     }

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

@@ -23,6 +23,8 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
+import static org.openqa.selenium.testing.Driver.CHROME;
+import static org.openqa.selenium.testing.Driver.IE;
 import static org.openqa.selenium.testing.Driver.REMOTE;
 
 import org.junit.Test;
@@ -122,6 +124,19 @@ public void testFindElementByIdWhenMultipleMatchesExist() {
     assertThat(child.getText(), is("inside"));
   }
 
+  @Ignore(
+      value = {CHROME, IE},
+      reason = "Need to recompile drivers with atoms from 6c55320d3f0eb23de56270a55c74602fc8d63c8a")
+  @Test
+  public void testFindElementByIdWhenIdContainsNonAlphanumericCharacters() {
+    driver.get(pages.nestedPage);
+    WebElement element = driver.findElement(By.id("test_special_chars"));
+    WebElement childWithSpaces = element.findElement(By.id("white space"));
+    assertThat(childWithSpaces.getText(), is("space"));
+    WebElement childWithCssChars = element.findElement(By.id("css#.chars"));
+    assertThat(childWithCssChars.getText(), is("css escapes"));
+  }
+
   @Test
   public void testFindElementByIdWhenNoMatchInContext() {
     driver.get(pages.nestedPage);
@@ -142,6 +157,19 @@ public void testFindElementsById() {
     assertThat(children.size(), is(2));
   }
 
+  @Ignore(
+      value = {CHROME, IE},
+      reason = "Need to recompile drivers with atoms from 6c55320d3f0eb23de56270a55c74602fc8d63c8a")
+  @Test
+  public void testFindElementsByIdWithNonAlphanumericCharacters() {
+    driver.get(pages.nestedPage);
+    WebElement element = driver.findElement(By.id("test_special_chars"));
+    List<WebElement> children = element.findElements(By.id("white space"));
+    assertThat(children.size(), is(1));
+    List<WebElement> children2 = element.findElements(By.id("css#.chars"));
+    assertThat(children2.size(), is(1));
+  }
+
   @Test
   public void testFindElementByLinkText() {
     driver.get(pages.nestedPage);

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

@@ -62,6 +62,18 @@ public void testShouldBeAbleToFindASingleElementByNumericId() {
     assertThat(element.getAttribute("id"), is("2"));
   }
 
+  @Ignore(
+      value = {CHROME, IE},
+      reason = "Need to recompile drivers with atoms from 6c55320d3f0eb23de56270a55c74602fc8d63c8a")
+  @Test
+  public void testShouldBeAbleToFindASingleElementByIdWithNonAlphanumericCharacters() {
+    driver.get(pages.nestedPage);
+    WebElement element = driver.findElement(By.id("white space"));
+    assertThat(element.getText(), is("space"));
+    WebElement element2 = driver.findElement(By.id("css#.chars"));
+    assertThat(element2.getText(), is("css escapes"));
+  }
+
   @Test
   public void testShouldBeAbleToFindMultipleElementsById() {
     driver.get(pages.nestedPage);
@@ -76,6 +88,18 @@ public void testShouldBeAbleToFindMultipleElementsByNumericId() {
     assertThat(elements.size(), is(8));
   }
 
+  @Ignore(
+      value = {CHROME, IE},
+      reason = "Need to recompile drivers with atoms from 6c55320d3f0eb23de56270a55c74602fc8d63c8a")
+  @Test
+  public void testShouldBeAbleToFindMultipleElementsByIdWithNonAlphanumericCharacters() {
+    driver.get(pages.nestedPage);
+    List<WebElement> elements = driver.findElements(By.id("white space"));
+    assertThat(elements.size(), is(2));
+    List<WebElement> elements2 = driver.findElements(By.id("css#.chars"));
+    assertThat(elements2.size(), is(2));
+  }
+
   // By.id negative
 
   @Test(expected = NoSuchElementException.class)