on xenial help sign in
Stripped down MockNotificationModel further. Checks of the Audio-state still fail... no idea why.
commit1b7c3ae114989aa9bb2c7c33bbb0d313afcc39cf authorMirco Müller <mirco.mueller@ubuntu.com> dateMon 26 Jan 2015, 13:03 (12 years ago) parent4bf0d3d
4 files changed+5−30
tests/mocks/Unity/Notifications/MockNotificationModel.cpp+3−18 tests/mocks/Unity/Notifications/MockNotificationModel.h+1−3 tests/qmltests/Notifications/Notification.qml−8 tests/qmltests/Notifications/tst_Notifications.qml+1−1
tests/mocks/Unity/Notifications/MockNotificationModel.cpp+3−18
@@ -103,37 +103,22 @@ MockNotification* MockNotificationModel::getNotification(int id) const {
103103 return nullptr;
104104}
105105
106−MockNotification* MockNotificationModel::getNotification(const QString &summary) const {
107− for(int i=0; i < m_queue.size(); i++) {
108− if(m_queue[i]->getSummary() == summary) {
109− return m_queue[i];
110− }
111− }
112−
113− return nullptr;
114−}
115−
116−bool MockNotificationModel::hasNotification(int id) const {
117− return !(getNotification(id) != nullptr);
118−}
119−
120106void MockNotificationModel::remove(const int id) {
121107 for(int i = 0; i < m_queue.size(); i++) {
122108 if(m_queue[i]->getID() == id) {
123− deleteFromVisible(i);
109+ removeInternal(i);
124110 return;
125111 }
126112 }
127− // The ID was not found in any queue. Should it be an error case or not?
128113}
129114
130115void MockNotificationModel::removeSecond() {
131116 if(m_queue.size() < 2)
132117 return;
133− deleteFromVisible(1);
118+ removeInternal(1);
134119}
135120
136−void MockNotificationModel::deleteFromVisible(int loc) {
121+void MockNotificationModel::removeInternal(int loc) {
137122 QModelIndex deletePoint = QModelIndex();
138123 beginRemoveRows(deletePoint, loc, loc);
139124 m_queue.erase(m_queue.begin() + loc);
tests/mocks/Unity/Notifications/MockNotificationModel.h+1−3
@@ -41,8 +41,6 @@ public:
4141
4242 Q_INVOKABLE void append(MockNotification* n);
4343 MockNotification* getNotification(int id) const;
44− MockNotification* getNotification(const QString &summary) const;
45− bool hasNotification(int id) const;
4644
4745 // getRaw() is only meant to be used from QML, since QML cannot handle
4846 // QSharedPointers... on C++-side only use getNotification()
@@ -68,7 +66,7 @@ Q_SIGNALS:
6866
6967private:
7068 QList<MockNotification*> m_queue;
71− void deleteFromVisible(int loc);
69+ void removeInternal(int loc);
7270};
7371
7472#endif
tests/qmltests/Notifications/Notification.qml−8
@@ -17,17 +17,9 @@
1717 * Mirco Mueller <mirco.mueller@canonical.com>
1818 */
1919
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
2620import Unity.Notifications 1.0
27−import QtMultimedia 5.0
2821
2922Notification {
30− id: bla
3123 nid: 0
3224 type: Notification.PlaceHolder
3325 summary: ""
tests/qmltests/Notifications/tst_Notifications.qml+1−1
@@ -603,7 +603,7 @@ Item {
603603 compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
604604
605605 var audioItem = findInvisibleChild(notification, "sound")
606− //compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")
606+ compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")
607607
608608 if(data.buttonRowVisible) {
609609 var buttonCancel = findChild(buttonRow, "notify_button1")