Merge lp:~mterry/unity8/robustify-testEdgeDemoOverlay into lp:unity8

[Michael Terry]

Make EdgeDemoOverlay test more reliable by testing for what we really care about, not an indirect indicator of it.

Make EdgeDemoOverlay test more reliable by testing for what we really care about, not an indirect indicator of it.

Turns out that tryCompare(obj, "prop", 1.0) will possibly return successfully at values like 0.999992, before other qml bindings on that property would consider it to be at value 1.0. So it's not wise to tryCompare on a value, expecting that a successful return will mean related qml bindings will have triggered at the same time.

The EdgeDemoOverlay qmltest was relying on just such an indirect test. Fixed to test what we really care about.

[Albert Astals Cid (aacid)]

Robust++ :-)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/unity8-ci/1608/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/612
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/612/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/597
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/597/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3234
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1278

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1608/rebuild

review: Approve (continuous-integration)

=== modified file 'Components/EdgeDemoOverlay.qml'
--- Components/EdgeDemoOverlay.qml	2013-09-27 23:33:47 +0000
+++ Components/EdgeDemoOverlay.qml	2013-11-08 08:28:38 +0000
@@ -105,6 +105,8 @@
         visible: overlay.active
 
         MouseArea {
+            objectName: "backgroundShadeMouseArea"
+
             anchors.fill: parent
             enabled: overlay.edge == "none" && overlay.opacity == 1.0
             onClicked: overlay.doSkip()

=== modified file 'tests/qmltests/Components/tst_EdgeDemoOverlay.qml'
--- tests/qmltests/Components/tst_EdgeDemoOverlay.qml	2013-08-27 13:46:35 +0000
+++ tests/qmltests/Components/tst_EdgeDemoOverlay.qml	2013-11-08 08:28:38 +0000
@@ -112,8 +112,8 @@
             // Test that the 'none' edge skips anywhere
             signalSpy.target = none
             signalSpy.clear()
-            var backgroundShade = findChild(none, "backgroundShade")
-            tryCompare(none, "opacity", 1)
+            var backgroundShade = findChild(none, "backgroundShadeMouseArea")
+            tryCompare(backgroundShade, "enabled", true)
             mousePress(backgroundShade, 1, 1)
             mouseRelease(backgroundShade, 1, 1)
             signalSpy.wait()