git.iko.soy/unity8
on xenial help sign in
add a mock and test for the fullscreen notifications
commit15319a971269b5478f77f0a92b04830c1ade78e6 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 19 Aug 2016, 15:05 (10 years ago) parentd3adca9
5 files changed+94−1
compare with xenial
unifiedsplit
qml/Notifications/Notification.qml+2−1 tests/mocks/Unity/Notifications/MockNotification.cpp+15 tests/mocks/Unity/Notifications/MockNotification.h+6 tests/qmltests/Notifications/Notification.qml+1 tests/qmltests/Notifications/tst_Notifications.qml+70
qml/Notifications/Notification.qml+2−1
@@ -37,7 +37,8 @@ StyledItem {
3737 property var hints
3838 property var notification
3939 property color color: theme.palette.normal.background
40− property bool fullscreen: false
40+ property bool fullscreen: notification.notification && typeof notification.notification.fullscreen != "undefined" ?
41+ notification.notification.fullscreen : false // fullscreen prop only exists in the mock
4142 property int maxHeight
4243 property int margins: units.gu(1)
4344
tests/mocks/Unity/Notifications/MockNotification.cpp+15
@@ -32,6 +32,7 @@ struct MockNotificationPrivate {
3232 QStringList actions;
3333 ActionModel* actionsModel;
3434 QVariantMap hints;
35+ bool fullscreen = false;
3536};
3637
3738MockNotification::MockNotification(QObject *parent) : QObject(parent), p(new MockNotificationPrivate()) {
@@ -181,3 +182,17 @@ void MockNotification::invokeAction(const QString &action) {
181182void MockNotification::close() {
182183 Q_EMIT completed(p->id);
183184}
185+
186+bool MockNotification::fullscreen() const
187+{
188+ return p->fullscreen;
189+}
190+
191+void MockNotification::setFullscreen(bool fullscreen)
192+{
193+ if (p->fullscreen == fullscreen)
194+ return;
195+
196+ p->fullscreen = fullscreen;
197+ Q_EMIT fullscreenChanged(fullscreen);
198+}
tests/mocks/Unity/Notifications/MockNotification.h+6
@@ -41,6 +41,7 @@ class MockNotification : public QObject {
4141 Q_PROPERTY(QStringList rawActions READ rawActions WRITE setActions)
4242 Q_PROPERTY(ActionModel* actions READ getActions NOTIFY actionsChanged)
4343 Q_PROPERTY(QVariantMap hints READ getHints WRITE setHints NOTIFY hintsChanged)
44+ Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged) // only in mock
4445
4546private:
4647 QScopedPointer<MockNotificationPrivate> p;
@@ -64,6 +65,8 @@ Q_SIGNALS:
6465 void completed(int nid);
6566 void actionInvoked(const QString &action);
6667
68+ void fullscreenChanged(bool fullscreen);
69+
6770public:
6871 MockNotification(QObject *parent=nullptr);
6972 virtual ~MockNotification();
@@ -87,9 +90,12 @@ public:
8790 void setActions(const QStringList &actions);
8891 QVariantMap getHints() const;
8992 void setHints(const QVariantMap& hints);
93+ bool fullscreen() const;
94+ void setFullscreen(bool fullscreen);
9095
9196 Q_INVOKABLE void invokeAction(const QString &action);
9297 Q_INVOKABLE void close();
98+
9399};
94100
95101#endif // MOCK_NOTIFICATION_H
tests/qmltests/Notifications/Notification.qml+1
@@ -28,4 +28,5 @@ Notification {
2828 secondaryIcon: ""
2929 value: 0
3030 rawActions: []
31+ fullscreen: false
3132}
tests/qmltests/Notifications/tst_Notifications.qml+70
@@ -141,6 +141,18 @@ Item {
141141 mockModel.append(n)
142142 }
143143
144+ function addFullscreenNotification() {
145+ var component = Qt.createComponent("Notification.qml")
146+ var n = component.createObject("notification", {"nid": index++,
147+ "type": Notification.SnapDecision,
148+ "hints": {"x-canonical-private-affirmative-tint": "true"},
149+ "summary": "SIM PIN screen",
150+ "body": "Enter your PIN to unlock the SIM",
151+ "fullscreen": true})
152+ n.completed.connect(mockModel.onCompleted)
153+ mockModel.append(n)
154+ }
155+
144156 function clearNotifications() {
145157 while(mockModel.count > 0) {
146158 remove1stNotification();
@@ -228,6 +240,12 @@ Item {
228240 onClicked: rootRow.add2ndConfirmationNotification()
229241 }
230242
243+ Button {
244+ width: parent.width
245+ text: "add a fullscreen notification"
246+ onClicked: rootRow.addFullscreenNotification()
247+ }
248+
231249 Button {
232250 width: parent.width
233251 text: "remove 1st notification"
@@ -371,6 +389,14 @@ Item {
371389 rawActions: ["ok_id", "Ok",
372390 "snooze_id", "Snooze",
373391 "view_id", "View"]
392+ },
393+ Notification {
394+ nid: 10
395+ type: Notification.SnapDecision
396+ hints: {"x-canonical-private-affirmative-tint": "true"}
397+ summary: "SIM PIN screen"
398+ body: "Enter your PIN to unlock the SIM"
399+ fullscreen: true
374400 }
375401 ]
376402
@@ -797,6 +823,50 @@ Item {
797823 tryCompareFunction(function() { return notification2.expanded; }, undefined);
798824 }
799825
826+ function topmostIsFullscreen_data() {
827+ return [{
828+ tag: "Confirmation notification with value",
829+ n: nlist[6]
830+ },
831+ {
832+ tag: "SIM PIN fullscreen notification",
833+ n: nlist[9]
834+ },
835+ {
836+ tag: "Snap Decision without secondary icon and no button-tint",
837+ n: nlist[3]
838+ }]
839+ }
840+
841+ function test_topmostIsFullscreen() {
842+ var data = topmostIsFullscreen_data();
843+
844+ // fill the model
845+ data.forEach(function(notification) {
846+ mockModel.append(notification.n);
847+ notification.n.completed.connect(mockModel.onCompleted);
848+ })
849+
850+ // make sure the view is properly updated before going on
851+ notifications.forceLayout();
852+ waitForRendering(notifications);
853+
854+ // initially, topmost is not fullscreen
855+ verify(!notifications.topmostIsFullscreen)
856+
857+ // close the 1st one, 2nd one should be fullscreen
858+ var notification0 = findChild(notifications, "notification0")
859+ notification0.closeNotification();
860+ waitForRendering(notifications);
861+ verify(notifications.topmostIsFullscreen)
862+
863+ // close the 1st one (SIM PIN) again, topmost should no longer be fullscreen
864+ notification0 = findChild(notifications, "notification0")
865+ notification0.closeNotification();
866+ waitForRendering(notifications);
867+ verify(!notifications.topmostIsFullscreen)
868+ }
869+
800870 function cleanupTestCase() {
801871 notifications.hasMouse = false;
802872 }