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

[Albert Astals Cid]

Rework tst_PreviewRatingDisplayCreationRanges

Remove the time comparison and actually check that only a small amount of items is being created

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

[Michael Zanetti (mzanetti)]

test passing locally here. makes sense to me

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2493
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1592/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2117
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1112
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1112
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1112
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2145
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2055
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2055
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2055
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2046/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2046/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2046/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2046/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2046/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2046/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2046/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2046/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2046
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2046/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1592/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/rework_tst_PreviewRatingDisplayCreationRanges]

2494. By Albert Astals Cid on 2016-06-23

Don't check for an exact number but for <= 20 delegates created

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2494
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1599/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2126
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1118
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1118
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1118
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2154
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2063
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2063
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2063
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2054/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2054/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2054/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2054/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2054/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2054/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2054/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2054/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2054
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2054/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1599/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

ok. this test passing in jenkins now too. top-approving

review: Approve

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingDisplayCreationRanges.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingDisplayCreationRanges.qml	2015-11-27 08:12:46 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingDisplayCreationRanges.qml	2016-06-23 08:20:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014,2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,8 @@
         parentFlickable: root
     }
 
+    property int createdDelegates: 0
+
     Component.onCompleted: {
         for (var i = 0; i < 500; ++i) {
             widgetData500.reviews.push({ author: "Some dude", review: "Very cool app" + i });
@@ -49,37 +51,68 @@
         factory.widgetData = widgetData500;
     }
 
+    Component {
+        id: countingPreviewRatingSingleDisplayComponent
+        PreviewRatingSingleDisplay {
+            objectName: "reviewItem" + index
+
+            anchors { left: parent.left; right: parent.right; }
+
+            rating: modelData["rating"] || -1
+            author: modelData["author"] || ""
+            review: modelData["review"] || ""
+            Component.onCompleted: root.createdDelegates++;
+        }
+    }
+
     UT.UnityTestCase {
-        name: "PreviewRatingDisplayTest"
+        name: "PreviewRatingDisplayCreationRangesTest"
         when: windowShown
 
-        function test_creation_speed() {
+        function initTestCase() {
+            var lists = findChildsByType(factory, "QQuickListView");
+            compare(lists.length, 1)
+            lists[0].delegate = countingPreviewRatingSingleDisplayComponent;
+        }
+
+        function test_check_delegate_creation_range() {
+            // Clear the reviews
+            factory.widgetData = reviewsEmpty;
+            waitForRendering(root);
+
+            // Unset parentFlickable this disables the creation range code
             factory.parentFlickable = null;
-            factory.widgetData = reviewsEmpty;
-            waitForRendering(root);
+            root.createdDelegates = 0;
 
-            var start = new Date().getTime();
+            // Set the 500 reviews data
             factory.widgetData = widgetData500;
             waitForRendering(root);
-            var end = new Date().getTime();
-            var time500 = end - start;
-
+
+            // Check we have created 500 delegates
+            compare(root.createdDelegates, 500);
+
+            // Check review 499 has been created
+            var reviewItem499 = findChild(factory, "reviewItem499");
+            verify(reviewItem499 !== null);
+
+            // Clear the reviews
             factory.widgetData = reviewsEmpty;
             waitForRendering(root);
 
+            // set parentFlickable to enable the creation ranges code
             factory.parentFlickable = root;
-            start = new Date().getTime();
+            root.createdDelegates = 0;
+
+            // Set the 500 reviews data
             factory.widgetData = widgetData500;
             waitForRendering(root);
-            end = new Date().getTime();
-            var timeRanges500 = end - start;
-
-            // Measurements show it's usually like 20 times faster
-            // but we set the range at 8 times fast to make sure it's not an unstable test
-            verify(timeRanges500 * 8 < time500);
-        }
-
-        function test_check_indexes() {
+
+            // Check we have only created a few delegates
+            // For some reason xenial and yaketti we get 16 and on vivid 15 so
+            // settle for <= 20
+            expectFailContinue("", "Should not create more than 20 delegates when using ranges");
+            tryCompareFunction(function() { return root.createdDelegates > 20 }, true);
+
             // Check that item 499 isn't there on startup but if we scroll down
             // it will be there
             var reviewItem499 = findChild(factory, "reviewItem499");
@@ -89,6 +122,9 @@
 
             var reviewItem499 = findChild(factory, "reviewItem499");
             verify(reviewItem499 !== null);
+
+            // Check we have created 500 delegates
+            compare(root.createdDelegates, 500);
         }
     }
 }