Fix long click

Author: dtmilano

src/com/dtmilano/android/culebron.py

@@ -922,10 +922,12 @@ def longTouchPoint(self, x, y):
             self.statusBar.clear()
             return
 
-    def longTouchView(self, v, root=None):
+    def longTouchView(self, v: View, root=None) -> None:
+        # FIXME: v.longTouch() handles the 2 cases for CulebraTester2-public and adbclient
+        # also, we should obtain the selector only once
         v.longTouch()
         if v.uiAutomatorHelper:
-            self.printOperation(v, Operation.LONG_TOUCH_VIEW_UI_AUTOMATOR_HELPER, v.obtainSelectorForView())
+            self.printOperation(v, Operation.LONG_TOUCH_VIEW_UI_AUTOMATOR_HELPER, v.obtain_selector())
         else:
             # we pass root=v as an argument so the corresponding findView*() searches in this
             # subtree instead of the full tree

src/com/dtmilano/android/uiautomator/uiautomatorhelper.py

@@ -20,7 +20,7 @@
 
 from __future__ import print_function
 
-__version__ = '21.4.1'
+__version__ = '21.4.2'
 
 import json
 import os
@@ -544,7 +544,7 @@ def long_click(self, oid):
             :param oid: the oid
             :return: the result of the operation
             """
-            return self.uiAutomatorHelper.api_instance.ui_object2_long_click_get(oid=oid)
+            return self.uiAutomatorHelper.api_instance.ui_object2_oid_long_click_get(oid=oid)
 
         def set_text(self, oid, text):
             """

src/com/dtmilano/android/viewclient.py

@@ -152,7 +152,6 @@
 IPV6_RE = re.compile('^(?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}$', re.IGNORECASE)
 IPV6_PORT_RE = re.compile(r'^\[(?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}\]:\d+$', re.IGNORECASE)
 
-
 KEY_EVENT = com.dtmilano.android.keyevent.KEY_EVENT
 
 
@@ -990,7 +989,7 @@ def touch(self, eventType=adbclient.DOWN_AND_UP, deltaX=0, deltaY=0):
         @type deltaY: int
         """
 
-        (x, y) = self.getCenter()
+        x, y = self.getCenter()
         if deltaX:
             x += deltaX
         if deltaY:
@@ -1067,21 +1066,36 @@ def obtain_selector(self) -> Optional[culebratester_client.Selector]:
         return None
 
     def longTouch(self, duration=2000):
-        '''
+        """
         Long touches this C{View}
 
         @param duration: duration in ms
-        '''
+        """
+
+        x, y = self.getCenter()
 
         if self.uiAutomatorHelper:
-            # FIXME: is `selector` a `bySlector`?
-            object_ref = self.uiAutomatorHelper.findObject(by_selector=self.obtainSelectorForView())
+            selector = self.obtain_selector()
             if DEBUG_UI_AUTOMATOR_HELPER:
-                print("♦️ object_ref=%s" % object_ref, file=sys.stderr)
-            self.uiAutomatorHelper.longClick(oid=object_ref.oid)
+                print('using selector="%s"' % selector, file=sys.stderr)
+            if selector:
+                try:
+                    object_ref = self.uiAutomatorHelper.ui_device.find_object(body=selector)
+                    if DEBUG_UI_AUTOMATOR_HELPER:
+                        print("♦️ object_ref=%s" % object_ref, file=sys.stderr)
+                    self.uiAutomatorHelper.ui_object2.long_click(oid=object_ref.oid)
+                except RuntimeError as e:
+                    print(e, file=sys.stderr)
+                    print("UiObject2 click failed, falling back to coordinates", file=sys.stderr)
+                    self.uiAutomatorHelper.ui_device.click(x=x, y=y)
+            else:
+                # FIXME:
+                # The View has no CD, TEXT or ID so we cannot use it in a selector to findObject()
+                # We should try content description, text, and perhaps other properties before surrendering.
+                # For now, tet's fall back to click(x, y)
+                self.uiAutomatorHelper.ui_device.click(x=x, y=y)
         else:
             # FIXME: get orientation
-            (x, y) = self.getCenter()
             self.device.longTouch(x, y, duration, orientation=-1)
 
     def allPossibleNamesWithColon(self, name):

tools/culebra

@@ -809,15 +809,23 @@ def printTouchViewUiAutomatorHelper(selector: culebratester_client.Selector) ->
         print(f'{indent}{prefix}vc.uiAutomatorHelper.ui_object2.click(oid=obj_ref.oid)')
 
 
-def printLongTouchViewUiAutomatorHelper(view, selector):
-    '''
+def printLongTouchViewUiAutomatorHelper(selector):
+    """
     Prints the corresponding long touch
-    '''
+    """
     if options[CulebraOptions.MULTI_DEVICE]:
         warnings.warn('Multi-device not implemented yet for this case')
     else:
-        logAction('long-touching View by selector=%s' % (selector))
-        print('%s%svc.longTouch(selector=\'%s\')' % (indent, prefix, selector))
+        logAction(f'long-touching by selector={selector}')
+        indented_line = None
+        indentation = indent + ' ' * 4
+        for line in f'{indent}obj_ref = {prefix}vc.uiAutomatorHelper.ui_device.find_object(body={selector})'.splitlines():
+            if not indented_line:
+                indented_line = line
+            else:
+                indented_line = f'{indented_line}\n{indentation}{line}'
+        print(f'{indented_line}')
+        print(f'{indent}{prefix}vc.uiAutomatorHelper.ui_object2.long_click(oid=obj_ref.oid)')
 
 
 def printSwipeUiAutomatorHelper(startX, startY, endX, endY, steps, unit, orientation):
@@ -991,7 +999,7 @@ def printOperation(view, op, *args):
         printLongTouch(x=args[0], y=args[1], duration=args[2], unit=args[3], orientation=args[4])
         return
     elif op == Operation.LONG_TOUCH_VIEW_UI_AUTOMATOR_HELPER:
-        printLongTouchViewUiAutomatorHelper(view=view, selector=args[0])
+        printLongTouchViewUiAutomatorHelper(selector=args[0])
         return
     elif op == Operation.TRAVERSE:
         printTraverse()