Merge lp:~paulliu/unity8/fix-zoomableimage-test1 into lp:unity8

[Ying-Chun Liu]

Fix ZoomableImage test failure.

* 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:883
http://jenkins.qa.ubuntu.com/job/unity8-ci/2931/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/72
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1795/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/576
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/178
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6896

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:883
http://jenkins.qa.ubuntu.com/job/unity8-ci/2986/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/80
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/610
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7314

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:883
http://jenkins.qa.ubuntu.com/job/unity8-ci/3013/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/371
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/48/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/728
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/728/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7438

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:883
http://jenkins.qa.ubuntu.com/job/unity8-ci/3018/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/852
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/743
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/743/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7456

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

It's failing for me locally

tsdgeos_work@xps:~/phablet/unity8/fix-zoomableimage-test1/builddir$ make xvfbtestZoomableImage
Xlib: extension "RANDR" missing on display ":99".
********* Start testing of qmltestrunner *********
Config: Using QtTest library 5.3.0, Qt 5.3.0
PASS : qmltestrunner::ZoomableImageTest::initTestCase()
PASS : qmltestrunner::ZoomableImageTest::test_loadImage()
QWARN : qmltestrunner::ZoomableImageTest::test_mousewheel() file:///home/tsdgeos_work/phablet/unity8/fix-zoomableimage-test1/qml/Components/LazyImage.qml:118:9: QML State: Binding loop detected for property "when"
QWARN : qmltestrunner::ZoomableImageTest::test_mousewheel() file:///home/tsdgeos_work/phablet/unity8/fix-zoomableimage-test1/qml/Components/LazyImage.qml:118:9: QML State: Binding loop detected for property "when"
QWARN : qmltestrunner::ZoomableImageTest::test_mousewheel() file:///home/tsdgeos_work/phablet/unity8/fix-zoomableimage-test1/qml/Components/LazyImage.qml:118:9: QML State: Binding loop detected for property "when"
QWARN : qmltestrunner::ZoomableImageTest::test_mousewheel() file:///home/tsdgeos_work/phablet/unity8/fix-zoomableimage-test1/qml/Components/LazyImage.qml:118:9: QML State: Binding loop detected for property "when"
PASS : qmltestrunner::ZoomableImageTest::test_mousewheel()
PASS : qmltestrunner::ZoomableImageTest::test_pinch(row 0)
FAIL! : qmltestrunner::ZoomableImageTest::test_pinch(row 1) property scale
   Actual (): 0.9373503718221556
   Expected (): 0.8870230941024013
   Loc: [/home/tsdgeos_work/phablet/unity8/fix-zoomableimage-test1/tests/qmltests/Components/tst_ZoomableImage.qml(177)]
PASS : qmltestrunner::ZoomableImageTest::cleanupTestCase()
Totals: 5 passed, 1 failed, 0 skipped

review: Needs Fixing

[Michał Sawicz (saviq)]

PreviewZoomableImage fails, too - please fix in this same MP:

********* Start testing of qmltestrunner *********
Config: Using QtTest library 5.2.1, Qt 5.2.1
PASS : qmltestrunner::PreviewZoomableImageTest::initTestCase()
FAIL! : qmltestrunner::PreviewZoomableImageTest::test_loadImage() property imageState
   Actual (): default
   Expected (): ready
   Loc: [/home/michal/dev/canonical/unity8/repo/tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml(56)]
PASS : qmltestrunner::PreviewZoomableImageTest::cleanupTestCase()
Totals: 2 passed, 1 failed, 0 skipped
********* Finished testing of qmltestrunner *********

review: Needs Fixing

[lp:~paulliu/unity8/fix-zoomableimage-test1]

884. By Ying-Chun Liu on 2014-05-22

Merge trunk
[ Michal Hruby ]
* Updated scope tool to create proper config files after recent
  libunity-scopes-api changes.
[ Michał Sawicz ]
* Refactor export_qmlfiles and export_qmlplugins to be more generic
  and clean up installed mocks.
