Merge into trunk : snap-decisions-states : Code : Unity 8

Status:	Merged
Approved by:	Michael Zanetti on 2014-03-19
Approved revision:	556
Merged at revision:	787
Proposed branch:	lp:~macslow/unity8/snap-decisions-states
Merge into:	lp:unity8
Prerequisite:	lp:~macslow/unity8/fix-object-name-of-notification-ap-test
Diff against target:	491 lines (+330/-17) 5 files modified qml/Notifications/Notification.qml (+61/-4) qml/Notifications/Notifications.qml (+4/-0) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Notifications/tst_Notifications.qml (+27/-13) tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml (+237/-0)
To merge this branch:	bzr merge lp:~macslow/unity8/snap-decisions-states
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-03-12	Needs Fixing on 2014-03-19
Michael Zanetti (community)			Approve on 2014-03-19
Andrea Cimitan		2014-03-12	Pending
Review via email: mp+210618@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-10: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-11: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-11: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:535
http://jenkins.qa.ubuntu.com/job/unity8-ci/2290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/814
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3108
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3108/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-18: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-19: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-19: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-19: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-20: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-20: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-20: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-20: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-12:

#

FAILED: Continuous integration, rev:541
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~macslow/unity8/snap-decisions-states/+merge/210618/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-03-12: Posted in a previous version of this proposal

#

15 + var result = "undefined";

I think this should be "" instead of "undefined" otherwise leaving a state might not reset stuff correctly.

===

