Allow locator strategy of xpath= for matching xpath keywords.

CHANGES.rst

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+1.8 (unreleased)
+----------------
+- Allow xpath= locator strategy for mmatching xpath keywords [emanlove]
+
 1.7.4
 -------------------
 - Reverted 'Press Keys' because of backwards incompatible changes [zephraph]

src/Selenium2Library/keywords/_element.py

@@ -602,41 +602,54 @@ def page_should_not_contain_image(self, locator, message='', loglevel='INFO'):
     def get_matching_xpath_count(self, xpath):
         """Returns number of elements matching `xpath`
 
-        One should not use the xpath= prefix for 'xpath'. XPath is assumed.
+        As of release 1.8 `Get Matching Xpath Count` allows the
+        argument `xpath` to start with the xpath= locator strategy.
 
-        Correct:
+        Example:
         | count = | Get Matching Xpath Count | //div[@id='sales-pop']
-        Incorrect:
         | count = | Get Matching Xpath Count | xpath=//div[@id='sales-pop']
 
         If you wish to assert the number of matching elements, use
         `Xpath Should Match X Times`.
         """
-        count = len(self._element_find("xpath=" + xpath, False, False))
-        return str(count)
+        if xpath.startswith('//'):
+            xpath = "xpath=" + xpath
+
+        if xpath.startswith('xpath='):
+            count = len(self._element_find(xpath, False, False))
+            return str(count)
+        else:
+            raise ValueError("Element locator must be xpath and start with xpath= or //")
 
-    def xpath_should_match_x_times(self, xpath, expected_xpath_count, message='', loglevel='INFO'):
-        """Verifies that the page contains the given number of elements located by the given `xpath`.
+    def xpath_should_match_x_times(self, locator, expected_xpath_count, message='', loglevel='INFO'):
+        """Verifies that the page contains the given number of elements located by the given `locator`.
 
-        One should not use the xpath= prefix for 'xpath'. XPath is assumed.
+        As of release 1.8 `Xpath Should Match X Times` allows the
+        argument `locator` to start with the xpath= locator strategy.
 
-        Correct:
+        Example:
         | Xpath Should Match X Times | //div[@id='sales-pop'] | 1
-        Incorrect:
         | Xpath Should Match X Times | xpath=//div[@id='sales-pop'] | 1
 
         See `Page Should Contain Element` for explanation about `message` and
         `loglevel` arguments.
         """
-        actual_xpath_count = len(self._element_find("xpath=" + xpath, False, False))
+        if locator.startswith('//'):
+            locator = "xpath=" + locator
+
+        if locator.startswith('xpath='):
+            actual_xpath_count = len(self._element_find(locator, False, False))
+        else:
+            raise ValueError("Element locator must be xpath and start with xpath= or //")
+
         if int(actual_xpath_count) != int(expected_xpath_count):
             if not message:
                 message = "Xpath %s should have matched %s times but matched %s times"\
-                            %(xpath, expected_xpath_count, actual_xpath_count)
+                            %(locator, expected_xpath_count, actual_xpath_count)
             self.log_source(loglevel)
             raise AssertionError(message)
         self._info("Current page contains %s elements matching '%s'."
-                   % (actual_xpath_count, xpath))
+                   % (actual_xpath_count, locator))
 
     # Public, custom
     def add_location_strategy(self, strategy_name, strategy_keyword, persist=False):

test/acceptance/keywords/content_assertions.robot

@@ -319,8 +319,12 @@ Xpath Should Match X Times
     [Setup]    Go To Page "forms/login.html"
     Xpath Should Match X Times    //input[@type="text"]    1
     Xpath Should Match X Times    //input[@type="text"]    ${1}
+    Xpath Should Match X Times    xpath=//input[@type="text"]    ${1}
     Run Keyword And Expect Error
-    ...    Xpath //input[@type="text"] should have matched 2 times but matched 1 times
+    ...    ValueError: Element locator must be xpath and start with xpath= or // 
+    ...    Xpath Should Match X Times    id=//input[@type="text"]    2
+    Run Keyword And Expect Error
+    ...    Xpath xpath=//input[@type="text"] should have matched 2 times but matched 1 times
     ...    Xpath Should Match X Times    //input[@type="text"]    2
 
 Locator Should Match X Times

test/acceptance/keywords/elements.robot

@@ -53,6 +53,8 @@ Get Matching XPath Count
     [Documentation]    Get Matching XPath Count
     ${count}=    Get Matching XPath Count    //a
     Should Be Equal    ${count}    19
+    ${count}=    Get Matching XPath Count    xpath=//a
+    Should Be Equal    ${count}    19
     ${count}=    Get Matching XPath Count    //div[@id="first_div"]/a
     Should Be Equal    ${count}    2