Fixed text property use with UiAutomator

dtmilano · dtmilano · commit b9043a2e6315 · 2012-11-26T14:11:21.000-05:00
- Added trashcan-fullscreenactivity-touches example
diff --git a/AndroidViewClient/examples/trashcan-fullscreenactivity-touches.py b/AndroidViewClient/examples/trashcan-fullscreenactivity-touches.py
@@ -0,0 +1,45 @@
+#! /usr/bin/env monkeyrunner
+'''
+Copyright (C) 2012  Diego Torres Milano
+Created on Mar 13, 2012
+
+@author: diego
+'''
+
+
+import re
+import sys
+import os
+import string
+
+# This must be imported before MonkeyRunner and MonkeyDevice,
+# otherwise the import fails.
+# PyDev sets PYTHONPATH, use it
+try:
+    for p in os.environ['PYTHONPATH'].split(':'):
+        if not p in sys.path:
+            sys.path.append(p)
+except:
+    pass
+    
+try:
+    sys.path.append(os.path.join(os.environ['ANDROID_VIEW_CLIENT_HOME'], 'src'))
+except:
+    pass
+
+from com.dtmilano.android.viewclient import ViewClient
+from com.android.monkeyrunner import MonkeyRunner, MonkeyDevice
+
+package = 'com.example.trashcan'                                          
+activity = '.FullScreenActivity'                           
+component = package + "/" + activity
+
+device, serialno = ViewClient.connectToDeviceOrExit()
+#device.startActivity(component=component)
+#MonkeyRunner.sleep(3)
+
+vc = ViewClient(device, serialno)
+button = vc.findViewWithTextOrRaise('Button')
+button.touch()
+toggle = vc.findViewWithTextOrRaise(re.compile('(ON)|(OFF)'))
+toggle.touch()
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py
@@ -906,7 +906,11 @@ def __init__(self, device, serialno, adb=None, autodump=True, localport=VIEW_SER
         self.useUiAutomator = (self.build[VERSION_SDK_PROPERTY] >= 16) # jelly bean 4.1 & 4.2
         ''' If UIAutomator is supported by the device it will be used '''
 
-        if not self.useUiAutomator:
+        if self.useUiAutomator:
+            self.textProperty = TEXT_PROPERTY_UI_AUTOMATOR
+        else:
+            # FIXME: not true for API <= 10
+            self.textProperty = TEXT_PROPERTY
             if startviewserver:
                 if not self.serviceResponse(device.shell('service call window 3')):
                     try:
@@ -1595,7 +1599,7 @@ def findViewWithAttributeThatMatches(self, attr, regex, root="ROOT"):
         
     def findViewWithText(self, text, root="ROOT"):
         if type(text).__name__ == 'PatternObject':
-            return self.findViewWithAttributeThatMatches(TEXT_PROPERTY, text, root)
+            return self.findViewWithAttributeThatMatches(self.textProperty, text, root)
             #l = self.findViewWithAttributeThatMatches(TEXT_PROPERTY, text)
             #ll = len(l)
             #if ll == 0:
@@ -1606,7 +1610,7 @@ def findViewWithText(self, text, root="ROOT"):
             #    print >>sys.stderr, "WARNING: findViewWithAttributeThatMatches invoked by findViewWithText returns %d items." % ll
             #    return l
         else:
-            return self.findViewWithAttribute(TEXT_PROPERTY, text, root)
+            return self.findViewWithAttribute(self.textProperty, text, root)
 
     def findViewWithTextOrRaise(self, text, root="ROOT"):
         '''
