git.iko.soy/unity8
on xenial help sign in
Made tryNotifications use fully dynamic object-creation/destruction now.
3cafb16Mirco Müller
tests/mocks/Unity/Notifications/MockNotificationModel.cpp+3−3
compare with xenial
unifiedsplit
@@ -127,10 +127,10 @@ void MockNotificationModel::remove(const int id) {
127 // The ID was not found in any queue. Should it be an error case or not?
127 // The ID was not found in any queue. Should it be an error case or not?
128}
128}
129
129
130−void MockNotificationModel::deleteFirst() {
130+void MockNotificationModel::removeSecond() {
131− if(m_queue.empty())
131+ if(m_queue.size() < 2)
132 return;
132 return;
133− deleteFromVisible(0);
133+ deleteFromVisible(1);
134}
134}
135
135
136void MockNotificationModel::deleteFromVisible(int loc) {
136void MockNotificationModel::deleteFromVisible(int loc) {
tests/mocks/Unity/Notifications/MockNotificationModel.h+1−1
@@ -50,6 +50,7 @@ public:
50
50
51 Q_INVOKABLE int queued() const;
51 Q_INVOKABLE int queued() const;
52 Q_INVOKABLE void remove(const int id);
52 Q_INVOKABLE void remove(const int id);
53+ Q_INVOKABLE void removeSecond();
53
54
54 int getCount() const;
55 int getCount() const;
55
56
@@ -65,7 +66,6 @@ Q_SIGNALS:
65private:
66private:
66 QList<MockNotification*> m_queue;
67 QList<MockNotification*> m_queue;
67 void deleteFromVisible(int loc);
68 void deleteFromVisible(int loc);
68− void deleteFirst();
69};
69};
70
70
71#endif
71#endif
tests/qmltests/Notifications/Notification.qmlnew file+39
@@ -0,0 +1,39 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Mirco Mueller <mirco.mueller@canonical.com>
18+ */
19+
20+import QtQuick 2.0
21+import QtTest 1.0
22+import ".."
23+import "../../../qml/Notifications"
24+import Ubuntu.Components 0.1
25+import Unity.Test 0.1
26+import Unity.Notifications 1.0
27+import QtMultimedia 5.0
28+
29+Notification {
30+ id: bla
31+ nid: 0
32+ type: Notification.PlaceHolder
33+ summary: ""
34+ body: ""
35+ icon: ""
36+ secondaryIcon: ""
37+ value: 0
38+ rawActions: []
39+}
tests/qmltests/Notifications/tst_Notifications.qml+96−127
@@ -31,123 +31,7 @@ Item {
31
31
32 width: notificationsRect.width + interactiveControls.width
32 width: notificationsRect.width + interactiveControls.width
33 height: notificationsRect.height
33 height: notificationsRect.height
34−
34+ property int index: 0
35− property list<Notification> mockList: [
36− Notification {
37− id: n0
38− nid: 0
39− type: Notification.PlaceHolder
40− summary: ""
41− body: ""
42− icon: ""
43− secondaryIcon: ""
44− rawActions: ["reply_id", "Dummy"]
45− Component.onCompleted: {
46− n0.completed.connect(mockModel.onCompleted)
47− }
48− },
49− Notification {
50− id: n1
51− nid: 1
52− type: Notification.SnapDecision
53− hints: {"x-canonical-private-affirmative-tint": "true"}
54− summary: "Theatre at Ferria Stadium"
55− body: "at Ferria Stadium in Bilbao, Spain\n07578545317"
56− icon: ""
57− secondaryIcon: ""
58− rawActions: ["ok_id", "Ok",
59− "snooze_id", "Snooze",
60− "view_id", "View"]
61− Component.onCompleted: {
62− n1.completed.connect(mockModel.onCompleted)
63− }
64− },
65− Notification {
66− id: n2
67− nid: 2
68− type: Notification.Ephemeral
69− summary: "Cole Raby"
70− body: "I did not expect it to be that late."
71− icon: "../graphics/avatars/amanda.png"
72− secondaryIcon: "../graphics/applicationIcons/facebook.png"
73− rawActions: ["reply_id", "Dummy"]
74− Component.onCompleted: {
75− n2.completed.connect(mockModel.onCompleted)
76− }
77− },
78− Notification {
79− id: n3
80− nid: 3
81− type: Notification.Ephemeral
82− hints: {"x-canonical-non-shaped-icon": "true"}
83− summary: "Contacts"
84− body: "Synchronised contacts-database with cloud-storage."
85− icon: "../graphics/applicationIcons/contacts-app.png"
86− secondaryIcon: ""
87− rawActions: ["reply_id", "Dummy"]
88− Component.onCompleted: {
89− n3.completed.connect(mockModel.onCompleted)
90− }
91− },
92− Notification {
93− id: n4
94− nid: 4
95− type: Notification.Ephemeral
96− hints: {"x-canonical-non-shaped-icon": "false"}
97− summary: "Photo upload completed"
98− body: ""
99− icon: "../graphics/applicationIcons/facebook.png"
100− secondaryIcon: ""
101− rawActions: ["reply_id", "Dummy"]
102− Component.onCompleted: {
103− n4.completed.connect(mockModel.onCompleted)
104− }
105− },
106− Notification {
107− id: n5
108− nid: 5
109− type: Notification.Interactive
110− summary: "Interactive notification"
111− body: "This is a notification that can be clicked"
112− icon: "../graphics/avatars/anna_olsson.png"
113− secondaryIcon: ""
114− rawActions: ["reply_id", "Dummy"]
115− Component.onCompleted: {
116− n5.completed.connect(mockModel.onCompleted)
117− }
118− },
119− Notification {
120− id: n6
121− nid: 6
122− type: Notification.Confirmation
123− hints: {"x-canonical-non-shaped-icon": "true"}
124− summary: "Confirmation notification"
125− body: ""
126− icon: "image://theme/audio-volume-medium"
127− secondaryIcon: ""
128− value: 50
129− rawActions: ["reply_id", "Dummy"]
130− Component.onCompleted: {
131− n6.completed.connect(mockModel.onCompleted)
132− }
133− },
134− Notification {
135− id: n7
136− nid: 7
137− type: Notification.Confirmation
138− hints: {"x-canonical-non-shaped-icon": "true",
139− "x-canonical-value-bar-tint": "true"}
140− summary: "Confirmation notification"
141− body: "High Volume"
142− icon: "image://theme/audio-volume-high"
143− secondaryIcon: ""
144− value: 85
145− rawActions: ["reply_id", "Dummy"]
146− Component.onCompleted: {
147− n7.completed.connect(mockModel.onCompleted)
148− }
149− }
150− ]
151
35
152 Row {
36 Row {
153 id: rootRow
37 id: rootRow
@@ -159,47 +43,132 @@ Item {
159
43
160 // add the default/PlaceHolder notification to the model
44 // add the default/PlaceHolder notification to the model
161 Component.onCompleted: {
45 Component.onCompleted: {
162− append(mockList[0])
46+ var component = Qt.createComponent("Notification.qml")
47+ var n = component.createObject("notification", {"nid": index++,
48+ "type": Notification.PlaceHolder,
49+ "hints": {},
50+ "summary": "",
51+ "body": "",
52+ "icon": "",
53+ "secondaryIcon": "",
54+ "rawActions": []})
55+ n.completed.connect(mockModel.onCompleted)
56+ append(n)
163 }
57 }
164 }
58 }
165
59
166 function add2over1SnapDecisionNotification() {
60 function add2over1SnapDecisionNotification() {
167− mockModel.append(mockList[1])
61+ var component = Qt.createComponent("Notification.qml")
62+ var n = component.createObject("notification", {"nid": index++,
63+ "type": Notification.SnapDecision,
64+ "hints": {"x-canonical-private-affirmative-tint": "true"},
65+ "summary": "Theatre at Ferria Stadium",
66+ "body": "at Ferria Stadium in Bilbao, Spain\n07578545317",
67+ "icon": "",
68+ "secondaryIcon": "",
69+ "rawActions": ["ok_id", "Ok",
70+ "snooze_id", "Snooze",
71+ "view_id", "View"]})
72+ n.completed.connect(mockModel.onCompleted)
73+ mockModel.append(n)
168 }
74 }
169
75
170 function addEphemeralNotification() {
76 function addEphemeralNotification() {
171− mockModel.append(mockList[2])
77+ var component = Qt.createComponent("Notification.qml")
78+ var n = component.createObject("notification", {"nid": index++,
79+ "type": Notification.Ephemeral,
80+ "hints": {},
81+ "summary": "Cole Raby",
82+ "body": "I did not expect it to be that late.",
83+ "icon": "../graphics/avatars/amanda.png",
84+ "secondaryIcon": "../graphics/applicationIcons/facebook.png",
85+ "rawActions": ["reply_id", "Dummy"]})
86+ n.completed.connect(mockModel.onCompleted)
87+ mockModel.append(n)
172 }
88 }
173
89
174 function addEphemeralNonShapedIconNotification() {
90 function addEphemeralNonShapedIconNotification() {
175− mockModel.append(mockList[3])
91+ var component = Qt.createComponent("Notification.qml")
92+ var n = component.createObject("notification", {"nid": index++,
93+ "type": Notification.Ephemeral,
94+ "hints": {"x-canonical-non-shaped-icon": "true"},
95+ "summary": "Contacts",
96+ "body": "Synchronised contacts-database with cloud-storage.",
97+ "icon": "../graphics/applicationIcons/contacts-app.png",
98+ "secondaryIcon": "",
99+ "rawActions": ["reply_id", "Dummy"]})
100+ n.completed.connect(mockModel.onCompleted)
101+ mockModel.append(n)
176 }
102 }
177
103
178 function addEphemeralIconSummaryNotification() {
104 function addEphemeralIconSummaryNotification() {
179− mockModel.append(mockList[4])
105+ var component = Qt.createComponent("Notification.qml")
106+ var n = component.createObject("notification", {"nid": index++,
107+ "type": Notification.Ephemeral,
108+ "hints": {"x-canonical-non-shaped-icon": "false"},
109+ "summary": "Photo upload completed",
110+ "body": "",
111+ "icon": "../graphics/applicationIcons/facebook.png",
112+ "secondaryIcon": "",
113+ "rawActions": ["reply_id", "Dummy"]})
114+ n.completed.connect(mockModel.onCompleted)
115+ mockModel.append(n)
180 }
116 }
181
117
182 function addInteractiveNotification() {
118 function addInteractiveNotification() {
183− mockModel.append(mockList[5])
119+ var component = Qt.createComponent("Notification.qml")
120+ var n = component.createObject("notification", {"nid": index++,
121+ "type": Notification.Interactive,
122+ "hints": {},
123+ "summary": "Interactive notification",
124+ "body": "This is a notification that can be clicked",
125+ "icon": "../graphics/avatars/anna_olsson.png",
126+ "secondaryIcon": "",
127+ "rawActions": ["reply_id", "Dummy"]})
128+ n.completed.connect(mockModel.onCompleted)
129+ mockModel.append(n)
184 }
130 }
185
131
186 function addConfirmationNotification() {
132 function addConfirmationNotification() {
187− mockModel.append(mockList[6])
133+ var component = Qt.createComponent("Notification.qml")
134+ var n = component.createObject("notification", {"nid": index++,
135+ "type": Notification.Confirmation,
136+ "hints": {"x-canonical-non-shaped-icon": "true"},
137+ "summary": "Confirmation notification",
138+ "body": "",
139+ "icon": "image://theme/audio-volume-medium",
140+ "secondaryIcon": "",
141+ "value": 50,
142+ "rawActions": ["reply_id", "Dummy"]})
143+ n.completed.connect(mockModel.onCompleted)
144+ mockModel.append(n)
188 }
145 }
189
146
190 function add2ndConfirmationNotification() {
147 function add2ndConfirmationNotification() {
191− mockModel.append(mockList[7])
148+ var component = Qt.createComponent("Notification.qml")
149+ var n = component.createObject("notification", {"nid": index++,
150+ "type": Notification.Confirmation,
151+ "hints": {"x-canonical-non-shaped-icon": "true",
152+ "x-canonical-value-bar-tint": "true"},
153+ "summary": "Confirmation notification",
154+ "body": "High Volume",
155+ "icon": "image://theme/audio-volume-high",
156+ "secondaryIcon": "",
157+ "value": 85,
158+ "rawActions": ["reply_id", "Dummy"]})
159+ n.completed.connect(mockModel.onCompleted)
160+ mockModel.append(n)
192 }
161 }
193
162
194 function clearNotifications() {
163 function clearNotifications() {
195 while(mockModel.count > 1) {
164 while(mockModel.count > 1) {
196− //remove1stNotification()
165+ remove1stNotification()
197 }
166 }
198 }
167 }
199
168
200 function remove1stNotification() {
169 function remove1stNotification() {
201 if (mockModel.count > 1) {
170 if (mockModel.count > 1) {
202− //mockModel.remove(1)
171+ mockModel.removeSecond()
203 }
172 }
204 }
173 }
205
174