Add UiObject2 longClick support

dtmilano · dtmilano · commit 0dae280e078e · 2019-12-08T21:14:01.000-08:00
- Version 20.0.0b2
- Set dependency on culebratester-client &gt; 2.0.6
diff --git a/avc-version b/avc-version
@@ -50,23 +50,23 @@ case "$1" in
             echo "<<< $f >>>"
             case "$(uname)" in
                 Darwin)
-                    sed -E -i '' -e "s@$version_str \'[0-9r.]+\'@$version_str \'$version\'@" $f
+                    sed -E -i '' -e "s@$version_str \'[0-9abr.]+\'@$version_str \'$version\'@" $f
                     ;;
 
                 Linux)
-                    sed -E -i -e "s@$version_str '[0-9r.]+'@$version_str '$version'@" $f
+                    sed -E -i -e "s@$version_str '[0-9abr.]+'@$version_str '$version'@" $f
                     ;;
             esac
         done
 
         echo "<<< setup.py >>>"
         case "$(uname)" in
             Darwin)
-                sed -E -i '' -e "s@version='[0-9r.]+'@version='$version'@" setup.py
+                sed -E -i '' -e "s@version='[0-9abr.]+'@version='$version'@" setup.py
                 ;;
 
             Linux)
-                sed -E -i -e "s@version='[0-9r.]+'@version='$version'@" setup.py
+                sed -E -i -e "s@version='[0-9abr.]+'@version='$version'@" setup.py
                 ;;
         esac
         ;;
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-      version='20.0.0b1',
+      version='20.0.0b2',
       description='''AndroidViewClient is a 100% pure python library and tools
         that simplifies test script creation providing higher level
         operations and the ability of obtaining the tree of Views present at
@@ -22,5 +22,5 @@
       classifiers=['Development Status :: 4 - Beta'
                  'Intended Audience :: Developers',
                  'License :: OSI Approved :: Apache Software License'],
-      install_requires=['setuptools', 'requests', 'numpy', 'matplotlib', 'culebratester-client'],
+      install_requires=['setuptools', 'requests', 'numpy', 'matplotlib', 'culebratester-client >= 2.0.6'],
       )
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -26,7 +26,7 @@
 
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 import sys
 import warnings
@@ -529,7 +529,8 @@ def shell(self, _cmd=None, _convertOutputToString=True):
                     chunk = None
                     try:
                         chunk = self.socket.recv(4096)
-                        print('🟣 chunk=%s' % chunk)
+                        if DEBUG:
+                            print('🟣 chunk=%s' % chunk)
                     except Exception as ex:
                         print("ERROR:", ex, file=sys.stderr)
                     if not chunk:
diff --git a/src/com/dtmilano/android/adb/dumpsys.py b/src/com/dtmilano/android/adb/dumpsys.py
@@ -23,7 +23,7 @@
 import sys
 from _warnings import warn
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 DEBUG = False
 
diff --git a/src/com/dtmilano/android/common.py b/src/com/dtmilano/android/common.py
@@ -20,7 +20,7 @@
 
 from __future__ import print_function
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 import ast
 import os
diff --git a/src/com/dtmilano/android/concertina.py b/src/com/dtmilano/android/concertina.py
@@ -22,7 +22,7 @@
 import random
 
 __author__ = 'diego'
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 DEBUG = True
 
diff --git a/src/com/dtmilano/android/controlpanel.py b/src/com/dtmilano/android/controlpanel.py
@@ -20,7 +20,7 @@
     '''
 import platform
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 import tkinter
 import tkinter.ttk
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -33,7 +33,7 @@
 from com.dtmilano.android.concertina import Concertina
 from com.dtmilano.android.viewclient import ViewClient
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 import sys
 import threading
diff --git a/src/com/dtmilano/android/plot.py b/src/com/dtmilano/android/plot.py
@@ -31,7 +31,7 @@
 
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 DEBUG = True
 
diff --git a/src/com/dtmilano/android/robotframework/viewclientwrapper.py b/src/com/dtmilano/android/robotframework/viewclientwrapper.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 __author__ = 'diego'
 
 import sys
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -20,7 +20,7 @@
 
 from __future__ import print_function
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 import json
 import os
@@ -227,7 +227,8 @@ def longClick(self, **kwargs):
         if not (('x' in params and 'y' in params) or 'oid' in params):
             raise RuntimeError('longClick: (x, y) or oid must have a value')
         if 'oid' in params:
-            return self.__httpCommand('/UiObject2/%d/longClick' % params['oid'])
+            oid = int(params['oid'])
+            return self.api_instance.ui_object2_oid_long_click_get(oid)
         else:
             return self.__httpCommand('/UiDevice/longClick', params)
 
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -24,7 +24,7 @@
 
 from culebratester_client import WindowHierarchyChild, WindowHierarchy
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 import sys
 import warnings
@@ -1039,13 +1039,18 @@ def longTouch(self, duration=2000):
         @param duration: duration in ms
         '''
 
-        (x, y) = self.getCenter()
         if self.uiAutomatorHelper:
-            self.uiAutomatorHelper.swipe(startX=x, startY=y, endX=x, endY=y, steps=200)
+            # FIXME: is `selector` a `bySlector`?
+            object_ref = self.uiAutomatorHelper.findObject(by_selector=self.obtainSelectorForView())
+            if DEBUG_UI_AUTOMATOR_HELPER:
+                print("♦️ object_ref=%s" % object_ref, file=sys.stderr)
+            self.uiAutomatorHelper.longClick(oid=object_ref.oid)
         else:
             # FIXME: get orientation
+            (x, y) = self.getCenter()
             self.device.longTouch(x, y, duration, orientation=-1)
 
+
     def allPossibleNamesWithColon(self, name):
         l = []
         for _ in range(name.count("_")):
diff --git a/tools/culebra b/tools/culebra
@@ -24,7 +24,7 @@ from __future__ import print_function
 
 from culebratester_client import WindowHierarchy
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 import calendar
 import codecs
diff --git a/tools/dump b/tools/dump
@@ -8,7 +8,7 @@ Created on Feb 3, 2012
 
 from __future__ import print_function
 
-__version__ = '20.0.0b1'
+__version__ = '20.0.0b2'
 
 import getopt
 import os
