Use 'resource-id' value if available.

dtmilano · dtmilano · commit 68d3f85e17ff · 2014-03-16T18:47:26.000-04:00
- Version 5.3.0
- resource-id provides a more descriptive id if available, compared to
uinqueId
diff --git a/AndroidViewClient/setup.py b/AndroidViewClient/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-    version='5.2.0',
+    version='5.3.0',
     description='''AndroidViewClient is a 100% pure python tool that
         simplifies test script creation providing higher level operations and the ability of
         obtaining the tree of Views present at any given moment on the device or emulator screen.
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '5.2.0'
+__version__ = '5.3.0'
 
 import sys
 import warnings
@@ -444,6 +444,11 @@ def getId(self):
         @see: L{getUniqueId()}
         '''
 
+        try:
+            return self.map['resource-id']
+        except:
+            pass
+
         try:
             return self.map[self.idProperty]
         except:
@@ -877,13 +882,18 @@ def isClickable(self):
         return self.__getattr__('isClickable')()
 
     def variableNameFromId(self):
-        m = ID_RE.match(self.getUniqueId())
-        if m:
-            var = m.group(1)
-            if m.group(3):
-                var += m.group(3)
-            if re.match('^\d', var):
-                var = 'id_' + var
+        _id = self.getId()
+        if _id:
+            var = _id.replace('.', '_').replace(':', '___').replace('/', '_')
+        else:
+            _id = self.getUniqueId()
+            m = ID_RE.match(_id)
+            if m:
+                var = m.group(1)
+                if m.group(3):
+                    var += m.group(3)
+                if re.match('^\d', var):
+                    var = 'id_' + var
         return var
 
     def writeImageToFile(self, filename, format="PNG"):
diff --git a/AndroidViewClient/tools/culebra b/AndroidViewClient/tools/culebra
@@ -18,7 +18,7 @@ ___________________/  /__/  /__/  /__/  /________________________________
 
 '''
 
-__version__ = '5.0.0'
+__version__ = '5.3.0'
 
 import re
 import sys
@@ -242,9 +242,9 @@ def printFindViewWithContentDescription(view, useregexp):
                     if autoRegexp.match(contentDescription):
                         contentDescription = autoRegexp.pattern
                         break
-            contentDescription = "re.compile('''%s''')" % contentDescription
+            contentDescription = "re.compile(u'''%s''')" % contentDescription
         else:
-            contentDescription = "'''%s'''" % contentDescription
+            contentDescription = "u'''%s'''" % contentDescription
         print '%s = %svc.findViewWithContentDescriptionOrRaise(%s)' % (var, prefix, contentDescription)
     elif kwargs1[VERBOSE]:
         warnings.warn('View with id=%s has no content-description' %  view.getUniqueId())
@@ -258,7 +258,8 @@ def printFindViewById(view):
     '''
 
     var = variableNameFromIdOrKey(view)
-    print '%s = %svc.findViewByIdOrRaise("%s")' % (var, prefix, view.getUniqueId())
+    _id = view.getId() if view.getId() else view.getUniqueId()
+    print '%s = %svc.findViewByIdOrRaise("%s")' % (var, prefix, _id)
 
 def traverseAndPrint(view):
     '''
