Merge lp:~aacid/unity/fixTestMouseFlick into lp:unity/phablet

[Albert Astals Cid]

Fix mouseFlick in UnityTestCase to flick to the correct x, y

[Michael Zanetti (mzanetti)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/76/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/75/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/75/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/qmluitests/UnityTestCase.qml'
--- tests/qmluitests/UnityTestCase.qml	2013-03-15 11:12:20 +0000
+++ tests/qmluitests/UnityTestCase.qml	2013-03-19 09:37:24 +0000
@@ -23,11 +23,12 @@
     function mouseFlick(item, x, y, toX, toY, pressMouse, releaseMouse) {
         pressMouse = ((pressMouse != null) ? pressMouse : true); // Default to true for pressMouse if not present
         releaseMouse = ((releaseMouse != null) ? releaseMouse : true); // Default to true for releaseMouse if not present
-        var diffX = toX - x
-        var diffY = toY - y
+        var nIterations = 5
+        var diffX = (toX - x) / nIterations
+        var diffY = (toY - y) / nIterations
         if (pressMouse)
             mousePress(item, x, y)
-        for (var i = 0; i < 5; ++i)
+        for (var i = 0; i < nIterations; ++i)
             mouseMove(item, x + (i + 1) * diffX, y + (i + 1) * diffY)
         if (releaseMouse)
             mouseRelease(item, toX, toY)
 
=== modified file 'tests/qmluitests/tst_Hud.qml'
--- tests/qmluitests/tst_Hud.qml	2013-03-18 14:43:15 +0000
+++ tests/qmluitests/tst_Hud.qml	2013-03-19 09:37:24 +0000
@@ -89,7 +89,7 @@
 
             // Check that when dragging right the special item appears at pos hud.appStack.width - itemwidth
             start_x = units.gu(1)
-            stop_x = units.gu(45)
+            stop_x = units.gu(150)
             mouseFlick(hud.appStack.__flickable, start_x, 0, stop_x, 0, true, false)
             tryCompare(hud.appStack.__specialItem, "visible", true)
             compare(hud.appStack.__specialItem.x + hud.appStack.__specialItem.width, hud.appStack.width, "Special item on right")