[ Albert Astals ]
* Remove empty dirs
* Set the tabbarmodel index as we do on real code It works better :D
  (LP: #1317255)
[ Thomi Richards ]
* Use new import location for ProcessSearchError in process_helpers
  script.
[ Andrea Cimitan ]
* Adds shadow for the carousel
[ Daniel d'Andrada ]
* Remove Revealer component It's not used anywhere anymore. It's been
  replaced by DragHandle.
[ Andy Doan ]
* unlock_device: support more complex reboot/wait cycles Currently
  this script only allows you to override how to "wait" on the device.
  This changes the logic to also support how you go about rebooting
  the device. This is handy for the ubuntu-emulator because adb-reboot
  is not currently supported. However, we also have a more
  sophisticated, fool-proof way we reboot/wait in the CI lab that
  would be nice to take advantage of:
  http://bazaar.launchpad.net/~ubuntu-test-case-dev/ubuntu-test-
  cases/touch/view/head:/scripts/reboot-and-wait
[ CI bot ]
* Resync trunk
[ Michael Zanetti ]
* support appid:// entries in gsettings schema and make
  findDesktopFile work with short-appid (LP: #1239750)
[ Antti Kaijanmäki ]
* Indicators/RootActionState: use g_variant_iter_loop to extract
  icons.
[ Andrea Cimitan ]
* Improve padding in Text preview widget. (LP: #1316683)
[ CI bot ]
* Resync trunk
[ Nick Dedekind ]
* Removed binding loop from Unity.Indicators.MenuContentActivator
  Change handler for QMLListProperty used by MenuContent.qml:
  menuActivator.content[index].active If we're already asking for the
  index, we know it exists already. No need to send a
  changeNotification on an implied creation.
[ Josh Arenson ]
* Implements usage-style documentation for unity8 executable. Fixes
  lp:1269282 (LP: #1269282)
[ Albert Astals ]
* Create specialized Card code in Javascript instead of having various
  copied&pasted files (LP: #1297197)
[ Michał Sawicz ]
* Remove HUD from the bottom edge. Again.

885. By Ying-Chun Liu on 2014-05-23

Fix ZoomableImage test fail. Use relative scale.
Fix PreviewZoomableImage fail.

886. By Ying-Chun Liu on 2014-05-23

Fix indent.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:885
http://jenkins.qa.ubuntu.com/job/unity8-ci/3032/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/443/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/70
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/873/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:886
http://jenkins.qa.ubuntu.com/job/unity8-ci/3036/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/447
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/130
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/878
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/878/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7609

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Only tests changed, so no need for a test run other than running the tests.

 * Did CI run pass?
No, some other known broken tests

review: Approve

=== modified file 'tests/qmltests/Components/tst_ZoomableImage.qml'
--- tests/qmltests/Components/tst_ZoomableImage.qml	2014-04-25 14:48:36 +0000
+++ tests/qmltests/Components/tst_ZoomableImage.qml	2014-05-23 14:07:40 +0000
@@ -98,22 +98,23 @@
             // move mouse to center
             mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
 
+            var oldScale = image.scale;
             // Test Zoom-in Zoom-out twice.
             for (var c=0; c<2; c++) {
                 // zoom in
                 for (var i=0; i<10; i++) {
                     mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);
-                    tryCompare(image, "scale", 1.0 + (i + 1) * 0.1);
-                    compare(flickable.contentWidth, lazyImage.width * image.scale);
-                    compare(flickable.contentHeight, lazyImage.height * image.scale);
+                    tryCompare(image, "scale", oldScale + (i + 1) * 0.1);
+                    compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
+                    compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
                 }
 
                 // zoom out
                 for (var i=0; i<10; i++) {
                     mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);
-                    tryCompare(image, "scale", 2.0 - (i + 1) * 0.1);
-                    compare(flickable.contentWidth, lazyImage.width * image.scale);
-                    compare(flickable.contentHeight, lazyImage.height * image.scale);
+                    tryCompare(image, "scale", oldScale + 1.0 - (i + 1) * 0.1);
+                    compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
+                    compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
                 }
             }
         }
@@ -123,16 +124,12 @@
                        zoomable:false,
                        answer1: true,
                        answer2: false,
-                       answer3: true,
-                       answer4: 1.0,
-                       answer5: 1.0 },
+                       answer3: true },
                      { source:widgetData2["source"],
                        zoomable:true,
                        answer1: false,
                        answer2: true,
-                       answer3: false,
-                       answer4: 1.7740461882048026,
-                       answer5: 1.0 }
+                       answer3: false }
                    ]
         }
 
@@ -163,7 +160,7 @@
             var y2End = zoomableImage.height * 5 / 6;
 
             var oldScale = image.scale;
-
+            var newScale = -1;
             // move mouse to center
             mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
 
@@ -172,20 +169,25 @@
                 wait(3000); // have to delay between two consequent pinch event.
                 // pinch zoom-in
                 touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);
+                waitForRendering(image);
 
-                tryCompare(image, "scale", data.answer4);
-                var newScale = image.scale;
+                if (newScale == -1) {
+                    newScale = image.scale;
+                }
+                tryCompare(image, "scale", newScale);
                 compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);
                 compare(newScale > oldScale, data.answer2, "scale factor didn't changed");
                 compare(signalSpy.count == 0, data.answer3, "scale signal count error");
-                compare(newScale, data.answer4, "scale factor error");
-                compare(flickable.contentWidth, lazyImage.width * image.scale);
-                compare(flickable.contentHeight, lazyImage.height * image.scale);
+                compare(image.scale, newScale, "scale factor error");
+                compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
+                compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
 
                 wait(3000); // have to delay between two consequent pinch event.
                 // pinch zoom-out
                 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);
-                tryCompare(image, "scale", data.answer5);
+                tryCompare(image, "scale", oldScale);
+                compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
+                compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
             }
         }
     }

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2014-04-08 12:38:12 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2014-05-23 14:07:40 +0000
@@ -26,14 +26,14 @@
     color: "lightgrey"
 
     property var widgetData0: {
-        "source": ""
-    }
-
-    property var widgetData1: {
         "source": Qt.resolvedUrl("../artwork/checkers.png"),
         "zoomable": false
     }
 
+    property var widgetData1: {
+        "source": ""
+    }
+
     PreviewZoomableImage {
         id: zoomableImage
         anchors.fill: parent
@@ -49,11 +49,13 @@
 
             zoomableImage.widgetData = widgetData0;
             waitForRendering(zoomableImage);
+            waitForRendering(image);
+            tryCompare(image, "imageState", "ready");
+
+            zoomableImage.widgetData = widgetData1;
+            waitForRendering(zoomableImage);
+            waitForRendering(image);
             tryCompare(image, "imageState", "default");
-
-            zoomableImage.widgetData = widgetData1;
-            waitForRendering(zoomableImage);
-            tryCompare(image, "imageState", "ready");
         }
     }
 }