Merge lp:~faenil/ubuntu-ui-toolkit/fix_ubuntulistview_units_test_qt56 into lp:ubuntu-ui-toolkit/staging

[Andrea Bernabei]

Qt5.6: fix ubuntulistview.10 unit test

We were previously misusing mapToItem/mapFromItem by not passing x/y parameters and relying on the code in qquickitem.cpp to initialize them to 0.

Qt5.6 fixes QTBUG-41686 and requires x/y to be explicitly passed.

Qt5.6: fix ubuntulistview.10 unit test

We were previously misusing mapToItem/mapFromItem by not passing x/y parameters and relying on the code in qquickitem.cpp to initialize them to 0.

Qt5.6 fixes QTBUG-41686 and requires x/y to be explicitly passed.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1212/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6423/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1212/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1178/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6424/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1178/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1428/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6425/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1428/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1421/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6426/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1421/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/769/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1421
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1421/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1428
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1212
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1178
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6427/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6426
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6425
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6423
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6424

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/769/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Well, previously those two undefined params were considered as (0, 0). Thanks for the fix!

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1213/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6430/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1213/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1429/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6431/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1429/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1179/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6433/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1179/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1422/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6434/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1422/rebuild

review: Approve (continuous-integration)

=== renamed file 'tests/unit/visual/FIXME-QT56_ubuntulistview.10.qml' => 'tests/unit/visual/tst_ubuntulistview.10.qml'
--- tests/unit/visual/FIXME-QT56_ubuntulistview.10.qml	2016-09-16 11:20:57 +0000
+++ tests/unit/visual/tst_ubuntulistview.10.qml	2016-09-17 12:08:10 +0000
@@ -114,12 +114,12 @@
 
         function test_noScrollingNeeded() {
             var item = findChild(ubuntuListView, "expandable1");
-            fuzzyCompare(ubuntuListView.mapFromItem(item).y, item.collapsedHeight, .5);
+            fuzzyCompare(ubuntuListView.mapFromItem(item, 0, 0).y, item.collapsedHeight, .5);
 
             expandItem(item);
             waitForRendering(ubuntuListView);
 
-            fuzzyCompare(ubuntuListView.mapFromItem(item).y, item.collapsedHeight, .5);
+            fuzzyCompare(ubuntuListView.mapFromItem(item, 0, 0).y, item.collapsedHeight, .5);
         }
 
         function test_scrollToTop() {
@@ -127,11 +127,11 @@
             ubuntuListView.positionViewAtIndex(0, ListView.Beginning)
 
             var item = findChild(ubuntuListView, "expandable1");
-            fuzzyCompare(ubuntuListView.mapFromItem(item).y, item.collapsedHeight, 1);
+            fuzzyCompare(ubuntuListView.mapFromItem(item, 0, 0).y, item.collapsedHeight, 1);
 
             expandItem(item);
 
-            fuzzyCompare(ubuntuListView.mapFromItem(item).y, 0, .5);
+            fuzzyCompare(ubuntuListView.mapFromItem(item, 0, 0).y, 0, .5);
         }
 
         function test_scrollIntoView() {
@@ -140,7 +140,7 @@
             waitForRendering(ubuntuListView);
 
             // The item must be scrolled upwards, leaving space for one other item at the bottom
-            fuzzyCompare(ubuntuListView.mapFromItem(item).y, ubuntuListView.height - item.collapsedHeight - item.expandedHeight, 1);
+            fuzzyCompare(ubuntuListView.mapFromItem(item, 0, 0).y, ubuntuListView.height - item.collapsedHeight - item.expandedHeight, 1);
         }
 
         function test_collapseByClickingOutside() {