Test escape_xpath_value

aaltat · aaltat · commit 59a68ace6dd4 · 2020-09-11T00:07:35.000+03:00
diff --git a/src/SeleniumLibrary/utils/__init__.py b/src/SeleniumLibrary/utils/__init__.py
@@ -23,7 +23,8 @@
 def escape_xpath_value(value):
     if '"' in value and "'" in value:
         parts_wo_apos = value.split("'")
-        return "concat('%s')" % "', \"'\", '".join(parts_wo_apos)
+        escaped = "', \"'\", '".join(parts_wo_apos)
+        return f"concat('{escaped}')"
     if "'" in value:
-        return '"%s"' % value
-    return "'%s'" % value
+        return f'"{value}"'
+    return f"'{value}'"
diff --git a/utest/test/utils/test_xpath_escape.py b/utest/test/utils/test_xpath_escape.py
@@ -0,0 +1,35 @@
+import os
+
+import pytest
+from approvaltests.approvals import verify_all
+from approvaltests.reporters.generic_diff_reporter_factory import (
+    GenericDiffReporterFactory,
+)
+from robot.utils import WINDOWS
+
+from SeleniumLibrary.utils import escape_xpath_value
+
+
+@pytest.fixture(scope="module")
+def reporter():
+    path = os.path.dirname(__file__)
+    reporter_json = os.path.abspath(
+        os.path.join(path, "..", "approvals_reporters.json")
+    )
+    factory = GenericDiffReporterFactory()
+    factory.load(reporter_json)
+    return factory.get_first_working()
+
+
+@pytest.mark.skipif(WINDOWS, reason="ApprovalTest do not support different line feeds")
+def test_string(reporter):
+    results = []
+    results.append(escape_xpath_value("tidii"))
+    results.append(escape_xpath_value('"tidii"'))
+    results.append(escape_xpath_value("'tidii'"))
+    results.append(escape_xpath_value("\"'tidii'"))
+    results.append(escape_xpath_value("\"'tidii'\""))
+    results.append(escape_xpath_value("\"'t\"id\"ii'\""))
+    results.append(escape_xpath_value('"\'tidii\'"'))
+    results.append(escape_xpath_value('"\'ti\'d\'ii\'"'))
+    verify_all("Escape xpath value", results, reporter=reporter)
diff --git a/utest/test/utils/test_xpath_escape.test_string.approved.txt b/utest/test/utils/test_xpath_escape.test_string.approved.txt
@@ -0,0 +1,10 @@
+Escape xpath value
+
+0) 'tidii'
+1) '"tidii"'
+2) "'tidii'"
+3) concat('"', "'", 'tidii', "'", '')
+4) concat('"', "'", 'tidii', "'", '"')
+5) concat('"', "'", 't"id"ii', "'", '"')
+6) concat('"', "'", 'tidii', "'", '"')
+7) concat('"', "'", 'ti', "'", 'd', "'", 'ii', "'", '"')