18 + if (notificationList.currentIndex == index) {
and following lines...

You shouldn't reach out of scope here (Can break if someone. Please either user ListView.view instead of notificationList or move the logic out into the containing ListView.

===
small coding style nitpick

70 anchors.fill: parent
71 - anchors.margins: notification.margins
72 + anchors.leftMargin: notification.margins
73 + anchors.rightMargin: notification.margins

anchors { fill: parent; ... }

===

117 + Component.onCompleted: {
118 + if (fullscreen) {
119 + notificationList.spacing = 0
120 + } else {
121 + notificationList.spacing = units.gu(.5)
122 + }
123 + }

Why can't this be a binding in the ListView? Not sure why this needs to be called every time a new delegate is created.
===

Not sure if related to this branch (and if its a real issue after all), but if I trigger sd-example-incoming-call.py and then decline the incoming call the notification doesn't go away (it works fine if I accept the call)

===

I'm calling this in a script:

./sd-example-incoming-call-canceled.py &
./sd-example-incoming-call.py &
./sd-example-incoming-file.py &
./sd-example-morning-alarm.py &
./sd-example-much-body-text.py &
./sd-example-password-entry.py &
./sd-example-simunlock.py &
./sd-example-user-auth.py &
./sd-example-using-button-tint-hint.py &

=> unity crashes.

After that I added a sleep 1 in between the lines, it still causes issues and at some point an empty rectangle appears.

===

If the first notification is expanded, and a new one comes in at position 0, the new one shows up expanded and then quickly collapses. I think that might be related to this:

125 + ListView.onAdd: {
126 + if (notificationList.currentIndex < 1 && notificationList.count > 1) {
127 + notificationList.currentIndex = 1
128 + }

The problem here is that you only correct the currentIndex after everything is built up. If you make it a binding it should work better.

===

207 + wait(500);

Is that a leftover from testing?

===

tests look good. Maybe rename them to give it a more meaningful name? make testVisualQueue does not really tell its notifications.

15	+ var result = "undefined";

I think this should be "" instead of "undefined" otherwise leaving a state might not reset stuff correctly.

===

18	+ if (notificationList.currentIndex == index) {
and following lines...

You shouldn't reach out of scope here (Can break if someone. Please either user ListView.view instead of notificationList or move the logic out into the containing ListView.

===
 small coding style nitpick

70	anchors.fill: parent
71	- anchors.margins: notification.margins
72	+ anchors.leftMargin: notification.margins
73	+ anchors.rightMargin: notification.margins

anchors { fill: parent; ... }

===

117	+ Component.onCompleted: {
118	+ if (fullscreen) {
119	+ notificationList.spacing = 0
120	+ } else {
121	+ notificationList.spacing = units.gu(.5)
122	+ }
123	+ }

Why can't this be a binding in the ListView? Not sure why this needs to be called every time a new delegate is created.
===

Not sure if related to this branch (and if its a real issue after all), but if I trigger sd-example-incoming-call.py and then decline the incoming call the notification doesn't go away (it works fine if I accept the call)

===

I'm calling this in a script:

./sd-example-incoming-call-canceled.py &
./sd-example-incoming-call.py &
./sd-example-incoming-file.py &
./sd-example-morning-alarm.py &
./sd-example-much-body-text.py &
./sd-example-password-entry.py &
./sd-example-simunlock.py &
./sd-example-user-auth.py &
./sd-example-using-button-tint-hint.py &

=> unity crashes.

After that I added a sleep 1 in between the lines, it still causes issues and at some point an empty rectangle appears.

===

If the first notification is expanded, and a new one comes in at position 0, the new one shows up expanded and then quickly collapses.  I think that might be related to this:

125	+ ListView.onAdd: {
126	+ if (notificationList.currentIndex < 1 && notificationList.count > 1) {
127	+ notificationList.currentIndex = 1
128	+ }

The problem here is that you only correct the currentIndex after everything is built up. If you make it a binding it should work better.

===

207	+ wait(500);

Is that a leftover from testing?

===

tests look good. Maybe rename them to give it a more meaningful name? make testVisualQueue does not really tell its notifications.

review: Needs Fixing

Revision history for this message

Mirco Müller (macslow) wrote on 2014-03-17:

#

"15 + var result = "undefined";"
fixed

" small coding style nitpick"
fixed

"Why can't this be a binding in the ListView?..."
fixed

"Not sure if related to this branch (and if its a real issue after all), but if I trigger sd-example-incoming-call.py and then decline the incoming call the notification doesn't go away (it works fine if I accept the call)"
In that example "Decline" is really only for expanding the fake ComboButton to reveal the several real declining options. This will be less confusing once we finally can use the real ComboButton-element from the SDK.

Still working on the other bits.

lp:~macslow/unity8/snap-decisions-states updated on 2014-03-17

542. By Mirco Müller on 2014-03-17: Fixed the first set of issues from the MP-comments.
543. By Mirco Müller on 2014-03-17: More MP-comment fixes.
544. By Mirco Müller on 2014-03-17: Fixing more MP-comments... moving more control to bindings.
545. By Mirco Müller on 2014-03-17: Rename qml-test for visual snap-decision queue to make it more obvious what it is about.
546. By Mirco Müller on 2014-03-17: Typo

Revision history for this message

Mirco Müller (macslow) wrote on 2014-03-17:

#

"If the first notification is expanded, and a new one comes in at position 0..."
fixed

"make testVisualQueue does not really tell its notifications."
fixed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

#

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

review: Needs Fixing (continuous-integration)

lp:~macslow/unity8/snap-decisions-states updated on 2014-03-17

547. By Mirco Müller on 2014-03-17: Merged mzanetti's wait()-crushing power :)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

#

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

review: Needs Fixing (continuous-integration)

lp:~macslow/unity8/snap-decisions-states updated on 2014-03-18

548. By Mirco Müller on 2014-03-18: Got rid of the last wait(), but now have to fight the initialHeight assertion again... :/
549. By Mirco Müller on 2014-03-18: Added another WaitForRendering() to make the test pass again... most of the time :/
550. By Mirco Müller on 2014-03-18: This second waitForRendering() seems to help fix the issue.
551. By Mirco Müller on 2014-03-18: That didn't really help either.
552. By Mirco Müller on 2014-03-18: Rather use implicitHeight then height to get the correct value.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mirco Müller (macslow) wrote on 2014-03-18:

#

Wait() are all gone and the qml-test passes again. Now it's time to look into the crash.

Revision history for this message

Mirco Müller (macslow) wrote on 2014-03-18:

#

The crash no longer happens. But the edge-case of the fullscreen sim-unlock snap-decision needs to be handled in special way. Since there's no UX-design for this, I will suppress it if there are already snap-decisions in queue or avoid new snap-decisions getting displayed, if there's still a fullscreen snap-decision displayed. That has to happen on the backend though.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Needs Fixing (continuous-integration)

lp:~macslow/unity8/snap-decisions-states updated on 2014-03-18

553. By Mirco Müller on 2014-03-18: Forgot to also use the renamed test in the cmakefile.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Needs Fixing (continuous-integration)

lp:~macslow/unity8/snap-decisions-states updated on 2014-03-18

554. By Mirco Müller on 2014-03-18: Possible fix for segfault in notification-qmltest

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-03-19:

#

> The crash no longer happens. But the edge-case of the fullscreen sim-unlock
> snap-decision needs to be handled in special way. Since there's no UX-design
> for this, I will suppress it if there are already snap-decisions in queue or
> avoid new snap-decisions getting displayed, if there's still a fullscreen
> snap-decision displayed. That has to happen on the backend though.

Not sure I understand correctly, what do you mean with suppressing it? Does that mean delaying it or dropping it? I'm not sure we should just drop it while I guess I'm fine with delaying it until the other notifications have been handled.

review: Needs Information

Revision history for this message

Mirco Müller (macslow) wrote on 2014-03-19:

#

With suppressing I mean "avoid the fullscreen/pinpad notification move from the internal snap-decisions queue into the displayed queue" until the displayed queue is empty again, thus the fullscreen/pinpad notification would be the only notification being shown.

The other case would apply as well... "don't let any notification move from an internal queue to the displayed-queue until the the fullscreen/pinpad notification is no longer displayed".

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-03-19:

#

518 + if (mockModel.count > 5) {
537 + if (mockModel.count > 5) {
551 + if (mockModel.count > 5) {

Why is this? You basically disable the whole test for the first 4 runs. Can't just initialize the model with 5+ notifications if you really require them for the test?

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-03-19:

#

> With suppressing I mean "avoid the fullscreen/pinpad notification move from
> the internal snap-decisions queue into the displayed queue" until the
> displayed queue is empty again, thus the fullscreen/pinpad notification would
> be the only notification being shown.
>
> The other case would apply as well... "don't let any notification move from an
> internal queue to the displayed-queue until the the fullscreen/pinpad
> notification is no longer displayed".

ack, so effectively delaying it. works for me.

lp:~macslow/unity8/snap-decisions-states updated on 2014-03-19

555. By Mirco Müller on 2014-03-19: Add the five test Snap-Decisions for the visual-queue test in one go.

Revision history for this message

Mirco Müller (macslow) wrote on 2014-03-19:

#

As discussed on IRC, the initial idea was to add all five snap-decisions in one go, but I didn't know how QML-test's data-concept worked with this. So now the test snap-decisions are added in one step and the data-concept is not used at all.

lp:~macslow/unity8/snap-decisions-states updated on 2014-03-19

556. By Mirco Müller on 2014-03-19: Using the fill-model function from the interactive test.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-03-19:

#

* Did you perform an exploratory manual test run of the code change and any related functionality?

yes

* Did CI run pass? If not, please explain why.

unrelated mediumtests fail

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-19:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-19:

#

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

review: Needs Fixing (continuous-integration)

Unity 8

Merge lp:~macslow/unity8/snap-decisions-states into lp:unity8

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'qml/Notifications/Notification.qml'
 --- qml/Notifications/Notification.qml	2014-01-03 10:29:25 +0000
 +++ qml/Notifications/Notification.qml	2014-03-19 11:24:40 +0000
@@ -39,20 +39,72 @@
      fullscreen: false
      objectName: "background"
--    implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 4) : 0
++    implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
      color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
      opacity: 0
++    state: {
++        var result = "";
++
++        if (type == Notification.SnapDecision) {
++            if (ListView.view.currentIndex == index) {
++                result = "expanded";
++            } else {
++                if (ListView.view.count > 2) {
++                    if (ListView.view.currentIndex == -1 && index == 1) {
++                        result = "expanded";
++                    } else {
++                        result = "contracted";
++                    }
++                } else {
++                    result = "expanded";
++                }
++            }
++        }
++
++        return result;
++    }
++
++    Behavior on height {
++        id: normalHeightBehavior
++
++        //enabled: menuItemFactory.progress == 1
++        enabled: true
++        SequentialAnimation {
++            PauseAnimation {
++                duration: UbuntuAnimation.SnapDuration
++            }
++            UbuntuNumberAnimation {
++                duration: UbuntuAnimation.SnapDuration
++            }
++        }
++    }
++
++    states:[
++        State {
++            name: "contracted"
++            PropertyChanges {target: notification; height: units.gu(8)}
++        },
++        State {
++            name: "expanded"
++            PropertyChanges {target: notification; height: implicitHeight}
++        }
++    ]
++
      clip: fullscreen ? false : true
++
      visible: type != Notification.PlaceHolder
      UbuntuShape {
          id: shapedBack
          visible: !fullscreen
--        anchors.fill: parent
--        anchors.margins: notification.margins
++        anchors {
++            fill: parent
++            leftMargin: notification.margins
++            rightMargin: notification.margins
++        }
          color: parent.color
          opacity: parent.opacity
          radius: "medium"
@@ -104,17 +156,20 @@
          MouseArea {
              id: interactiveArea
--            anchors.fill: contentColumn
++            anchors.fill: parent
              objectName: "interactiveArea"
              onClicked: {
                  if (notification.type == Notification.Interactive) {
                      notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
++                } else {
++                    notificationList.currentIndex = index;
+                 }
+             }
+         }
          Column {
              id: contentColumn
++            objectName: "contentColumn"
              anchors {
                  left: parent.left
@@ -207,6 +262,8 @@
                      model: unityMenuModel
                      NotificationMenuItemFactory {
++                        id: menuItemFactory
++
                          anchors.left: parent.left; anchors.right: parent.right
                          menuModel: unityMenuModel
 === modified file 'qml/Notifications/Notifications.qml'
 --- qml/Notifications/Notifications.qml	2013-12-18 12:50:55 +0000
 +++ qml/Notifications/Notifications.qml	2014-03-19 11:24:40 +0000
@@ -25,6 +25,9 @@
      interactive: false
      property real margin
++    spacing: delegate.fullscreen ? 0 : units.gu(.5)
++
++    currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1
      delegate: Notification {
          objectName: "notification" + index
@@ -75,6 +78,7 @@
      displaced: Transition {
          UbuntuNumberAnimation {
              properties: "x,y"
++            duration: UbuntuAnimation.SnapDuration
+         }
+     }
+ }
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2014-03-14 12:08:44 +0000
 +++ tests/qmltests/CMakeLists.txt	2014-03-19 11:24:40 +0000
@@ -82,6 +82,7 @@
  add_qml_test(Hud Result)
  add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
  add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
++add_qml_test(Notifications VisualSnapDecisionsQueue IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
  add_qml_test(Panel IndicatorRow)
  add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
  add_qml_test(Panel MenuContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 === modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
 --- tests/qmltests/Notifications/tst_Notifications.qml	2014-01-03 10:29:25 +0000
 +++ tests/qmltests/Notifications/tst_Notifications.qml	2014-03-19 11:24:40 +0000
@@ -43,6 +43,21 @@
          function getRaw(id) {
              return mockNotification.createObject(mockModel)
+         }
++
++        // add the default/PlaceHolder notification to the model
++        Component.onCompleted: {
++            var n = {
++                type: Notification.PlaceHolder,
++                hints: {},
++                summary: "",
++                body: "",
++                icon: "",
++                secondaryIcon: "",
++                actions: []
++            }
++
++            append(n)
++        }
+     }
      function addSnapDecisionNotification() {
@@ -376,6 +391,8 @@
              var notification = findChild(notifications, "notification" + (mockModel.count - 1))
              verify(notification !== undefined, "notification wasn't found");
++            waitForRendering(notification);
++
              var icon = findChild(notification, "icon")
              var shapedIcon = findChild(notification, "shapedIcon")
              var nonShapedIcon = findChild(notification, "nonShapedIcon")
@@ -384,7 +401,6 @@
              var summaryLabel = findChild(notification, "summaryLabel")
              var bodyLabel = findChild(notification, "bodyLabel")
              var buttonRow = findChild(notification, "buttonRow")
--            waitForRendering(buttonRow)
              compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
              compare(shapedIcon.visible, data.shapedIcon, "shaped-icon visibility is incorrect")
@@ -407,12 +423,9 @@
                  var buttonCancel = findChild(buttonRow, "button1")
                  var buttonAccept = findChild(buttonRow, "button0")
--                waitForRendering(notification)
--
                  // only test the left/cancel-button if two actions have been passed in
                  if (data.actions.length == 2) {
--                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
--                    actionSpy.wait()
++                    tryCompareFunction(function() { mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2); return actionSpy.signalArguments.length > 0; }, true);
                      compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
                      actionSpy.clear()
+                 }
@@ -421,38 +434,39 @@
                  verify(buttonAccept.gradient === data.buttonTinted ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient, "button has the wrong color-tint")
                  // click the positive/right button
--                mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2)
--                actionSpy.wait()
++                tryCompareFunction(function() { mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2); return actionSpy.signalArguments.length > 0; }, true);
                  compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")
                  actionSpy.clear()
++                waitForRendering(notification)
                  // check if there's more than one negative choice
                  if (data.actions.length > 2) {
--                    var initialHeight = notification.height
++                    var initialHeight = notification.implicitHeight
                      // click to expand
                      mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
--                    waitForRendering(notification)
++                    var contentColumn = findChild(notification, "contentColumn")
++                    var collapsedContentColumnHeight = contentColumn.height;
++                    // Waiting for the inner column to change height because buttons appear
++                    tryCompareFunction(function() { return collapsedContentColumnHeight != contentColumn.height; }, true);
++                    // Waiting for notification to reach its target size
++                    tryCompare(notification, "height", contentColumn.height + contentColumn.spacing * 2)
                      actionSpy.clear()
                      // test the additional buttons
                      for (var i = 2; i < data.actions.length; i++) {
--                        waitForRendering(notification)
                          var buttonColumn = findChild(notification, "buttonColumn")
                          var button = findChild(buttonColumn, "button" + i)
                          mouseClick(button, button.width / 2, button.height / 2)
--                        actionSpy.wait()
                          compare(actionSpy.signalArguments[0][0], data.actions[i]["id"], "got wrong id for additional negative action")
                          actionSpy.clear()
+                     }
                      // click to collapse
                      mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
--                    waitForRendering(notification)
                      tryCompare(notification, "height", initialHeight)
                  } else {
                      mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
--                    actionSpy.wait()
                      compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
+                 }
+             }
 === added file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
 --- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2014-03-19 11:24:40 +0000
@@ -0,0 +1,237 @@
++/*
++ * Copyright (C) 2014 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
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import QtTest 1.0
++import ".."
++import "../../../qml/Notifications"
++import Ubuntu.Components 0.1
++import Unity.Test 0.1
++import Unity.Notifications 1.0
++
++Row {
++    id: rootRow
++
++    Component {
++        id: mockNotification
++
++        QtObject {
++            function invokeAction(actionId) {
++                mockModel.actionInvoked(actionId)
++            }
++        }
++    }
++
++    ListModel {
++        id: mockModel
++
++        signal actionInvoked(string actionId)
++
++        function getRaw(id) {
++            return mockNotification.createObject(mockModel)
++        }
++
++        // add the default/PlaceHolder notification to the model
++        Component.onCompleted: {
++            var n = {
++                type: Notification.PlaceHolder,
++                hints: {},
++                summary: "",
++                body: "",
++                icon: "",
++                secondaryIcon: "",
++                actions: []
++            }
++
++            append(n)
++        }
++    }
++
++    function addSomeSnapDecisionNotifications() {
++        var n = [{
++            type: Notification.SnapDecision,
++            hints: {"x-canonical-private-button-tint": "true"},
++            summary: "Incoming call",
++            body: "Frank Zappa\n+44 (0)7736 027340",
++            icon: "../graphics/avatars/funky.png",
++            secondaryIcon: "../graphics/applicationIcons/phone-app.png",
++            actions: [{ id: "pickup_id", label: "Pick up"},
++                      { id: "decline_1_id", label: "Decline"},
++                      { id: "decline_2_id", label: "Can't talk now, what's up?"},
++                      { id: "decline_3_id", label: "I call you back."},
++                      { id: "decline_4_id", label: "Send custom message..."}]
++        },
++        {
++            type: Notification.SnapDecision,
++            hints: {"x-canonical-private-button-tint": "true",
++                    "x-canonical-non-shaped-icon": "true"},
++            summary: "Incoming file",
++            body: "Frank would like to send you the file: essay.pdf.",
++            icon: "image://theme/search",
++            actions: [{ id: "accept_id", label: "Accept"},
++                      { id: "reject_id", label: "Reject"}]
++        },
++        {
++            type: Notification.SnapDecision,
++            hints: {"x-canonical-private-button-tint": "true",
++                    "x-canonical-non-shaped-icon": "true"},
++            summary: "Authentication error",
++            body: "Please authorise Ubuntu to access your Google account.",
++            icon: "image://theme/search",
++            actions: [{ id: "settings_id", label: "Settings..."},
++                      { id: "cancel_id", label: "Cancel"}]
++        },
++        {
++            type: Notification.SnapDecision,
++            hints: {"x-canonical-private-button-tint": "true",
++                    "x-canonical-non-shaped-icon": "true"},
++            summary: "Morning alarm",
++            body: "It's 6:30... time to get up!",
++            icon: "image://theme/search",
++            actions: [{ id: "ok_reply", label: "Ok"},
++                      { id: "snooze_id", label: "Snooze"}]
++        },
++        {
++            type: Notification.SnapDecision,
++            hints: {"x-canonical-private-button-tint": "true"},
++            summary: "Jenny Sample",
++            body: "Hey there! Have you been watching the latest episode of that TV-show I told you about last week?",
++            icon: "../graphics/avatars/amanda.png",
++            secondaryIcon: "../graphics/applicationIcons/messages-app.png",
++            actions: [{ id: "reply_id", label: "Reply"},
++                      { id: "ignore_id", label: "Ignore"}]
++        }]
++
++        mockModel.append(n)
++    }
++
++    function clearNotifications() {
++        // remove all but the first (PlaceHolder) notification
++        mockModel.remove(1, mockModel.count - 1)
++    }
++
++    function removeTopMostNotification() {
++        // leave real/first (PlaceHolder) notification untouched
++        if (mockModel.count > 1)
++            mockModel.remove(1)
++    }
++
++    Rectangle {
++        id: notificationsRect
++
++        width: units.gu(40)
++        height: units.gu(71)
++
++        MouseArea{
++            id: clickThroughCatcher
++
++            anchors.fill: parent
++        }
++
++        Notifications {
++            id: notifications
++
++            margin: units.gu(1)
++
++            anchors.fill: parent
++            model: mockModel
++        }
++    }
++
++    Rectangle {
++        id: interactiveControls
++
++        width: units.gu(30)
++        height: units.gu(81)
++        color: "grey"
++
++        Column {
++            spacing: units.gu(1)
++            anchors.fill: parent
++            anchors.margins: units.gu(1)
++
++            Button {
++                width: parent.width
++                text: "add some snap-decisions"
++                onClicked: addSomeSnapDecisionNotifications()
++            }
++
++            Button {
++                width: parent.width
++                text: "remove top-most notification"
++                onClicked: removeTopMostNotification()
++            }
++
++            Button {
++                width: parent.width
++                text: "clear model"
++                onClicked: clearNotifications()
++            }
++        }
++    }
++
++    UnityTestCase {
++        id: root
++        name: "VisualQueueTest"
++        when: windowShown
++
++        function test_VisualSnapDecisionsQueue() {
++            // populate model with some mock notifications
++            addSomeSnapDecisionNotifications();
++
++            // make sure the view is properly updated before going on
++            waitForRendering(notifications);
++
++            var snap_decision = [findChild(notifications, "notification1"),
++                                 findChild(notifications, "notification2"),
++                                 findChild(notifications, "notification3"),
++                                 findChild(notifications, "notification4"),
++                                 findChild(notifications, "notification5")]
++
++            for (var index = 0; index < snap_decision.length; index++) {
++                verify(snap_decision[index] !== undefined, index + ". snap-decision wasn't found");
++            }
++
++            // check initial states once all five snap-decisions were appended to the model
++            compare(snap_decision[0].state, "expanded", "state of first snap-decision is not expanded");
++            for (var index = 1; index < snap_decision.length; index++) {
++                compare(snap_decision[index].state, "contracted", "state of "+ index + ".snap-decision is not contracted");
++            }
++
++            // click/tap on each snap-decision and verify only one is in expanded-state at any time
++            for (var index = 0; index < snap_decision.length; index++) {
++                mouseClick(snap_decision[index], snap_decision[index].width / 2, snap_decision[index].height / 2)
++                for (var kindex = 0; kindex < snap_decision.length; kindex++) {
++                    if (kindex == index) {
++                        compare(snap_decision[kindex].state, "expanded", "state of "+ kindex + ".snap-decision is not expanded");
++                    } else {
++                        compare(snap_decision[kindex].state, "contracted", "state of "+ kindex + ".snap-decision is not contracted");
++                    }
++                }
++            }
++
++            // remove top-most and verify one of the remaining ones is still getting expanded
++
++            // make first snap-decision expand
++            mouseClick(snap_decision[0], snap_decision[0].width / 2, snap_decision[0].height / 2);
++
++            for (var index = 1; index < snap_decision.length; index++) {
++                removeTopMostNotification();
++                compare(snap_decision[index].state, "expanded", "state of " + index + ". snap-decision is not expanded");
++            }
++        }
++    }
++}