Added getText() support

dtmilano · dtmilano · commit 6712d784cec8 · 2016-10-22T01:07:35.000-04:00
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -298,6 +298,15 @@ 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)
+        r = json.loads(response)
+        if r[u'status'] == 'OK':
+            if DEBUG:
+                print >> sys.stderr, "UiAutomatorHelper: getText: returning", r[u'text']
+            return r[u'text']
+        raise RuntimeError("Error: " + response)
+
 
     #
     # UiScrollable
@@ -342,8 +351,11 @@ def clickAndWait(self, eventCondition, timeout):
     def longClick(self):
         self.uiAutomatorHelper.longClick(oid=self.oid)
 
+    def getText(self):
+        return self.uiAutomatorHelper.getText(uiObject2=self)
+
     def setText(self, text):
-        self.uiAutomatorHelper.setText(uiObject=self, text=text)
+        self.uiAutomatorHelper.setText(uiObject2=self, text=text)
 
 
 class UiScrollable:
@@ -360,5 +372,5 @@ def getChildByDescription(self, uiSelector, description, allowScrollSearch):
         return UiObject(self.uiAutomatorHelper, oid)
 
     def getChildByText(self, uiSelector, text, allowScrollSearch):
-        oid, response = self.uiAutomatorHelper.uiScrollable(str(self.oid) + '/getChildByDescription', {'uiSelector': uiSelector, 'text': text, 'allowScrollSearch': allowScrollSearch})
+        oid, response = self.uiAutomatorHelper.uiScrollable(str(self.oid) + '/getChildByText', {'uiSelector': uiSelector, 'text': text, 'allowScrollSearch': allowScrollSearch})
         return UiObject(self.uiAutomatorHelper, oid)
