Merge lp:~sil2100/ubuntu-terminal-app/autopilot_fix_thumbspacing_0 into lp:ubuntu-terminal-app

[Łukasz Zemczak]

Modify drag_horizontal_slider to accomodate the changes in UITK that made thumbSpacing for the slider == 0. Calulate the step value differently as a workaround

Modify drag_horizontal_slider to accomodate the changes in UITK that made thumbSpacing for the slider == 0

[Nicholas Skaggs (nskaggs)]

The drag operation should go from the last size to the new size in the slider. You are redragging each time it seems

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

The tests do pass and fix the issue observed on the latest image.

[Nicholas Skaggs (nskaggs)]

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/ubuntu-terminal-app-autolanding/22/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1585
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-autolanding/22
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-autolanding/22
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-autolanding/18

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_terminal_app/emulators.py'
--- tests/autopilot/ubuntu_terminal_app/emulators.py	2014-02-27 16:16:27 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators.py	2014-03-05 16:10:36 +0000
@@ -59,9 +59,7 @@
         """Drag slider until value is set"""
         slItem = self.get_slider_item(slider)
 
-        # calculate required shift per position
         slRect = slItem.select_single("SliderStyle")
-        thumbSpacing = slRect.thumbSpacing
 
         slideMin = int(slItem.minimumValue)
         slideMax = int(slItem.maximumValue)
@@ -73,8 +71,11 @@
             raise ValueError("Pos cannot be less than" + str(slideMin))
 
         x, y, w, h = slRect.globalRect
-        sx = x + thumbSpacing
-        sy = y+h/2
+        # calculate the approximate slide step width
+        # we take half of the theoretical step value just to make sure we don't miss any values
+        step = w / ((slideMax - slideMin) * 2)
+        sx = x + step
+        sy = y + h / 2
         loop = 1
 
         #set the slider to minimum value and loop
@@ -84,9 +85,9 @@
         #drag through the slider until the pos matches our desired value
         #in case of bad sliding, loop will also timeout
         while round(slItem.value) != pos and slItem.value<slideMax and loop<=(slideMax*2):
-            #we can speed it along at twice the thumbSpacing and still hit everything
-            valuePos = int(sx + (thumbSpacing * 2 * loop))
+            valuePos = int(sx + step)
             self.pointing_device.drag(sx, sy, valuePos, sy)
+            sx = valuePos
             sleep(0.3)
             loop = loop + 1