Merge lp:~unity-team/unity8/notifications-audio-no-play-empty into lp:unity8

[Michał Sawicz]

Don't play empty urls in Notification.qml

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * 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:~unity-team/unity8/notifications-audio-no-play-empty]

1263. By Michał Sawicz on 2014-09-12

bool(QUrl("")) == true :/

[Mirco Müller (macslow)]

lgtm... approved

review: Approve

[Ricardo Mendoza (ricmm)]

lgtm!

review: Approve

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1263
http://jenkins.qa.ubuntu.com/job/unity8-ci/4295/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4773/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1389
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4540/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6025
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6025/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13126

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-08-29 08:22:34 +0000
+++ qml/Notifications/Notification.qml	2014-09-12 14:52:10 +0000
@@ -82,7 +82,7 @@
 
     // FIXME: using onCompleted because of LP: #1354406 workaround, has to be onOpacityChanged really
     Component.onCompleted: {
-        if (opacity == 1.0 && hints["suppress-sound"] != "true" && sound.source) {
+        if (opacity == 1.0 && hints["suppress-sound"] != "true" && sound.source != "") {
             sound.play();
         }
     }

=== modified file 'tests/mocks/QtMultimedia/audio.cpp'
--- tests/mocks/QtMultimedia/audio.cpp	2014-08-26 08:14:44 +0000
+++ tests/mocks/QtMultimedia/audio.cpp	2014-09-12 14:52:10 +0000
@@ -77,7 +77,7 @@
 
 void Audio::play()
 {
-    if (m_playbackState != PlayingState && m_source.isValid()) {
+    if (m_playbackState != PlayingState) {
         m_playbackState = PlayingState;
         Q_EMIT playbackStateChanged(m_playbackState);
 

=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
--- tests/qmltests/Notifications/tst_Notifications.qml	2014-08-19 13:44:58 +0000
+++ tests/qmltests/Notifications/tst_Notifications.qml	2014-09-12 14:52:10 +0000
@@ -476,7 +476,7 @@
             compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
 
             var audioItem = findInvisibleChild(notification, "sound")
-            tryCompare(audioItem, "playbackState", data.hasSound ? Audio.PlayingState : Audio.StoppedState)
+            compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")
 
             if(data.buttonRowVisible) {
                 var buttonCancel = findChild(buttonRow, "notify_button1")