Merge lp:~aacid/unity8/testIndicatorsMenuFix into lp:unity8

[Albert Astals Cid]

Fix dragging so that test passes on Xenial

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
N/A

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2080
http://jenkins.qa.ubuntu.com/job/unity8-ci/6912/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5705
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/327/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1623
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5718
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25945
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/326/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6912/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Test passes for me on xenial even without that patch... Anyhow, this doesn't break it either...

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

at least not failed on this test :)

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

=== modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
--- tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-11-19 16:55:31 +0000
+++ tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-12-10 16:04:36 +0000
@@ -243,12 +243,12 @@
 
             // next time position will have moved.
             var nextItem = get_indicator_item(1);
-            var nextItemMappedPosition = root.mapFromItem(nextItem, nextItem.width/2, nextItem.height/2);
+            var nextItemMappedPositionX = firstItemMappedPosition.x + firstItem.width;
 
             // 1) Flick mouse down to bottom
             touchFlick(indicatorsMenu,
                        firstItemMappedPosition.x, indicatorsMenu.minimizedPanelHeight * 2,
-                       nextItemMappedPosition.x, indicatorsMenu.openedHeight / 3,
+                       nextItemMappedPositionX, indicatorsMenu.openedHeight / 3,
                        false /* beginTouch */, false /* endTouch */,
                        units.gu(50) /* speed */, 5 /* iterations */); // more samples needed for accurate velocity
 
@@ -256,7 +256,7 @@
             // after waiting in the same spot with touch down, it should update to the next item.
             tryCompare(indicatorItemRow, "currentItem", nextItem);
 
-            touchRelease(indicatorsMenu, nextItemMappedPosition.x, indicatorsMenu.openedHeight / 3);
+            touchRelease(indicatorsMenu, nextItemMappedPositionX, indicatorsMenu.openedHeight / 3);
         }
     }
 }