Fixed swipe parameter names

dtmilano · dtmilano · commit c8c867d1210a · 2016-01-28T00:25:33.000-05:00
- Added UiAutomatorHelper methods
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__ = '11.1.0'
+__version__ = '11.2.2'
 
 import os
 import subprocess
@@ -197,6 +197,12 @@ def __httpCommand(self, url, params=None, method='GET'):
             raise RuntimeError("method not supported: " + method)
         return response.content
 
+    #
+    # Device
+    #
+    def getDisplayRealSize(self):
+        return self.__httpCommand('/Device/getDisplayRealSize')
+
     #
     # UiAutomatorHelper internal commands
     #
@@ -210,6 +216,16 @@ def quit(self):
     #
     # UiDevice
     #
+    def click(self, x, y):
+        params = {'x': x, 'y': y}
+        return self.__httpCommand('/UiDevice/click', params)
+
+    def dumpWindowHierarchy(self):
+        dump = self.__httpCommand('/UiDevice/dumpWindowHierarchy').decode(encoding='UTF-8', errors='replace')
+        if DEBUG:
+            print >> sys.stderr, "DUMP: ", dump
+        return dump
+
     def findObject(self, resourceId):
         if not resourceId:
             raise RuntimeError('findObject: resourceId must have a value')
@@ -221,23 +237,29 @@ def findObject(self, resourceId):
             return int("0x" + m.group(1), 16)
         raise RuntimeError("Invalid response: " + response)
 
-    def takeScreenshot(self, scale=1.0, quality=90):
-        params = {'scale': scale, 'quality': quality}
-        return self.__httpCommand('/UiDevice/takeScreenshot', params)
+    def pressBack(self):
+        return self.__httpCommand('/UiDevice/pressBack')
 
-    def click(self, x, y):
-        params = {'x': x, 'y': y}
-        return self.__httpCommand('/UiDevice/click', params)
+    def pressHome(self):
+        return self.__httpCommand('/UiDevice/pressHome')
 
-    def swipe(self, (x0, y0), (x1, y1), steps):
-        params = {'x0': x0, 'y0': y0, 'x1': x1, 'y1': y1, 'steps': steps}
+    def pressKeyCode(self, keyCode, metaState=0):
+        params = {'keyCode': keyCode, 'metaState': metaState}
+        return self.__httpCommand('/UiDevice/pressKeyCode', params)
+
+    def pressRecentApps(self):
+        return self.__httpCommand('/UiDevice/pressRecentApps')
+
+    def swipe(self, startX=-1, startY=-1, endX=-1, endY=-1, steps=10, segments=[], segmentSteps=5):
+        if startX != -1 and startY != -1:
+            params = {'startX': startX, 'startY': startY, 'endX': endX, 'endY': endY, 'steps': steps}
+        else:
+            params = {'segments': ','.join(str(p) for p in segments), "segmentSteps": segmentSteps}
         return self.__httpCommand('/UiDevice/swipe', params)
 
-    def dumpWindowHierarchy(self):
-        dump = self.__httpCommand('/UiDevice/dumpWindowHierarchy').decode(encoding='UTF-8', errors='replace')
-        if DEBUG:
-            print >> sys.stderr, "DUMP: ", dump
-        return dump
+    def takeScreenshot(self, scale=1.0, quality=90):
+        params = {'scale': scale, 'quality': quality}
+        return self.__httpCommand('/UiDevice/takeScreenshot', params)
 
     #
     # UiObject
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -2318,9 +2318,21 @@ class ViewClient:
     If not running the ViewServer is started on the target device or emulator and then the port
     mapping is created.
 
+    LocalViewServer backend
+    =======================
+    ViewServer is started as an application services instead of as a system service.
+
     UiAutomator backend
     ===================
     No service is started.
+
+    null backend
+    ============
+    Allows only operations using PX or DIP as hierarchy is not dumped and thus Views not recognized.
+
+    UiAutomatorHelper backend
+    =========================
+    Requires B{Culebra Tester} installed on Android device.
     '''
 
     imageDirectory = None
@@ -3630,15 +3642,15 @@ def longTouch(self, x, y):
         if self.uiAutomatorHelper:
             if DEBUG_UI_AUTOMATOR_HELPER:
                 print >> sys.stderr, "Long-touching (%d, %d) through UiAutomatorHelper" % (x, y)
-            self.uiAutomatorHelper.swipe((x, y), (x, y), 400)
+            self.uiAutomatorHelper.swipe(startX=x, startY=y, endX=x, endY=y, steps=400)
         else:
             self.device.longTouch(x, y)
 
     def swipe(self, (x0, y0), (x1, y1), steps=400):
         if self.uiAutomatorHelper:
             if DEBUG_UI_AUTOMATOR_HELPER:
                 print >> sys.stderr, "Swipe (%d, %d) (%d, %d) through UiAutomatorHelper" % (x0, y0, x1, y1)
-            self.uiAutomatorHelper.swipe((x0, y0), (x1, y1), steps)
+            self.uiAutomatorHelper.swipe(startX=x0, startY=y0, endX=x1, endY=y1, steps=steps)
         else:
             warnings.warn("swipe only implemented using UiAutomatorHelper. Use AdbClient.drag() instead.")
 
diff --git a/tests/com/dtmilano/android/uiautomator/uiautomatorhelpertests.py b/tests/com/dtmilano/android/uiautomator/uiautomatorhelpertests.py
@@ -65,7 +65,7 @@ def testSwipe_random(self):
         x1 = random.randint(0, 1000)
         y1 = random.randint(0, 1000)
         steps = random.randint(10, 100)
-        response = self.uiAutomatorHelper.swipe((x0, y0), (x1, y1), steps)
+        response = self.uiAutomatorHelper.swipe(startX=x0, startY=y0, endX=x1, endY=y1, steps=steps)
         if DEBUG:
             print >> sys.stderr, "response=", response
 
