Escaping "bad chars" and a digit char in the beginning of id or class in css selector

Author: barancev

java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -389,19 +389,27 @@ protected List<WebElement> findElements(String by, String using) {
     return allElements;
   }
 
+  static String cssEscape(String using) {
+    using = using.replaceAll("(['\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])", "\\$1");
+    if (using.length() > 0 && Character.isDigit(using.charAt(0))) {
+      using = "\\" + Integer.toString(30 + Integer.parseInt(using.substring(0,1))) + " " + using.substring(1);
+    }
+    return using;
+  }
+
   public WebElement findElementById(String using) {
     if (getW3CStandardComplianceLevel() == 0) {
       return findElement("id", using);
     } else {
-      return findElementByCssSelector("#" + using);
+      return findElementByCssSelector("#" + cssEscape(using));
     }
   }
 
   public List<WebElement> findElementsById(String using) {
     if (getW3CStandardComplianceLevel() == 0) {
       return findElements("id", using);
     } else {
-      return findElementsByCssSelector("#" + using);
+      return findElementsByCssSelector("#" + cssEscape(using));
     }
   }
 
@@ -441,31 +449,31 @@ public WebElement findElementByName(String using) {
     if (getW3CStandardComplianceLevel() == 0) {
       return findElement("name", using);
     } else {
-      return findElementByCssSelector("*[name=" + using + "]");
+      return findElementByCssSelector("*[name='" + using + "']");
     }
   }
 
   public List<WebElement> findElementsByName(String using) {
     if (getW3CStandardComplianceLevel() == 0) {
       return findElements("name", using);
     } else {
-      return findElementsByCssSelector("*[name=" + using + "]");
+      return findElementsByCssSelector("*[name='" + using + "']");
     }
   }
 
   public WebElement findElementByClassName(String using) {
     if (getW3CStandardComplianceLevel() == 0) {
       return findElement("class name", using);
     } else {
-      return findElementByCssSelector("." + using);
+      return findElementByCssSelector("." + cssEscape(using));
     }
   }
 
   public List<WebElement> findElementsByClassName(String using) {
     if (getW3CStandardComplianceLevel() == 0) {
       return findElements("class name", using);
     } else {
-      return findElementsByCssSelector("." + using);
+      return findElementsByCssSelector("." + cssEscape(using));
     }
   }
 

java/client/src/org/openqa/selenium/remote/RemoteWebElement.java

@@ -228,15 +228,15 @@ public WebElement findElementById(String using) {
     if (parent.getW3CStandardComplianceLevel() == 0) {
       return findElement("id", using);
     } else {
-      return findElementByCssSelector("#" + using);
+      return findElementByCssSelector("#" + RemoteWebDriver.cssEscape(using));
     }
   }
 
   public List<WebElement> findElementsById(String using) {
     if (parent.getW3CStandardComplianceLevel() == 0) {
       return findElements("id", using);
     } else {
-      return findElementsByCssSelector("#" + using);
+      return findElementsByCssSelector("#" + RemoteWebDriver.cssEscape(using));
     }
   }
 
@@ -252,31 +252,31 @@ public WebElement findElementByName(String using) {
     if (parent.getW3CStandardComplianceLevel() == 0) {
       return findElement("name", using);
     } else {
-      return findElementByCssSelector("*[name=" + using + "]");
+      return findElementByCssSelector("*[name='" + using + "']");
     }
   }
 
   public List<WebElement> findElementsByName(String using) {
     if (parent.getW3CStandardComplianceLevel() == 0) {
       return findElements("name", using);
     } else {
-      return findElementsByCssSelector("*[name=" + using + "]");
+      return findElementsByCssSelector("*[name='" + using + "']");
     }
   }
 
   public WebElement findElementByClassName(String using) {
     if (parent.getW3CStandardComplianceLevel() == 0) {
       return findElement("class name", using);
     } else {
-      return findElementByCssSelector("." + using);
+      return findElementByCssSelector("." + RemoteWebDriver.cssEscape(using));
     }
   }
 
   public List<WebElement> findElementsByClassName(String using) {
     if (parent.getW3CStandardComplianceLevel() == 0) {
       return findElements("class name", using);
     } else {
-      return findElementsByCssSelector("." + using);
+      return findElementsByCssSelector("." + RemoteWebDriver.cssEscape(using));
     }
   }
 

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

@@ -109,7 +109,6 @@ public void testFindElementsByName() {
   }
 
   @Test
-  @Ignore(MARIONETTE)
   public void testFindElementById() {
     driver.get(pages.nestedPage);
     WebElement element = driver.findElement(By.name("form2"));
@@ -138,7 +137,6 @@ public void testFindElementByIdWhenNoMatchInContext() {
   }
 
   @Test
-  @Ignore(MARIONETTE)
   public void testFindElementsById() {
     driver.get(pages.nestedPage);
     WebElement element = driver.findElement(By.name("form2"));

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

@@ -55,7 +55,6 @@ public void testShouldBeAbleToFindASingleElementById() {
   }
 
   @Test
-  @Ignore(MARIONETTE)
   public void testShouldBeAbleToFindASingleElementByNumericId() {
     driver.get(pages.nestedPage);
     WebElement element = driver.findElement(By.id("2"));
@@ -70,7 +69,6 @@ public void testShouldBeAbleToFindMultipleElementsById() {
   }
 
   @Test
-  @Ignore(MARIONETTE)
   public void testShouldBeAbleToFindMultipleElementsByNumericId() {
     driver.get(pages.nestedPage);
     List<WebElement> elements = driver.findElements(By.id("2"));