Support for UiObject and UiObjext2 in getText

dtmilano · dtmilano · commit 1541b26b7368 · 2016-10-22T21:33:58.000-04:00
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -298,8 +298,14 @@ def clickAndWait(self, uiObject2, eventCondition, timeout):
         params = {'eventCondition': eventCondition, 'timeout': timeout}
         return self.__httpCommand('/UiObject2/%d/clickAndWait' % (uiObject2.oid), params)
 
-    def getText(self, uiObject2):
-        response = self.__httpCommand('/UiObject2/%d/getText' % (uiObject2.oid), None)
+    def getText(self, uiObject=None, uiObject2=None):
+        if uiObject:
+            path = '/UiObject/%d/getText' % (uiObject.oid)
+        elif uiObject2:
+            path = '/UiObject2/%d/getText' % (uiObject2.oid)
+        else:
+            raise ValueError("No uiObject or uiObject2 specified")
+        response = self.__httpCommand(path, None)
         r = json.loads(response)
         if r[u'status'] == 'OK':
             if DEBUG:
@@ -342,6 +348,11 @@ def click(self):
     def longClick(self):
         self.uiAutomatorHelper.longClick(oid=self.oid)
 
+    def getText(self):
+        return self.uiAutomatorHelper.getText(uiObject=self)
+
+    def setText(self, text):
+        self.uiAutomatorHelper.setText(uiObject=self, text=text)
 
 
 class UiObject2:
