Merge lp:~macslow/unity8/swipe-to-act-fix-1358343 into lp:unity8

[Mirco Müller]

Added dedicated swipe-to-act button for snap-decisions, which avoids accidental taps/button-presses.

Added dedicated swipe-to-act button for snap-decisions, which avoids accidental taps/button-presses.

You can test it with the examples/sd-example-incoming-call.py Python-script from the corresponding lp:~macslow/unity-notifications/swipe-to-act-fix-1358343 branch.

For the reviewers convenience, here's a video of all two branches in action: http://www.youtube.com/watch?v=bLNWI4GvplQ

* Are there any related MPs required for this MP to build/function as expected? Please list.
Yes. For correct operation lp:~macslow/unity-notifications/swipe-to-act-fix-1358343 needs to be merged to lp:unity-notifications first. Due to changes in trunk lp:~aacid/unity8/multimediaMocks is also needed now.

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

* Did you make sure that your branch does not contain spurious tags?
Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.

* If you changed the UI, has there been a design review?
Yes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1306
http://jenkins.qa.ubuntu.com/job/unity8-ci/4758/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1744/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1854/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1852/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7455/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1307
http://jenkins.qa.ubuntu.com/job/unity8-ci/4760/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6207/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1746/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1856/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1854/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7459/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1308
http://jenkins.qa.ubuntu.com/job/unity8-ci/4761/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6217/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1747
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1855
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5838/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7469
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7469/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15069

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1309
http://jenkins.qa.ubuntu.com/job/unity8-ci/4763/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6224/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1859
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1857
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5844/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7476
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7476/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15078

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Please use Loaders so that either SwipeToAct or the Buttons are created but not both, will save us CPU time and make showing the notification faster since less things need to be created.

review: Needs Fixing

[Albert Astals Cid (aacid)]

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

 * Did CI run pass?
Let's let it run again after the last bunch of changes

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1311
http://jenkins.qa.ubuntu.com/job/unity8-ci/4784/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6282/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1770/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1878
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5892/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7534
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7534/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15176

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1315
http://jenkins.qa.ubuntu.com/job/unity8-ci/4785/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6287/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1881
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1879
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5899/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15186

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

review: Needs Fixing (continuous-integration)

[Josh Arenson (josharenson)]

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

 * Did CI run pass?
No, the usual AP failures.

 * Did you make sure that the branch does not contain spurious tags?
Yes

While I was fairly sure it wouldn't have an effect, I tested this branch with https://code.launchpad.net/~mzanetti/unity8/fix_snap_decision_test-rtm/+merge/238282 merged as well. Everything works as expected.

review: Approve

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/Notifications/tst_Notifications.qml
1 conflicts encountered.

Reminder: Was already top approved, should be again after merge is fixed.

review: Needs Fixing

[lp:~macslow/unity8/swipe-to-act-fix-1358343]

1316. By Mirco Müller on 2014-10-31

Merged with trunk... resolved conflicts.

1317. By Mirco Müller on 2014-10-31

Adapted the SwipeToAct qml-test too after the merge with trunk.

[Albert Astals Cid (aacid)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1317
http://jenkins.qa.ubuntu.com/job/unity8-ci/4800/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6353
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1786
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1894
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5956
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7605
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7605/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15261

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-10-30 21:42:32 +0000
+++ qml/Notifications/Notification.qml	2014-10-31 10:46:25 +0000
@@ -398,7 +398,7 @@
 
                 spacing: contentSpacing
 
-                visible: notification.type == Notification.SnapDecision && oneOverTwoRepeaterTop.count == 3
+                visible: notification.type === Notification.SnapDecision && oneOverTwoRepeaterTop.count === 3
 
                 Repeater {
                     id: oneOverTwoRepeaterTop
@@ -468,22 +468,41 @@
                 spacing: units.gu(2)
                 layoutDirection: Qt.RightToLeft
 
+                Loader {
+                    id: notifySwipeButtonLoader
+                    active: notification.hints["x-canonical-snap-decisions-swipe"] === "true"
+
+                    sourceComponent: SwipeToAct  {
+                        objectName: "notify_swipe_button"
+                        width: buttonRow.width
+                        leftIconName: "call-end"
+                        rightIconName: "call-start"
+                        onLeftTriggered: {
+                            notification.notification.invokeAction(notification.actions.data(0, ActionModel.RoleActionId))
+                        }
+
+                        onRightTriggered: {
+                            notification.notification.invokeAction(notification.actions.data(1, ActionModel.RoleActionId))
+                        }
+                    }
+                }
+
                 Repeater {
                     id: actionRepeater
-
                     model: notification.actions
                     delegate: Loader {
                         id: loader
 
                         property string actionId: id
                         property string actionLabel: label
+                        active: !notifySwipeButtonLoader.active
 
                         Component {
                             id: actionButton
 
                             Button {
                                 objectName: "notify_button" + index
-                                width: buttonRow.width / 2 - spacing*2
+                                width: buttonRow.width / 2 - spacing * 2
                                 text: loader.actionLabel
                                 color: {
                                     var result = sdDarkGrey;

=== added file 'qml/Notifications/SwipeToAct.qml'
--- qml/Notifications/SwipeToAct.qml	1970-01-01 00:00:00 +0000
+++ qml/Notifications/SwipeToAct.qml	2014-10-31 10:46:25 +0000
@@ -0,0 +1,309 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import QtGraphicalEffects 1.0
+
+Item {
+    id: swipeToAct
+
+    width: parent.width
+    height: childrenRect.height
+
+    signal leftTriggered()
+    signal rightTriggered()
+
+    property string leftIconName
+    property string rightIconName
+    readonly property double sliderHeight: units.gu(6)
+    readonly property double gap: units.gu(1)
+    readonly property double halfWay: mouseArea.drag.maximumX / 2
+
+    Rectangle {
+        id: gradient
+        width: parent.width * 5
+        height: sliderHeight
+        visible: false
+        LinearGradient {
+            anchors.fill: parent
+            start: Qt.point(parent.x, parent.y)
+            end: Qt.point(parent.width, parent.y)
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: UbuntuColors.red }
+                GradientStop { position: 0.2; color: UbuntuColors.red }
+                GradientStop { position: 0.4; color: "#dddddd" }
+                GradientStop { position: 0.6; color: "#dddddd" }
+                GradientStop { position: 0.8; color: UbuntuColors.green }
+                GradientStop { position: 1.0; color: UbuntuColors.green }
+            }
+        }
+    }
+
+    ShaderEffectSource {
+        id: effectSourceGradient
+        sourceItem: gradient
+        width: gradient.width
+        height: gradient.height
+        sourceRect: Qt.rect(0.4 * gradient.width * (slider.x / halfWay), 0, mask.width, mask.height)
+        visible: false
+        hideSource: true
+    }
+
+    UbuntuShape {
+        id: mask
+        color: "black"
+        width: parent.width
+        height: sliderHeight
+        borderSource: "none"
+        visible: false
+    }
+
+    ShaderEffectSource {
+        id: effectSourceMask
+        sourceItem: mask
+        width: mask.width
+        height: mask.height
+        visible: false
+        hideSource: true
+    }
+
+    ShaderEffect {
+        width: parent.width
+        height: sliderHeight
+        property variant mask: effectSourceMask
+        property variant gradient: effectSourceGradient
+        vertexShader: "
+            uniform highp mat4 qt_Matrix;
+            attribute highp vec4 qt_Vertex;
+            attribute highp vec2 qt_MultiTexCoord0;
+            varying highp vec2 coord;
+            void main() {
+                coord = qt_MultiTexCoord0;
+                gl_Position = qt_Matrix * qt_Vertex;
+            }"
+        fragmentShader: "
+            varying highp vec2 coord;
+            uniform sampler2D mask;
+            uniform sampler2D gradient;
+            void main() {
+                lowp vec4 texMask = texture2D(mask, coord);
+                lowp vec4 texGradient = texture2D(gradient, coord);
+                gl_FragColor = texGradient.rgba * texMask.a ;
+            }"
+
+        Row {
+            id: row
+            anchors.fill: parent
+            spacing: gap
+            anchors.margins: gap
+
+            UbuntuShape {
+                id: leftShape
+                states: [
+                    State {
+                        name: "normal"
+                        PropertyChanges {
+                            target: leftShape
+                            color: UbuntuColors.red
+                        }
+                        PropertyChanges {
+                            target: innerLeftShape
+                            color: UbuntuColors.red
+                            visible: false
+                        }
+                    },
+                    State {
+                        name: "selected"
+                        PropertyChanges {
+                            target: leftShape
+                            color: "white"
+                        }
+                        PropertyChanges {
+                            target: innerLeftShape
+                            color: UbuntuColors.red
+                            visible: true
+                        }
+                    }
+                ]
+                state: "normal"
+                height: units.gu(4)
+                width: units.gu(7)
+                borderSource: "none"
+                opacity: slider.x <= halfWay ? 1.0 : 1.0 - ((slider.x - halfWay) / halfWay)
+                UbuntuShape {
+                    id: innerLeftShape
+                    anchors.centerIn: parent
+                    borderSource: "none"
+                    width: parent.width - units.gu(.5)
+                    height: parent.height - units.gu(.5)
+                }
+                Icon {
+                    anchors.centerIn: parent
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    name: leftIconName
+                    color: "white"
+                }
+            }
+
+            Rectangle {
+                id: leftSpacer
+                width: (row.width - (leftShape.width + slider.width + rightShape.width + 4 * row.spacing)) / 2
+                height: units.gu(4)
+                opacity: 0
+            }
+
+            UbuntuShape {
+                id: slider
+                objectName: "slider"
+
+                Behavior on x {
+                    UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.FastDuration
+                        easing.type: Easing.OutBounce
+                    }
+                }
+
+                Behavior on opacity {
+                    UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                }
+
+                onOpacityChanged: {
+                    if (opacity === 0) {
+                        if (rightShape.state === "selected") {
+                            rightTriggered()
+                        }
+                        if (leftShape.state === "selected") {
+                            leftTriggered()
+                        }
+                    }
+                }
+
+                z: 1
+                color: "white"
+                height: units.gu(4)
+                width: units.gu(7)
+                borderSource: "none"
+                Row {
+                    anchors.fill: parent
+                    spacing: 2 * gap
+                    anchors.leftMargin: units.gu(.5)
+                    anchors.rightMargin: units.gu(.5)
+                    Icon {
+                        anchors.verticalCenter: parent.verticalCenter
+                        name: "back"
+                        width: units.gu(2)
+                        height: units.gu(2)
+                    }
+                    Icon {
+                        anchors.verticalCenter: parent.verticalCenter
+                        name: "next"
+                        width: units.gu(2)
+                        height: units.gu(2)
+                    }
+                }
+            }
+
+            Rectangle {
+                id: rightSpacer
+                width: leftSpacer.width
+                height: units.gu(4)
+                opacity: 0
+            }
+
+            UbuntuShape {
+                id: rightShape
+                states: [
+                    State {
+                        name: "normal"
+                        PropertyChanges {
+                            target: rightShape
+                            color: UbuntuColors.green
+                        }
+                        PropertyChanges {
+                            target: innerRightShape
+                            color: UbuntuColors.green
+                            visible: false
+                        }
+                    },
+                    State {
+                        name: "selected"
+                        PropertyChanges {
+                            target: rightShape
+                            color: "white"
+                        }
+                        PropertyChanges {
+                            target: innerRightShape
+                            color: UbuntuColors.green
+                            visible: true
+                        }
+                    }
+                ]
+                state: "normal"
+                height: units.gu(4)
+                width: units.gu(7)
+                borderSource: "none"
+                opacity: slider.x >= halfWay ? 1.0 : slider.x / halfWay
+                UbuntuShape {
+                    id: innerRightShape
+                    anchors.centerIn: parent
+                    borderSource: "none"
+                    width: parent.width - units.gu(.5)
+                    height: parent.height - units.gu(.5)
+                }
+                Icon {
+                    anchors.centerIn: parent
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    name: rightIconName
+                    color: "white"
+                }
+            }
+        }
+
+        MouseArea {
+            id: mouseArea
+            objectName: "swipeMouseArea"
+
+            anchors.fill: row
+            drag.target: slider
+            drag.axis: Drag.XAxis
+            drag.minimumX: 0
+            drag.maximumX: row.width - slider.width
+
+            onReleased: {
+                if (slider.x !== drag.minimumX || slider.x !== drag.maximumX) {
+                    slider.x = halfWay
+                }
+                if (slider.x === drag.minimumX) {
+                    slider.x = drag.minimumX
+                    slider.opacity = 0
+                    enabled = false
+                    leftShape.state = "selected"
+                }
+                if (slider.x === drag.maximumX) {
+                    slider.x = drag.maximumX
+                    slider.opacity = 0
+                    enabled = false
+                    rightShape.state = "selected"
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-10-30 21:43:06 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-10-31 10:46:25 +0000
@@ -157,57 +157,6 @@
 
         self.assert_notification_action_id_was_called('action_id')
 
-    def test_sd_incoming_call(self):
-        """Rejecting a call should make notification expand and
-            offer more options."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
-
-        summary = "Incoming call"
-        body = "Frank Zappa\n+44 (0)7736 027340"
-        icon_path = self._get_icon_path('avatars/anna_olsson.png')
-        hints = [
-            ("x-canonical-secondary-icon", "incoming-call"),
-            ("x-canonical-snap-decisions", "true"),
-            ("x-canonical-private-affirmative-tint", "true"),
-            ("x-canonical-private-rejection-tint", "true"),
-        ]
-
-        actions = [
-            ('action_accept', 'Hold + Answer'),
-            ('action_decline_1', 'End + Answer'),
-            ('action_decline_2', 'Decline'),
-            ('action_decline_3', 'message:I missed your call - can you call me now?'),
-            ('action_decline_4', 'message:I\'m running late. I\'m on my way.'),
-            ('action_decline_5', 'message:I\'m busy at the moment. I\'ll call later.'),
-            ('action_decline_6', 'edit:Custom'),
-        ]
-
-        self._create_interactive_notification(
-            summary,
-            body,
-            icon_path,
-            "NORMAL",
-            actions,
-            hints
-        )
-
-        notify_list = self._get_notifications_list()
-        get_notification = lambda: notify_list.wait_select_single(
-            'Notification', objectName='notification1')
-        notification = get_notification()
-        self._assert_notification(notification, summary, body, True, True, 1.0)
-        notification.pointing_device.click_object(
-            notification.select_single(objectName="combobutton_dropdown"))
-        self.assertThat(
-            notification.select_single(objectName="notify_button2").expanded,
-            Eventually(Equals(True)))
-        time.sleep(2)
-        notification.pointing_device.click_object(
-            notification.select_single(objectName="notify_button4"))
-        self.assert_notification_action_id_was_called("action_decline_4")
-
-
     def test_sd_one_over_two_layout(self):
         """Snap-decision with three actions should use one-over two button layout."""
         unity_proxy = self.launch_unity()

=== modified file 'tests/mocks/Unity/Notifications/CMakeLists.txt'
--- tests/mocks/Unity/Notifications/CMakeLists.txt	2014-05-02 23:27:02 +0000
+++ tests/mocks/Unity/Notifications/CMakeLists.txt	2014-10-31 10:46:25 +0000
@@ -1,1 +1,15 @@
-add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications)
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(MockNotificationsPlugin_SOURCES
+    plugin.cpp
+    MockNotificationTypes.cpp
+    MockActionModel.cpp
+)
+
+add_library(MockNotificationsPlugin MODULE ${MockNotificationsPlugin_SOURCES})
+
+qt5_use_modules(MockNotificationsPlugin Core Quick)
+
+add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications TARGETS MockNotificationsPlugin)

=== added file 'tests/mocks/Unity/Notifications/MockActionModel.cpp'
--- tests/mocks/Unity/Notifications/MockActionModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockActionModel.cpp	2014-10-31 10:46:25 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#include "MockActionModel.h"
+
+struct ActionModelPrivate {
+    QList<QString> labels;
+    QList<QString> ids;
+};
+
+ActionModel::ActionModel(QObject *parent) : QStringListModel(parent), p(new ActionModelPrivate) {
+    insertAction("ok_id", "Ok");
+    insertAction("cancel_id", "Cancel");
+}
+
+ActionModel::~ActionModel() {
+}
+
+int ActionModel::rowCount(const QModelIndex &index) const {
+    return p->labels.size();
+}
+
+QVariant ActionModel::data(const QModelIndex &index, int role) const {
+    if (!index.isValid())
+            return QVariant();
+
+    switch(role) {
+        case RoleActionLabel:
+            return QVariant(p->labels[index.row()]);
+
+        case RoleActionId:
+            return QVariant(p->ids[index.row()]);
+
+        default:
+            return QVariant();
+    }
+}
+
+QHash<int, QByteArray> ActionModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+
+    roles.insert(RoleActionLabel, "label");
+    roles.insert(RoleActionId, "id");
+
+    return roles;
+}
+
+Q_INVOKABLE QVariant ActionModel::data(int row, int role) const
+{
+    return data(index(row, 0), role);
+}
+
+void ActionModel::insertAction(const QString &id, const QString &label) {
+    p->ids.push_back(id);
+    p->labels.push_back(label);
+}

=== added file 'tests/mocks/Unity/Notifications/MockActionModel.h'
--- tests/mocks/Unity/Notifications/MockActionModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockActionModel.h	2014-10-31 10:46:25 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#ifndef MOCK_ACTION_MODEL_H
+#define MOCK_ACTION_MODEL_H
+
+#include <QStringListModel>
+
+struct ActionModelPrivate;
+
+class ActionModel : public QStringListModel {
+    Q_OBJECT
+
+public:
+    ActionModel(QObject *parent=nullptr);
+    virtual ~ActionModel();
+
+    virtual int rowCount(const QModelIndex &index) const;
+    virtual QVariant data(const QModelIndex &index, int role) const;
+    virtual QHash<int, QByteArray> roleNames() const;
+
+    Q_ENUMS(ActionsRoles)
+    enum ActionsRoles {
+        RoleActionLabel = Qt::UserRole + 1,
+        RoleActionId    = Qt::UserRole + 2
+    };
+    Q_INVOKABLE QVariant data(int row, int role) const;
+
+    void insertAction(const QString &id, const QString &label);
+
+private:
+    QScopedPointer<ActionModelPrivate> p;
+};
+
+#endif // MOCK_ACTION_MODEL_H

=== added file 'tests/mocks/Unity/Notifications/MockNotificationTypes.cpp'
--- tests/mocks/Unity/Notifications/MockNotificationTypes.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockNotificationTypes.cpp	2014-10-31 10:46:25 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#include "MockNotificationTypes.h"
+
+MockNotification::MockNotification(QObject *parent) : QObject(parent) {
+}
+
+MockNotification::~MockNotification() {
+}

=== added file 'tests/mocks/Unity/Notifications/MockNotificationTypes.h'
--- tests/mocks/Unity/Notifications/MockNotificationTypes.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockNotificationTypes.h	2014-10-31 10:46:25 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#ifndef MOCK_NOTIFICATION_TYPES_H
+#define MOCK_NOTIFICATION_TYPES_H
+
+#include <QObject>
+
+class MockNotification : public QObject {
+    Q_OBJECT
+    Q_ENUMS(Type)
+
+public:
+    MockNotification(QObject *parent=nullptr);
+    virtual ~MockNotification();
+
+    enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };
+};
+
+#endif // MOCK_NOTIFICATION_TYPES_H

=== removed file 'tests/mocks/Unity/Notifications/notification.js'
--- tests/mocks/Unity/Notifications/notification.js	2013-06-19 10:24:31 +0000
+++ tests/mocks/Unity/Notifications/notification.js	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2013 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/>.
- */
-
-.pragma library
-
-var Confirmation = 0;
-var Ephemeral = 1;
-var Interactive = 2;
-var SnapDecision = 3;
-var PlaceHolder = 4;

=== added file 'tests/mocks/Unity/Notifications/plugin.cpp'
--- tests/mocks/Unity/Notifications/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/plugin.cpp	2014-10-31 10:46:25 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#include "plugin.h"
+#include "MockActionModel.h"
+#include "MockNotificationTypes.h"
+
+#include <QtQml/qqml.h>
+
+void TestNotificationPlugin::registerTypes(const char* uri)
+{
+    // @uri Unity.Notifications
+    qmlRegisterUncreatableType<MockNotification>(uri, 1, 0, "Notification", "Notification objects can only be created by the plugin");
+    qmlRegisterType<ActionModel>(uri, 1, 0, "ActionModel");
+}

=== added file 'tests/mocks/Unity/Notifications/plugin.h'
--- tests/mocks/Unity/Notifications/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/plugin.h	2014-10-31 10:46:25 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+
+#ifndef TESTNOTIFICATION_PLUGIN_H
+#define TESTNOTIFICATION_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class TestNotificationPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char* uri);
+};
+
+#endif // TESTNOTIFICATION_PLUGIN_H

=== modified file 'tests/mocks/Unity/Notifications/qmldir'
--- tests/mocks/Unity/Notifications/qmldir	2014-05-02 22:57:21 +0000
+++ tests/mocks/Unity/Notifications/qmldir	2014-10-31 10:46:25 +0000
@@ -1,3 +1,4 @@
 module Unity.Notifications
-Notification 1.0 notification.js
+plugin MockNotificationsPlugin
 typeinfo Notifications.qmltypes
+

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-10-13 09:23:34 +0000
+++ tests/qmltests/CMakeLists.txt	2014-10-31 10:46:25 +0000
@@ -70,6 +70,7 @@
 add_qml_test(Launcher Launcher)
 add_qml_test(Notifications Notifications)
 add_qml_test(Notifications VisualSnapDecisionsQueue)
+add_qml_test(Notifications SwipeToAct)
 add_qml_test(Panel ActiveCallHint)
 add_qml_test(Panel IndicatorItem)
 add_qml_test(Panel IndicatorItemRow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
--- tests/qmltests/Notifications/tst_Notifications.qml	2014-10-14 10:07:44 +0000
+++ tests/qmltests/Notifications/tst_Notifications.qml	2014-10-31 10:46:25 +0000
@@ -23,280 +23,51 @@
 import Unity.Notifications 1.0
 import QtMultimedia 5.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: {
+Item {
+    width: notificationsRect.width + interactiveControls.width
+    height: notificationsRect.height
+
+    Row {
+        id: rootRow
+
+        Component {
+            id: mockNotification
+
+            QtObject {
+                function invokeAction(actionId) {
+                    mockModel.actionInvoked(actionId)
+                }
+            }
+        }
+
+        ListModel {
+            id: mockModel
+            dynamicRoles: true
+
+            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 addSnapDecisionNotification() {
             var n = {
-                type: Notification.PlaceHolder,
-                hints: {},
-                summary: "",
-                body: "",
-                icon: "",
-                value: 0,
-                secondaryIcon: "",
-                actions: []
-            }
-
-            append(n)
-        }
-    }
-
-    function addSnapDecisionNotification() {
-        var n = {
-            type: Notification.SnapDecision,
-            hints: {"x-canonical-private-affirmative-tint": "true"},
-            summary: "Tom Ato",
-            body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
-            icon: "../graphics/avatars/funky.png",
-            secondaryIcon: "../graphics/applicationIcons/facebook.png",
-            actions: [{ id: "ok_id", label: "Ok"},
-                      { id: "cancel_id", label: "Cancel"},
-                      { id: "notreally_id", label: "Not really"},
-                      { id: "noway_id", label: "messages:No way"},
-                      { id: "nada_id", label: "messages:Nada"}]
-        }
-
-        mockModel.append(n)
-    }
-
-    function add2over1SnapDecisionNotification() {
-        var n = {
-            type: Notification.SnapDecision,
-            hints: {"x-canonical-private-affirmative-tint": "true",},
-            summary: "Theatre at Ferria Stadium",
-            body: "at Ferria Stadium in Bilbao, Spain\n07578545317",
-            icon: "",
-            secondaryIcon: "",
-            actions: [{ id: "ok_id", label: "Ok"},
-                      { id: "snooze_id", label: "Snooze"},
-                      { id: "view_id", label: "View"}]
-        }
-
-        mockModel.append(n)
-    }
-
-    function addEphemeralNotification() {
-        var n = {
-            type: Notification.Ephemeral,
-            summary: "Cole Raby",
-            body: "I did not expect it to be that late.",
-            icon: "../graphics/avatars/amanda.png",
-            secondaryIcon: "../graphics/applicationIcons/facebook.png",
-            actions: []
-        }
-
-        mockModel.append(n)
-    }
-
-    function addEphemeralNonShapedIconNotification() {
-        var n = {
-            type: Notification.Ephemeral,
-            hints: {"x-canonical-non-shaped-icon": "true"},
-            summary: "Contacts",
-            body: "Synchronised contacts-database with cloud-storage.",
-            icon: "../graphics/applicationIcons/contacts-app.png",
-            secondaryIcon: "",
-            actions: []
-        }
-
-        mockModel.append(n)
-    }
-
-    function addEphemeralIconSummaryNotification() {
-        var n = {
-            type: Notification.Ephemeral,
-            hints: {"x-canonical-non-shaped-icon": "false"},
-            summary: "Photo upload completed",
-            body: "",
-            icon: "../graphics/applicationIcons/facebook.png",
-            secondaryIcon: "",
-            actions: []
-        }
-
-        mockModel.append(n)
-    }
-
-    function addInteractiveNotification() {
-        var n = {
-            type: Notification.Interactive,
-            summary: "Interactive notification",
-            body: "This is a notification that can be clicked",
-            icon: "../graphics/avatars/anna_olsson.png",
-            secondaryIcon: "",
-            actions: [{ id: "reply_id", label: "Dummy"}],
-        }
-
-        mockModel.append(n)
-    }
-
-    function addConfirmationNotification() {
-        var n = {
-            type: Notification.Confirmation,
-            hints: {"x-canonical-non-shaped-icon": "true"},
-            summary: "Confirmation notification",
-            body: "",
-            icon: "image://theme/audio-volume-medium",
-            secondaryIcon: "",
-            value: 50,
-            actions: [],
-        }
-
-        mockModel.append(n)
-    }
-
-    function add2ndConfirmationNotification() {
-        var n = {
-            type: Notification.Confirmation,
-            hints: {"x-canonical-non-shaped-icon": "true",
-                    "x-canonical-value-bar-tint": "true"},
-            summary: "Confirmation notification",
-            body: "High Volume",
-            icon: "image://theme/audio-volume-high",
-            secondaryIcon: "",
-            value: 85,
-            actions: [],
-        }
-
-        mockModel.append(n)
-    }
-
-    function clearNotifications() {
-        while(mockModel.count > 1) {
-            remove1stNotification()
-        }
-    }
-
-    function remove1stNotification() {
-        if (mockModel.count > 1)
-            mockModel.remove(1)
-    }
-
-    Rectangle {
-        id: notificationsRect
-
-        width: units.gu(40)
-        height: units.gu(115)
-
-        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(115)
-        color: "grey"
-
-        Column {
-            spacing: units.gu(1)
-            anchors.fill: parent
-            anchors.margins: units.gu(1)
-
-            Button {
-                width: parent.width
-                text: "add a snap-decision"
-                onClicked: addSnapDecisionNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add a 2over1 snap-decision"
-                onClicked: add2over1SnapDecisionNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add an ephemeral"
-                onClicked: addEphemeralNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add an non-shaped-icon-summary-body"
-                onClicked: addEphemeralNonShapedIconNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add an icon-summary"
-                onClicked: addEphemeralIconSummaryNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add an interactive"
-                onClicked: addInteractiveNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add a confirmation"
-                onClicked: addConfirmationNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add a 2nd confirmation"
-                onClicked: add2ndConfirmationNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "remove 1st notification"
-                onClicked: remove1stNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "clear model"
-                onClicked: clearNotifications()
-            }
-        }
-    }
-
-    UnityTestCase {
-        id: root
-        name: "NotificationRendererTest"
-        when: windowShown
-
-        function test_NotificationRenderer_data() {
-            return [
-            {
-                tag: "Snap Decision with secondary icon and button-tint",
                 type: Notification.SnapDecision,
                 hints: {"x-canonical-private-affirmative-tint": "true"},
                 summary: "Tom Ato",
@@ -307,23 +78,14 @@
                           { id: "cancel_id", label: "Cancel"},
                           { id: "notreally_id", label: "Not really"},
                           { id: "noway_id", label: "messages:No way"},
-                          { id: "nada_id", label: "messages:Nada"}],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                nonShaped: false,
-                secondaryIconVisible: true,
-                buttonRowVisible: true,
-                buttonTinted: true,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "2-over-1 Snap Decision with button-tint",
+                          { id: "nada_id", label: "messages:Nada"}]
+            }
+
+            mockModel.append(n)
+        }
+
+        function add2over1SnapDecisionNotification() {
+            var n = {
                 type: Notification.SnapDecision,
                 hints: {"x-canonical-private-affirmative-tint": "true"},
                 summary: "Theatre at Ferria Stadium",
@@ -332,327 +94,573 @@
                 secondaryIcon: "",
                 actions: [{ id: "ok_id", label: "Ok"},
                           { id: "snooze_id", label: "Snooze"},
-                          { id: "view_id", label: "View"}],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: false,
-                centeredIconVisible: false,
-                shaped: false,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: true,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Ephemeral notification - icon-summary layout",
-                type: Notification.Ephemeral,
-                hints: {},
+                          { id: "view_id", label: "View"}]
+            }
+
+            mockModel.append(n)
+        }
+
+        function addEphemeralNotification() {
+            var n = {
+                type: Notification.Ephemeral,
+                summary: "Cole Raby",
+                body: "I did not expect it to be that late.",
+                icon: "../graphics/avatars/amanda.png",
+                secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                actions: []
+            }
+
+            mockModel.append(n)
+        }
+
+        function addEphemeralNonShapedIconNotification() {
+            var n = {
+                type: Notification.Ephemeral,
+                hints: {"x-canonical-non-shaped-icon": "true"},
+                summary: "Contacts",
+                body: "Synchronised contacts-database with cloud-storage.",
+                icon: "../graphics/applicationIcons/contacts-app.png",
+                secondaryIcon: "",
+                actions: []
+            }
+
+            mockModel.append(n)
+        }
+
+        function addEphemeralIconSummaryNotification() {
+            var n = {
+                type: Notification.Ephemeral,
+                hints: {"x-canonical-non-shaped-icon": "false"},
                 summary: "Photo upload completed",
                 body: "",
                 icon: "../graphics/applicationIcons/facebook.png",
                 secondaryIcon: "",
-                actions: [],
-                summaryVisible: true,
-                bodyVisible: false,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
-                type: Notification.Ephemeral,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "sound-file": "dummy.ogg",
-                        "suppress-sound": "true"},
-                summary: "New comment successfully published",
-                body: "",
-                icon: "",
-                secondaryIcon: "../graphics/applicationIcons/facebook.png",
-                actions: [],
-                summaryVisible: true,
-                bodyVisible: false,
-                interactiveAreaEnabled: false,
-                iconVisible: false,
-                centeredIconVisible: false,
-                shaped: false,
-                secondaryIconVisible: true,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Interactive notification",
+                actions: []
+            }
+
+            mockModel.append(n)
+        }
+
+        function addInteractiveNotification() {
+            var n = {
                 type: Notification.Interactive,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "sound-file": "dummy.ogg"},
                 summary: "Interactive notification",
                 body: "This is a notification that can be clicked",
-                icon: "../graphics/avatars/amanda.png",
+                icon: "../graphics/avatars/anna_olsson.png",
                 secondaryIcon: "",
                 actions: [{ id: "reply_id", label: "Dummy"}],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: true,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Snap Decision without secondary icon and no button-tint",
-                type: Notification.SnapDecision,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "sound-file": "dummy.ogg"},
-                summary: "Bro Coly",
-                body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
-                icon: "../graphics/avatars/anna_olsson.png",
-                secondaryIcon: "",
-                actions: [{ id: "accept_id", label: "Accept"},
-                          { id: "reject_id", label: "Reject"}],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                secondaryIconVisible: false,
-                buttonRowVisible: true,
-                buttonTinted: false,
-                hasSound: true,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Ephemeral notification",
-                type: Notification.Ephemeral,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "sound-file": "dummy.ogg"},
-                summary: "Cole Raby",
-                body: "I did not expect it to be that late.",
-                icon: "../graphics/avatars/funky.png",
-                secondaryIcon: "../graphics/applicationIcons/facebook.png",
-                actions: [],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                secondaryIconVisible: true,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: true,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Ephemeral notification with non-shaped icon",
-                type: Notification.Ephemeral,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "x-canonical-non-shaped-icon": "true"},
-                summary: "Contacts",
-                body: "Synchronised contacts-database with cloud-storage.",
-                icon: "image://theme/contacts-app",
-                secondaryIcon: "",
-                actions: [],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: false,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Confirmation notification with value",
+            }
+
+            mockModel.append(n)
+        }
+
+        function addConfirmationNotification() {
+            var n = {
                 type: Notification.Confirmation,
                 hints: {"x-canonical-non-shaped-icon": "true"},
-                summary: "",
+                summary: "Confirmation notification",
                 body: "",
                 icon: "image://theme/audio-volume-medium",
                 secondaryIcon: "",
                 value: 50,
                 actions: [],
-                summaryVisible: false,
-                bodyVisible: false,
-                iconVisible: false,
-                centeredIconVisible: true,
-                shaped: false,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: true,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Confirmation notification with value, label and tint",
+            }
+
+            mockModel.append(n)
+        }
+
+        function add2ndConfirmationNotification() {
+            var n = {
                 type: Notification.Confirmation,
                 hints: {"x-canonical-non-shaped-icon": "true",
-                        "x-canonical-value-bar-tint" : "true"},
-                summary: "",
+                        "x-canonical-value-bar-tint": "true"},
+                summary: "Confirmation notification",
                 body: "High Volume",
                 icon: "image://theme/audio-volume-high",
                 secondaryIcon: "",
                 value: 85,
                 actions: [],
-                summaryVisible: false,
-                bodyVisible: false,
-                iconVisible: false,
-                centeredIconVisible: true,
-                shaped: false,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: true,
-                valueLabelVisible: true,
-                valueTinted: true
-            }
-            ]
-        }
-
-        SignalSpy {
-            id: clickThroughSpy
-
-            target: clickThroughCatcher
-            signalName: "clicked"
-        }
-
-        SignalSpy {
-            id: actionSpy
-
-            target: mockModel
-            signalName: "actionInvoked"
-        }
-
-        function cleanup() {
-            clickThroughSpy.clear()
-            actionSpy.clear()
-        }
-
-        function test_NotificationRenderer(data) {
-            // populate model with some mock notifications
-            mockModel.append(data)
-
-            // make sure the view is properly updated before going on
-            notifications.forceLayout();
-            waitForRendering(notifications);
-
-            var notification = findChild(notifications, "notification" + (mockModel.count - 1))
-            verify(notification !== undefined, "notification wasn't found");
-
-            waitForRendering(notification);
-
-            var icon = findChild(notification, "icon")
-            var centeredIcon = findChild(notification, "centeredIcon")
-            var interactiveArea = findChild(notification, "interactiveArea")
-            var secondaryIcon = findChild(notification, "secondaryIcon")
-            var summaryLabel = findChild(notification, "summaryLabel")
-            var bodyLabel = findChild(notification, "bodyLabel")
-            var buttonRow = findChild(notification, "buttonRow")
-            var valueIndicator = findChild(notification, "valueIndicator")
-            var valueLabel = findChild(notification, "valueLabel")
-            var innerBar = findChild(notification, "innerBar")
-
-            compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
-            if (icon.visible) {
-                compare(icon.shaped, data.shaped, "shaped-status is incorrect")
-            }
-            compare(centeredIcon.visible, data.centeredIconVisible, "centered-icon visibility is incorrect")
-            if (centeredIcon.visible) {
-                compare(centeredIcon.shaped, data.shaped, "shaped-status is incorrect")
-            }
-            compare(valueIndicator.visible, data.valueVisible, "value-indicator visibility is incorrect")
-            if (valueIndicator.visible) {
-                verify(innerBar.color === data.valueTinted ? UbuntuColors.orange : "white", "value-bar has the wrong color-tint")
-            }
-            compare(valueLabel.visible, data.valueLabelVisible, "value-label visibility is incorrect")
-
-            // test input does not fall through
-            mouseClick(notification, notification.width / 2, notification.height / 2)
-            if(data.type == Notification.Interactive) {
-                actionSpy.wait()
-                compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
-            }
-            compare(clickThroughSpy.count, 0, "click on notification fell through")
-
-            compare(secondaryIcon.visible, data.secondaryIconVisible, "secondary-icon visibility is incorrect")
-            compare(summaryLabel.visible, data.summaryVisible, "summary-text visibility is incorrect")
-            compare(bodyLabel.visible, data.bodyVisible, "body-text visibility is incorrect")
-            compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
-
-            var audioItem = findInvisibleChild(notification, "sound")
-            compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")
-
-            if(data.buttonRowVisible) {
-                var buttonCancel = findChild(buttonRow, "notify_button1")
-                var buttonAccept = findChild(buttonRow, "notify_button0")
-
-                // only test the left/cancel-button if two actions have been passed in
-                if (data.actions.length == 2) {
-                    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()
-                }
-
-                // check the tinting of the positive/right button
-                verify(buttonAccept.color === data.buttonTinted ? "#3fb24f" : "#dddddd", "button has the wrong color-tint")
-
-                // click the positive/right button
-                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")
+            }
+
+            mockModel.append(n)
+        }
+
+        function clearNotifications() {
+            while(mockModel.count > 1) {
+                remove1stNotification()
+            }
+        }
+
+        function remove1stNotification() {
+            if (mockModel.count > 1)
+                mockModel.remove(1)
+        }
+
+        Rectangle {
+            id: notificationsRect
+
+            width: units.gu(40)
+            height: units.gu(115)
+
+            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(115)
+            color: "grey"
+
+            Column {
+                spacing: units.gu(1)
+                anchors.fill: parent
+                anchors.margins: units.gu(1)
+
+                Button {
+                    width: parent.width
+                    text: "add a snap-decision"
+                    onClicked: rootRow.addSnapDecisionNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add a 2over1 snap-decision"
+                    onClicked: rootRow.add2over1SnapDecisionNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add an ephemeral"
+                    onClicked: rootRow.addEphemeralNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add an non-shaped-icon-summary-body"
+                    onClicked: rootRow.addEphemeralNonShapedIconNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add an icon-summary"
+                    onClicked: rootRow.addEphemeralIconSummaryNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add an interactive"
+                    onClicked: rootRow.addInteractiveNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add a confirmation"
+                    onClicked: rootRow.addConfirmationNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add a 2nd confirmation"
+                    onClicked: rootRow.add2ndConfirmationNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "remove 1st notification"
+                    onClicked: rootRow.remove1stNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "clear model"
+                    onClicked: rootRow.clearNotifications()
+                }
+            }
+        }
+
+        ActionModel {
+            id: myActionModel
+        }
+
+        UnityTestCase {
+            id: root
+            name: "NotificationRendererTest"
+            when: windowShown
+
+            function test_NotificationRenderer_data() {
+                return [
+                {
+                    tag: "Snap Decision with secondary icon and button-tint",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-private-affirmative-tint": "true"},
+                    summary: "Tom Ato",
+                    body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
+                    icon: "../graphics/avatars/funky.png",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: [{ id: "ok_id", label: "Ok"},
+                              { id: "cancel_id", label: "Cancel"},
+                              { id: "notreally_id", label: "Not really"},
+                              { id: "noway_id", label: "messages:No way"},
+                              { id: "nada_id", label: "messages:Nada"}],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: true,
+                    buttonTinted: true,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "2-over-1 Snap Decision with button-tint",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-private-affirmative-tint": "true"},
+                    summary: "Theatre at Ferria Stadium",
+                    body: "at Ferria Stadium in Bilbao, Spain\n07578545317",
+                    icon: "",
+                    secondaryIcon: "",
+                    actions: [{ id: "ok_id", label: "Ok"},
+                              { id: "snooze_id", label: "Snooze"},
+                              { id: "view_id", label: "View"}],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: false,
+                    centeredIconVisible: false,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: true,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Ephemeral notification - icon-summary layout",
+                    type: Notification.Ephemeral,
+                    hints: {},
+                    summary: "Photo upload completed",
+                    body: "",
+                    icon: "../graphics/applicationIcons/facebook.png",
+                    secondaryIcon: "",
+                    actions: [],
+                    summaryVisible: true,
+                    bodyVisible: false,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
+                    type: Notification.Ephemeral,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "sound-file": "dummy.ogg",
+                            "suppress-sound": "true"},
+                    summary: "New comment successfully published",
+                    body: "",
+                    icon: "",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: [],
+                    summaryVisible: true,
+                    bodyVisible: false,
+                    interactiveAreaEnabled: false,
+                    iconVisible: false,
+                    centeredIconVisible: false,
+                    shaped: false,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Interactive notification",
+                    type: Notification.Interactive,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "sound-file": "dummy.ogg"},
+                    summary: "Interactive notification",
+                    body: "This is a notification that can be clicked",
+                    icon: "../graphics/avatars/amanda.png",
+                    secondaryIcon: "",
+                    actions: [{ id: "reply_id", label: "Dummy"}],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: true,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Snap Decision without secondary icon and no button-tint",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "sound-file": "dummy.ogg"},
+                    summary: "Bro Coly",
+                    body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
+                    icon: "../graphics/avatars/anna_olsson.png",
+                    secondaryIcon: "",
+                    actions: [{ id: "accept_id", label: "Accept"},
+                              { id: "reject_id", label: "Reject"}],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: true,
+                    buttonTinted: false,
+                    hasSound: true,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Ephemeral notification",
+                    type: Notification.Ephemeral,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "sound-file": "dummy.ogg"},
+                    summary: "Cole Raby",
+                    body: "I did not expect it to be that late.",
+                    icon: "../graphics/avatars/funky.png",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: [],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: true,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Ephemeral notification with non-shaped icon",
+                    type: Notification.Ephemeral,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "x-canonical-non-shaped-icon": "true"},
+                    summary: "Contacts",
+                    body: "Synchronised contacts-database with cloud-storage.",
+                    icon: "image://theme/contacts-app",
+                    secondaryIcon: "",
+                    actions: [],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Confirmation notification with value",
+                    type: Notification.Confirmation,
+                    hints: {"x-canonical-non-shaped-icon": "true"},
+                    summary: "",
+                    body: "",
+                    icon: "image://theme/audio-volume-medium",
+                    secondaryIcon: "",
+                    value: 50,
+                    actions: [],
+                    summaryVisible: false,
+                    bodyVisible: false,
+                    iconVisible: false,
+                    centeredIconVisible: true,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: true,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Confirmation notification with value, label and tint",
+                    type: Notification.Confirmation,
+                    hints: {"x-canonical-non-shaped-icon": "true",
+                            "x-canonical-value-bar-tint" : "true"},
+                    summary: "",
+                    body: "High Volume",
+                    icon: "image://theme/audio-volume-high",
+                    secondaryIcon: "",
+                    value: 85,
+                    actions: [],
+                    summaryVisible: false,
+                    bodyVisible: false,
+                    iconVisible: false,
+                    centeredIconVisible: true,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: true,
+                    valueLabelVisible: true,
+                    valueTinted: true
+                }
+                ]
+            }
+
+            SignalSpy {
+                id: clickThroughSpy
+
+                target: clickThroughCatcher
+                signalName: "clicked"
+            }
+
+            SignalSpy {
+                id: actionSpy
+
+                target: mockModel
+                signalName: "actionInvoked"
+            }
+
+            function cleanup() {
+                clickThroughSpy.clear()
                 actionSpy.clear()
-                waitForRendering(notification)
-
-                // check if there's a ComboButton created due to more actions being passed
-                if (data.actions.length > 2) {
-                    var comboButton = findChild(notification, "notify_button2")
-                    tryCompareFunction(function() { return comboButton.expanded == false; }, true);
-
-                    // click to expand
-                    tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == true; }, true);
-
-                    // try clicking on choices in expanded comboList
-                    var choiceButton1 = findChild(notification, "notify_button3")
-                    tryCompareFunction(function() { mouseClick(choiceButton1, choiceButton1.width / 2, choiceButton1.height / 2); return actionSpy.signalArguments.length > 0; }, true);
-                    compare(actionSpy.signalArguments[0][0], data.actions[3]["id"], "got wrong id choice action 1")
-                    actionSpy.clear()
-
-                    var choiceButton2 = findChild(notification, "notify_button4")
-                    tryCompareFunction(function() { mouseClick(choiceButton2, choiceButton2.width / 2, choiceButton2.height / 2); return actionSpy.signalArguments.length > 0; }, true);
-                    compare(actionSpy.signalArguments[0][0], data.actions[4]["id"], "got wrong id choice action 2")
-                    actionSpy.clear()
-
-                    // click to collapse
-                    //tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == false; }, true);
-                } else {
-                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
-                    compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
+            }
+
+            function test_NotificationRenderer(data) {
+                // populate model with some mock notifications
+                mockModel.append(data)
+
+                // make sure the view is properly updated before going on
+                notifications.forceLayout();
+                waitForRendering(notifications);
+
+                var notification = findChild(notifications, "notification" + (mockModel.count - 1))
+                verify(notification !== undefined, "notification wasn't found");
+
+                waitForRendering(notification);
+
+                var icon = findChild(notification, "icon")
+                var centeredIcon = findChild(notification, "centeredIcon")
+                var interactiveArea = findChild(notification, "interactiveArea")
+                var secondaryIcon = findChild(notification, "secondaryIcon")
+                var summaryLabel = findChild(notification, "summaryLabel")
+                var bodyLabel = findChild(notification, "bodyLabel")
+                var buttonRow = findChild(notification, "buttonRow")
+                var valueIndicator = findChild(notification, "valueIndicator")
+                var valueLabel = findChild(notification, "valueLabel")
+                var innerBar = findChild(notification, "innerBar")
+
+                compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
+                if (icon.visible) {
+                    compare(icon.shaped, data.shaped, "shaped-status is incorrect")
+                }
+                compare(centeredIcon.visible, data.centeredIconVisible, "centered-icon visibility is incorrect")
+                if (centeredIcon.visible) {
+                    compare(centeredIcon.shaped, data.shaped, "shaped-status is incorrect")
+                }
+                compare(valueIndicator.visible, data.valueVisible, "value-indicator visibility is incorrect")
+                if (valueIndicator.visible) {
+                    verify(innerBar.color === data.valueTinted ? UbuntuColors.orange : "white", "value-bar has the wrong color-tint")
+                }
+                compare(valueLabel.visible, data.valueLabelVisible, "value-label visibility is incorrect")
+
+                // test input does not fall through
+                mouseClick(notification, notification.width / 2, notification.height / 2)
+                if(data.type == Notification.Interactive) {
+                    actionSpy.wait()
+                    compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
+                }
+                compare(clickThroughSpy.count, 0, "click on notification fell through")
+
+                compare(secondaryIcon.visible, data.secondaryIconVisible, "secondary-icon visibility is incorrect")
+                compare(summaryLabel.visible, data.summaryVisible, "summary-text visibility is incorrect")
+                compare(bodyLabel.visible, data.bodyVisible, "body-text visibility is incorrect")
+                compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
+
+                var audioItem = findInvisibleChild(notification, "sound")
+                compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")
+
+                if(data.buttonRowVisible) {
+                    var buttonCancel = findChild(buttonRow, "notify_button1")
+                    var buttonAccept = findChild(buttonRow, "notify_button0")
+
+                    // only test the left/cancel-button if two actions have been passed in
+                    if (data.actions.length == 2) {
+                        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()
+                    }
+
+                    // check the tinting of the positive/right button
+                    verify(buttonAccept.color === data.buttonTinted ? "#3fb24f" : "#dddddd", "button has the wrong color-tint")
+
+                    // click the positive/right button
+                    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 a ComboButton created due to more actions being passed
+                    if (data.actions.length > 2) {
+                        var comboButton = findChild(notification, "notify_button2")
+                        tryCompareFunction(function() { return comboButton.expanded == false; }, true);
+
+                        // click to expand
+                        tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == true; }, true);
+
+                        // try clicking on choices in expanded comboList
+                        var choiceButton1 = findChild(notification, "notify_button3")
+                        tryCompareFunction(function() { mouseClick(choiceButton1, choiceButton1.width / 2, choiceButton1.height / 2); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions[3]["id"], "got wrong id choice action 1")
+                        actionSpy.clear()
+
+                        var choiceButton2 = findChild(notification, "notify_button4")
+                        tryCompareFunction(function() { mouseClick(choiceButton2, choiceButton2.width / 2, choiceButton2.height / 2); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions[4]["id"], "got wrong id choice action 2")
+                        actionSpy.clear()
+
+                        // click to collapse
+                        //tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == false; }, true);
+                    } else {
+                        mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
+                        compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
+                    }
                 }
             }
         }

=== added file 'tests/qmltests/Notifications/tst_SwipeToAct.qml'
--- tests/qmltests/Notifications/tst_SwipeToAct.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Notifications/tst_SwipeToAct.qml	2014-10-31 10:46:25 +0000
@@ -0,0 +1,276 @@
+/*
+ * 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
+
+Item {
+    width: notificationsRect.width + interactiveControls.width
+    height: notificationsRect.height
+
+    Row {
+        id: rootRow
+
+        Component {
+            id: mockNotification
+
+            QtObject {
+                function invokeAction(actionId) {
+                    mockModel.actionInvoked(actionId)
+                }
+            }
+        }
+
+        ListModel {
+            id: mockModel
+            dynamicRoles: true
+
+            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 addSwipeToActNotification() {
+            var n = {
+                type: Notification.SnapDecision,
+                hints: {"x-canonical-snap-decisions-swipe": "true"},
+                summary: "Incoming call",
+                body: "Frank Zappa\n+44 (0)7736 027340",
+                icon: "../graphics/avatars/amanda.png",
+                secondaryIcon: "incoming-call",
+                actions: [{ id: "ok_id", label: "Ok"},
+                    { id: "cancel_id", label: "Cancel"}]
+            }
+
+            mockModel.append(n)
+        }
+
+        function clearNotifications() {
+            mockModel.clear()
+        }
+
+        function remove1stNotification() {
+            if (mockModel.count > 0)
+                mockModel.remove(0)
+        }
+
+        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 a SwipeToAct snap-decision"
+                    onClicked: rootRow.addSwipeToActNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "remove 1st notification"
+                    onClicked: rootRow.remove1stNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "clear model"
+                    onClicked: rootRow.clearNotifications()
+                }
+            }
+        }
+
+        ActionModel {
+            id: myActionModel
+        }
+
+        UnityTestCase {
+            id: root
+            name: "NotificationRendererTest"
+            when: windowShown
+
+            function test_NotificationRenderer_data() {
+                return [
+                {
+                    tag: "Snap Decision with SwipeToAct-widget (accept)",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-snap-decisions-swipe": "true"},
+                    summary: "Incoming call",
+                    body: "Frank Zappa\n+44 (0)7736 027340",
+                    icon: "../graphics/avatars/amanda.png",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: myActionModel,
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    shaped: true,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: true,
+                    buttonTinted: false,
+                    checkSwipeToActAccept: true,
+                    checkSwipeToActReject: false
+                },
+                {
+                    tag: "Snap Decision with SwipeToAct-widget (reject)",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-snap-decisions-swipe": "true"},
+                    summary: "Incoming call",
+                    body: "Bro Coly\n+49 (0)221 426973",
+                    icon: "../graphics/avatars/funky.png",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: myActionModel,
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    shaped: true,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: true,
+                    buttonTinted: false,
+                    checkSwipeToActAccept: false,
+                    checkSwipeToActReject: true
+                }
+                ]
+            }
+
+            SignalSpy {
+                id: clickThroughSpy
+
+                target: clickThroughCatcher
+                signalName: "clicked"
+            }
+
+            SignalSpy {
+                id: actionSpy
+
+                target: mockModel
+                signalName: "actionInvoked"
+            }
+
+            function cleanup() {
+                clickThroughSpy.clear()
+                actionSpy.clear()
+            }
+
+            function test_NotificationRenderer(data) {
+                // populate model with some mock notifications
+                mockModel.append(data)
+
+                // make sure the view is properly updated before going on
+                notifications.forceLayout();
+                waitForRendering(notifications);
+
+                var notification = findChild(notifications, "notification" + (mockModel.count - 1))
+                verify(notification !== undefined, "notification wasn't found");
+
+                waitForRendering(notification);
+
+                var icon = findChild(notification, "icon")
+                var interactiveArea = findChild(notification, "interactiveArea")
+                var secondaryIcon = findChild(notification, "secondaryIcon")
+                var summaryLabel = findChild(notification, "summaryLabel")
+                var bodyLabel = findChild(notification, "bodyLabel")
+                var buttonRow = findChild(notification, "buttonRow")
+
+                compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
+                if (icon.visible) {
+                    compare(icon.shaped, data.shaped, "shaped-status is incorrect")
+                }
+
+                // test input does not fall through
+                mouseClick(notification, notification.width / 2, notification.height / 2)
+                if(data.type == Notification.Interactive) {
+                    actionSpy.wait()
+                    compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
+                }
+                compare(clickThroughSpy.count, 0, "click on notification fell through")
+
+                compare(secondaryIcon.visible, data.secondaryIconVisible, "secondary-icon visibility is incorrect")
+                compare(summaryLabel.visible, data.summaryVisible, "summary-text visibility is incorrect")
+                compare(bodyLabel.visible, data.bodyVisible, "body-text visibility is incorrect")
+                compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
+
+                if(data.buttonRowVisible) {
+                    var swipeButton = findChild(buttonRow, "notify_swipe_button")
+                    var slider = findChild(swipeButton, "slider")
+                    var swipeMouseArea = findChild(swipeButton, "swipeMouseArea")
+                    var x = swipeMouseArea.width / 2
+                    var y = swipeMouseArea.height / 2
+
+                    if(data.checkSwipeToActReject) {
+                        tryCompareFunction(function() { mouseDrag(slider, x, y, -(swipeMouseArea.width / 2), 0); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions.data(0, ActionModel.RoleActionId), "got wrong id for negative action")
+                        actionSpy.clear()
+                    }
+                    if(data.checkSwipeToActAccept) {
+                        tryCompareFunction(function() { mouseDrag(slider, x, y, (swipeMouseArea.width / 2) - slider.width, 0); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions.data(1, ActionModel.RoleActionId), "got wrong id for positive action")
+                        actionSpy.clear()
+                    }
+                }
+            }
+        }
+    }
+}