Merge lp:~townsend/unity/fix-failing-ap-drag-test into lp:unity

Proposed by Christopher Townsend on 2013-09-18
Status: Merged
Approved by: Brandon Schaefer on 2013-09-18
Approved revision: 3517
Merged at revision: 3518
Proposed branch: lp:~townsend/unity/fix-failing-ap-drag-test
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
tests/autopilot/unity/emulators/ (+1/-1)
To merge this branch: bzr merge lp:~townsend/unity/fix-failing-ap-drag-test
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-09-18
Brandon Schaefer (community) 2013-09-18 Approve on 2013-09-18
Review via email:

Commit message

When dragging and dropping an icon before another icon, the calculation to position the drop was off by half an icon which would cause some AP tests to fail.

Description of the change

= Issue =
A couple of AP tests that test dragging icons were failing due to the icon not being correctly placed in the Launcher.

= Fix =
The calculation to find the correct place to drop the icon was off by half the height of the icon.

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :


review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity/emulators/'
2--- tests/autopilot/unity/emulators/ 2013-09-17 15:01:28 +0000
3+++ tests/autopilot/unity/emulators/ 2013-09-18 18:43:39 +0000
4@@ -377,7 +377,7 @@
5 if target_y < icon.center_y:
6 target_y += icon_height / 2
7 if pos == IconDragType.BEFORE:
8- target_y -= icon_height
9+ target_y -= icon_height + (icon_height / 2)
11 self.move_mouse_to_icon(icon)