Escape special chars in slector

dtmilano · dtmilano · commit dd7d46045dff · 2016-02-14T02:25:42.000-05:00
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '11.4.1'
+__version__ = '11.5.0'
 
 import os
 import subprocess
@@ -238,6 +238,8 @@ def findObject(self, **kwargs):
             raise RuntimeError('findObject: resourceId or selector must have a value')
         response = self.__httpCommand('/UiDevice/findObject', params)
         # { "status": "OK", "oid": 1, "className": "android.view.View"}
+        if DEBUG:
+            print >> sys.stderr, "UiAutomatorHelper: findObject: response=", response
         r = json.loads(response)
         if r[u'status'] == 'OK':
             if DEBUG:
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -950,18 +950,22 @@ def touch(self, eventType=adbclient.DOWN_AND_UP, deltaX=0, deltaY=0):
             else:
                 self.device.touch(x, y, eventType=eventType)
 
+    def escapeSelectorChars(self, selector):
+        _s = selector.replace('@', '\\@')
+        return _s
+
     def obtainSelectorForView(self):
         selector = ''
         if self.getContentDescription():
-            selector += 'desc@' + self.getContentDescription()
+            selector += 'desc@' + self.escapeSelectorChars(self.getContentDescription())
         if self.getText():
             if selector:
                 selector += ','
-            selector += 'text@' + self.getText()
+            selector += 'text@' + self.escapeSelectorChars(self.getText())
         if self.getId():
             if selector:
                 selector += ','
-            selector += 'res@' + self.getId()
+            selector += 'res@' + self.escapeSelectorChars(self.getId())
         return selector
 
     def longTouch(self, duration=2000):
