Merge lp:~saviq/unity8/fix-qml-tests into lp:unity8

[Michał Sawicz]

Fix qml tests - loader around PageHeader, more retries for selecting a scope and undefined attributes in mock overview scope.

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes. Test only changes, tests pass now.

 * 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

[lp:~saviq/unity8/fix-qml-tests]

1152. By Michał Sawicz on 2014-08-13

Fix Dash test better.

1153. By Michał Sawicz on 2014-08-13

Simplify setCurrentScope test.

[Michael Zanetti (mzanetti)]

yip yip. thanks

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

yeah, passing now

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

fingers crossed

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1151
http://jenkins.qa.ubuntu.com/job/unity8-ci/3895/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/989
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/989/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/989
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4760
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4760/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11437

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/mocks/Unity/fake_scopesoverview.cpp'
--- tests/mocks/Unity/fake_scopesoverview.cpp	2014-08-07 08:52:59 +0000
+++ tests/mocks/Unity/fake_scopesoverview.cpp	2014-08-13 23:50:19 +0000
@@ -105,11 +105,12 @@
         }
         case RoleComponents:
         {
-            QVariantMap map, artMap;
+            QVariantMap map, artMap, attributesMap;
             artMap["aspect-ratio"] = "0.5";
             artMap["field"] = "art";
             map["art"] = artMap;
             map["title"] = "HOLA";
+            map["attributes"] = attributesMap;
             return map;
         }
         case RoleResults:
@@ -188,11 +189,12 @@
         }
         case RoleComponents:
         {
-            QVariantMap map, artMap;
+            QVariantMap map, artMap, attributesMap;
             artMap["aspect-ratio"] = "1";
             artMap["field"] = "art";
             map["art"] = artMap;
             map["title"] = "HOLA";
+            map["attributes"] = attributesMap;
             return map;
         }
         case RoleResults:

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-08-07 09:20:38 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-08-13 23:50:19 +0000
@@ -54,6 +54,7 @@
             tryCompare(dashContentList, "count", 0);
             scopes.load();
             tryCompare(dashContentList, "currentIndex", 0);
+            tryCompare(dashContentList, "count", 6);
         }
 
         function get_scope_data() {
@@ -273,6 +274,8 @@
             // Click on a temp scope in the search
             var dashCategorysearchA = findChild(searchResultsViewer, "dashCategorysearchA");
             var cardTempScope = findChild(dashCategorysearchA, "delegate2");
+            verify(cardTempScope, "Could not find delegate2");
+
             waitForRendering(cardTempScope);
             mouseClick(cardTempScope, cardTempScope.width / 2, cardTempScope.height / 2);
 
@@ -313,13 +316,10 @@
             var startY = dash.height / 2;
             var stopX = units.gu(1)
             var stopY = startY;
-            var retry = 0;
-            while (dashContentList.currentIndex != 2 && retry <= 5) {
-                mouseFlick(dash, startX, startY, stopX, stopY)
-                waitForRendering(dashContentList)
-                retry++;
-            }
-            compare(dashContentList.currentIndex, 2);
+            waitForRendering(dashContentList)
+            mouseFlick(dash, startX, startY, stopX, stopY);
+            mouseFlick(dash, startX, startY, stopX, stopY);
+            compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");
             var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");
             dashCommunicatorService.mockSetCurrentScope("clickscope", true, true);
             tryCompare(dashContentList, "currentIndex", 1)

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2014-08-07 15:33:01 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2014-08-13 23:50:19 +0000
@@ -390,7 +390,7 @@
             var categoryListView = findChild(scope, "categoryListView");
             waitForRendering(categoryListView);
 
-            compare(categoryListView.pageHeader.searchHint, "Search People");
+            compare(categoryListView.pageHeader.item.searchHint, "Search People");
         }
     }
 }