Fixed methods receiving either uiObject or uiObject2 using "duck typing"

dtmilano · dtmilano · commit 6059fb29e930 · 2018-04-16T15:45:58.000-04:00
- Added 'list' option to 'dump' windows
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__ = '15.1.2'
+__version__ = '15.1.3'
 
 import json
 import os
@@ -305,8 +305,9 @@ def waitForIdle(self, timeout):
     # UiObject
     #
     def setText(self, uiObject, text):
+        # NOTICE: uiObject can receive UiObject or UiObject2
         params = {'text': text}
-        return self.__httpCommand('/UiObject/0x%x/setText' % (uiObject.oid), params)
+        return self.__httpCommand('/UiObject/0x%x/setText' % uiObject.oid, params)
 
     #
     # UiObject2
@@ -315,11 +316,11 @@ def clickAndWait(self, uiObject2, eventCondition, timeout):
         params = {'eventCondition': eventCondition, 'timeout': timeout}
         return self.__httpCommand('/UiObject2/%d/clickAndWait' % (uiObject2.oid), params)
 
-    def getText(self, uiObject=None, uiObject2=None):
+    def getText(self, uiObject=None):
+        # NOTICE: uiObject can receive UiObject or UiObject2
+        element = uiObject.__class__.__name__
         if uiObject:
-            path = '/UiObject/%d/getText' % (uiObject.oid)
-        elif uiObject2:
-            path = '/UiObject2/%d/getText' % (uiObject2.oid)
+            path = '/%s/%d/getText' % (element, uiObject.oid)
         else:
             raise ValueError("No uiObject or uiObject2 specified")
         response = self.__httpCommand(path, None)
@@ -412,10 +413,14 @@ def longClick(self):
         self.uiAutomatorHelper.longClick(oid=self.oid)
 
     def getText(self):
-        return self.uiAutomatorHelper.getText(uiObject2=self)
+        # NOTICE: even if this is an uiObject2 we are invoking the only "getText" method in UiAutomatorHelper
+        # passing the uiObject2 as uiObject
+        return self.uiAutomatorHelper.getText(uiObject=self)
 
     def setText(self, text):
-        self.uiAutomatorHelper.setText(uiObject2=self, text=text)
+        # NOTICE: even if this is an uiObject2 we are invoking the only "setText" method in UiAutomatorHelper
+        # passing the uiObject2 as uiObject
+        self.uiAutomatorHelper.setText(uiObject=self, text=text)
 
 
 class UiScrollable:
diff --git a/tools/dump b/tools/dump
@@ -6,7 +6,7 @@ Created on Feb 3, 2012
 @author: diego
 '''
 
-__version__ = '15.1.2'
+__version__ = '15.2.0'
 
 import ast
 import getopt
@@ -75,7 +75,7 @@ OPTS_HELP = {
     'H': 'prints this help',
     'V': 'verbose comments',
     'I': 'ignore secure device',
-    'F': 'force view server use (even if UiAutomator present:w)',
+    'F': 'force view server use (even if UiAutomator present)',
     'S': 'don\'t start ViewServer',
     'k': 'don\'t ignore UiAutomator killed',
     'w': 'dump WINDOW content (default: -1, all windows)',
@@ -218,6 +218,9 @@ if options[DO_NOT_DUMP_VIEWS]:
     transform = MAP[DO_NOT_DUMP_VIEWS]
 
 vc = ViewClient(*ViewClient.connectToDeviceOrExit(**kwargs1), **kwargs2)
+if options[WINDOW] == 'list':
+    vc.list()
+    sys.exit(0)
 if options[SAVE_SCREENSHOT]:
     vc.device.reconnect = True  # (not options[DO_NOT_DUMP_VIEWS])
     ext = os.path.splitext(options[SAVE_SCREENSHOT])[1][1:].upper()
