Merge lp:~dandrader/unity8/improveLauncherTests into lp:unity8

[Daniel d'Andrada]

Improve Launcher tests, making them more reliable

 * Are there any related MPs required for this MP to build/function as expected? Please list.
lp:~mzanetti/unity8/launcher-fixes

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

 * 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?
Not applicable

 * If you changed the UI, has there been a design review?
Not applicable

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1595
http://jenkins.qa.ubuntu.com/job/unity8-ci/5253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1217
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17850

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

 * 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.

hell yeah!

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

yip yip

review: Approve

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-02-06 14:48:22 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-02-06 14:48:22 +0000
@@ -153,6 +153,18 @@
             tryCompare(panel, "x", -panel.width, 1000);
         }
 
+        function positionLauncherListAtBeginning() {
+            var listView = testCase.findChild(launcherLoader.item, "launcherListView");
+            listView.contentY = -listView.topMargin;
+        }
+        function positionLauncherListAtEnd() {
+            var listView = testCase.findChild(launcherLoader.item, "launcherListView");
+            if ((listView.contentHeight + listView.topMargin + listView.bottomMargin) > listView.height) {
+                listView.contentY = listView.topMargin + listView.contentHeight
+                    - listView.height;
+            }
+        }
+
         // Drag from the left edge of the screen rightwards and check that the launcher
         // appears (as if being dragged by the finger/pointer)
         function test_dragLeftEdgeToRevealLauncherAndTapCenterToDismiss() {
@@ -179,22 +191,22 @@
            launcherApplicationSelected("[...]dialer-app.desktop") */
         function test_clickingOnAppIconCausesSignalEmission() {
             dragLauncherIntoView();
-            launcher.lastSelectedApplication = ""
-
-            var listView = findChild(launcher, "launcherListView");
-            listView.positionViewAtEnd();
-
-            var appIcon = findChild(launcher, "launcherDelegate0")
-
-            verify(appIcon != undefined)
-
-            mouseClick(appIcon)
+            launcher.lastSelectedApplication = "";
+            launcher.inverted = false;
+
+            positionLauncherListAtBeginning();
+
+            var appIcon = findChild(launcher, "launcherDelegate0");
+
+            verify(appIcon != undefined);
+
+            mouseClick(appIcon);
 
             tryCompare(launcher, "lastSelectedApplication",
-                       "dialer-app")
+                       appIcon.appId);
 
             // Tapping on an application icon also dismisses the launcher
-            waitUntilLauncherDisappears()
+            waitUntilLauncherDisappears();
         }
 
         /* If I click on the dash icon on the launcher
@@ -290,25 +302,26 @@
         function test_clickFlick_data() {
             var listView = findChild(launcher, "launcherListView");
             return [
-                {tag: "unfolded top", positionViewAtBeginning: false,
+                {tag: "unfolded top", positionViewAtBeginning: true,
                                       clickY: listView.topMargin + units.gu(2),
                                       expectFlick: false},
 
-                {tag: "folded top", positionViewAtBeginning: true,
+                {tag: "folded top", positionViewAtBeginning: false,
                                     clickY: listView.topMargin + units.gu(2),
                                     expectFlick: true},
 
-                {tag: "unfolded bottom", positionViewAtBeginning: true,
+                {tag: "unfolded bottom", positionViewAtBeginning: false,
                                          clickY: listView.height - listView.topMargin - units.gu(1),
                                          expectFlick: false},
 
-                {tag: "folded bottom", positionViewAtBeginning: false,
+                {tag: "folded bottom", positionViewAtBeginning: true,
                                        clickY: listView.height - listView.topMargin - units.gu(1),
                                        expectFlick: true},
             ];
         }
 
         function test_clickFlick(data) {
+            launcher.inverted = false;
             launcher.lastSelectedApplication = "";
             dragLauncherIntoView();
             var listView = findChild(launcher, "launcherListView");
@@ -318,9 +331,9 @@
             // So for stability's sake we just put the listView in the position
             // we want to to actually start doing what this tests intends to check.
             if (data.positionViewAtBeginning) {
-                listView.positionViewAtBeginning();
+                positionLauncherListAtBeginning();
             } else {
-                listView.positionViewAtEnd();
+                positionLauncherListAtEnd();
             }
             tryCompare(listView, "flicking", false);
 
@@ -455,9 +468,9 @@
             // Position launcher to where we need it
             var listView = findChild(launcher, "launcherListView");
             if (data.flickTo == "top") {
-                listView.positionViewAtEnd();
+                positionLauncherListAtBeginning();
             } else {
-                listView.positionViewAtBeginning();
+                positionLauncherListAtEnd();
             }
 
             // Doing longpress