1
=== modified file 'qml/Notifications/Notification.qml'
2
--- qml/Notifications/Notification.qml	2014-01-03 10:29:25 +0000
3
+++ qml/Notifications/Notification.qml	2014-03-19 11:24:40 +0000
4
@@ -39,20 +39,72 @@
5
39
39
6
40
    fullscreen: false
40
    fullscreen: false
7
41
    objectName: "background"
41
    objectName: "background"
9
42
    implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 4) : 0
42
    implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
10
43
43
11
44
    color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
44
    color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
12
45
    opacity: 0
45
    opacity: 0
13
46
46
14
47
    state: {
15
48
        var result = "";
16
49
17
50
        if (type == Notification.SnapDecision) {
18
51
            if (ListView.view.currentIndex == index) {
19
52
                result = "expanded";
20
53
            } else {
21
54
                if (ListView.view.count > 2) {
22
55
                    if (ListView.view.currentIndex == -1 && index == 1) {
23
56
                        result = "expanded";
24
57
                    } else {
25
58
                        result = "contracted";
26
59
                    }
27
60
                } else {
28
61
                    result = "expanded";
29
62
                }
30
63
            }
31
64
        }
32
65
33
66
        return result;
34
67
    }
35
68
36
69
    Behavior on height {
37
70
        id: normalHeightBehavior
38
71
39
72
        //enabled: menuItemFactory.progress == 1
40
73
        enabled: true
41
74
        SequentialAnimation {
42
75
            PauseAnimation {
43
76
                duration: UbuntuAnimation.SnapDuration
44
77
            }
45
78
            UbuntuNumberAnimation {
46
79
                duration: UbuntuAnimation.SnapDuration
47
80
            }
48
81
        }
49
82
    }
50
83
51
84
    states:[
52
85
        State {
53
86
            name: "contracted"
54
87
            PropertyChanges {target: notification; height: units.gu(8)}
55
88
        },
56
89
        State {
57
90
            name: "expanded"
58
91
            PropertyChanges {target: notification; height: implicitHeight}
59
92
        }
60
93
    ]
61
94
62
47
    clip: fullscreen ? false : true
95
    clip: fullscreen ? false : true
63
96
64
48
    visible: type != Notification.PlaceHolder
97
    visible: type != Notification.PlaceHolder
65
49
98
66
50
    UbuntuShape {
99
    UbuntuShape {
67
51
        id: shapedBack
100
        id: shapedBack
68
52
101
69
53
        visible: !fullscreen
102
        visible: !fullscreen
72
54
        anchors.fill: parent
103
        anchors {
73
55
        anchors.margins: notification.margins
104
            fill: parent
74
105
            leftMargin: notification.margins
75
106
            rightMargin: notification.margins
76
107
        }
77
56
        color: parent.color
108
        color: parent.color
78
57
        opacity: parent.opacity
109
        opacity: parent.opacity
79
58
        radius: "medium"
110
        radius: "medium"
80
@@ -104,17 +156,20 @@
81
104
        MouseArea {
156
        MouseArea {
82
105
            id: interactiveArea
157
            id: interactiveArea
83
106
158
85
107
            anchors.fill: contentColumn
159
            anchors.fill: parent
86
108
            objectName: "interactiveArea"
160
            objectName: "interactiveArea"
87
109
            onClicked: {
161
            onClicked: {
88
110
                if (notification.type == Notification.Interactive) {
162
                if (notification.type == Notification.Interactive) {
89
111
                    notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
163
                    notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
90
164
                } else {
91
165
                    notificationList.currentIndex = index;
92
112
                }
166
                }
93
113
            }
167
            }
94
114
        }
168
        }
95
115
169
96
116
        Column {
170
        Column {
97
117
            id: contentColumn
171
            id: contentColumn
98
172
            objectName: "contentColumn"
99
118
173
100
119
            anchors {
174
            anchors {
101
120
                left: parent.left
175
                left: parent.left
102
@@ -207,6 +262,8 @@
103
207
                    model: unityMenuModel
262
                    model: unityMenuModel
104
208
263
105
209
                    NotificationMenuItemFactory {
264
                    NotificationMenuItemFactory {
106
265
                        id: menuItemFactory
107
266
108
210
                        anchors.left: parent.left; anchors.right: parent.right
267
                        anchors.left: parent.left; anchors.right: parent.right
109
211
268
110
212
                        menuModel: unityMenuModel
269
                        menuModel: unityMenuModel
111
213
270
112
=== modified file 'qml/Notifications/Notifications.qml'
113
--- qml/Notifications/Notifications.qml	2013-12-18 12:50:55 +0000
114
+++ qml/Notifications/Notifications.qml	2014-03-19 11:24:40 +0000
115
@@ -25,6 +25,9 @@
116
25
    interactive: false
25
    interactive: false
117
26
26
118
27
    property real margin
27
    property real margin
119
28
    spacing: delegate.fullscreen ? 0 : units.gu(.5)
120
29
121
30
    currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1
122
28
31
123
29
    delegate: Notification {
32
    delegate: Notification {
124
30
        objectName: "notification" + index
33
        objectName: "notification" + index
125
@@ -75,6 +78,7 @@
126
75
    displaced: Transition {
78
    displaced: Transition {
127
76
        UbuntuNumberAnimation {
79
        UbuntuNumberAnimation {
128
77
            properties: "x,y"
80
            properties: "x,y"
129
81
            duration: UbuntuAnimation.SnapDuration
130
78
        }
82
        }
131
79
    }
83
    }
132
80
}
84
}
133
81
85
134
=== modified file 'tests/qmltests/CMakeLists.txt'
135
--- tests/qmltests/CMakeLists.txt	2014-03-14 12:08:44 +0000
136
+++ tests/qmltests/CMakeLists.txt	2014-03-19 11:24:40 +0000
137
@@ -82,6 +82,7 @@
138
82
add_qml_test(Hud Result)
82
add_qml_test(Hud Result)
139
83
add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
83
add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
140
84
add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
84
add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
141
85
add_qml_test(Notifications VisualSnapDecisionsQueue IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
142
85
add_qml_test(Panel IndicatorRow)
86
add_qml_test(Panel IndicatorRow)
143
86
add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
87
add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
144
87
add_qml_test(Panel MenuContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
88
add_qml_test(Panel MenuContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
145
88
89
146
=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
147
--- tests/qmltests/Notifications/tst_Notifications.qml	2014-01-03 10:29:25 +0000
148
+++ tests/qmltests/Notifications/tst_Notifications.qml	2014-03-19 11:24:40 +0000
149
@@ -43,6 +43,21 @@
150
43
        function getRaw(id) {
43
        function getRaw(id) {
151
44
            return mockNotification.createObject(mockModel)
44
            return mockNotification.createObject(mockModel)
152
45
        }
45
        }
153
46
154
47
        // add the default/PlaceHolder notification to the model
155
48
        Component.onCompleted: {
156
49
            var n = {
157
50
                type: Notification.PlaceHolder,
158
51
                hints: {},
159
52
                summary: "",
160
53
                body: "",
161
54
                icon: "",
162
55
                secondaryIcon: "",
163
56
                actions: []
164
57
            }
165
58
166
59
            append(n)
167
60
        }
168
46
    }
61
    }
169
47
62
170
48
    function addSnapDecisionNotification() {
63
    function addSnapDecisionNotification() {
171
@@ -376,6 +391,8 @@
172
376
            var notification = findChild(notifications, "notification" + (mockModel.count - 1))
391
            var notification = findChild(notifications, "notification" + (mockModel.count - 1))
173
377
            verify(notification !== undefined, "notification wasn't found");
392
            verify(notification !== undefined, "notification wasn't found");
174
378
393
175
394
            waitForRendering(notification);
176
395
177
379
            var icon = findChild(notification, "icon")
396
            var icon = findChild(notification, "icon")
178
380
            var shapedIcon = findChild(notification, "shapedIcon")
397
            var shapedIcon = findChild(notification, "shapedIcon")
179
381
            var nonShapedIcon = findChild(notification, "nonShapedIcon")
398
            var nonShapedIcon = findChild(notification, "nonShapedIcon")
180
@@ -384,7 +401,6 @@
181
384
            var summaryLabel = findChild(notification, "summaryLabel")
401
            var summaryLabel = findChild(notification, "summaryLabel")
182
385
            var bodyLabel = findChild(notification, "bodyLabel")
402
            var bodyLabel = findChild(notification, "bodyLabel")
183
386
            var buttonRow = findChild(notification, "buttonRow")
403
            var buttonRow = findChild(notification, "buttonRow")
184
387
            waitForRendering(buttonRow)
185
388
404
186
389
            compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
405
            compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
187
390
            compare(shapedIcon.visible, data.shapedIcon, "shaped-icon visibility is incorrect")
406
            compare(shapedIcon.visible, data.shapedIcon, "shaped-icon visibility is incorrect")
188
@@ -407,12 +423,9 @@
189
407
                var buttonCancel = findChild(buttonRow, "button1")
423
                var buttonCancel = findChild(buttonRow, "button1")
190
408
                var buttonAccept = findChild(buttonRow, "button0")
424
                var buttonAccept = findChild(buttonRow, "button0")
191
409
425
192
410
                waitForRendering(notification)
193
411
194
412
                // only test the left/cancel-button if two actions have been passed in
426
                // only test the left/cancel-button if two actions have been passed in
195
413
                if (data.actions.length == 2) {
427
                if (data.actions.length == 2) {
198
414
                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
428
                    tryCompareFunction(function() { mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2); return actionSpy.signalArguments.length > 0; }, true);
197
415
                    actionSpy.wait()
199
416
                    compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
429
                    compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
200
417
                    actionSpy.clear()
430
                    actionSpy.clear()
201
418
                }
431
                }
202
@@ -421,38 +434,39 @@
203
421
                verify(buttonAccept.gradient === data.buttonTinted ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient, "button has the wrong color-tint")
434
                verify(buttonAccept.gradient === data.buttonTinted ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient, "button has the wrong color-tint")
204
422
435
205
423
                // click the positive/right button
436
                // click the positive/right button
208
424
                mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2)
437
                tryCompareFunction(function() { mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2); return actionSpy.signalArguments.length > 0; }, true);
207
425
                actionSpy.wait()
209
426
                compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")
438
                compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")
210
427
                actionSpy.clear()
439
                actionSpy.clear()
211
440
                waitForRendering(notification)
212
428
441
213
429
                // check if there's more than one negative choice
442
                // check if there's more than one negative choice
214
430
                if (data.actions.length > 2) {
443
                if (data.actions.length > 2) {
216
431
                    var initialHeight = notification.height
444
                    var initialHeight = notification.implicitHeight
217
432
445
218
433
                    // click to expand
446
                    // click to expand
219
434
                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
447
                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
221
435
                    waitForRendering(notification)
448
                    var contentColumn = findChild(notification, "contentColumn")
222
449
                    var collapsedContentColumnHeight = contentColumn.height;
223
450
                    // Waiting for the inner column to change height because buttons appear
224
451
                    tryCompareFunction(function() { return collapsedContentColumnHeight != contentColumn.height; }, true);
225
452
                    // Waiting for notification to reach its target size
226
453
                    tryCompare(notification, "height", contentColumn.height + contentColumn.spacing * 2)
227
436
                    actionSpy.clear()
454
                    actionSpy.clear()
228
437
455
229
438
                    // test the additional buttons
456
                    // test the additional buttons
230
439
                    for (var i = 2; i < data.actions.length; i++) {
457
                    for (var i = 2; i < data.actions.length; i++) {
231
440
                        waitForRendering(notification)
232
441
                        var buttonColumn = findChild(notification, "buttonColumn")
458
                        var buttonColumn = findChild(notification, "buttonColumn")
233
442
                        var button = findChild(buttonColumn, "button" + i)
459
                        var button = findChild(buttonColumn, "button" + i)
234
443
                        mouseClick(button, button.width / 2, button.height / 2)
460
                        mouseClick(button, button.width / 2, button.height / 2)
235
444
                        actionSpy.wait()
236
445
                        compare(actionSpy.signalArguments[0][0], data.actions[i]["id"], "got wrong id for additional negative action")
461
                        compare(actionSpy.signalArguments[0][0], data.actions[i]["id"], "got wrong id for additional negative action")
237
446
                        actionSpy.clear()
462
                        actionSpy.clear()
238
447
                    }
463
                    }
239
448
464
240
449
                    // click to collapse
465
                    // click to collapse
241
450
                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
466
                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
242
451
                    waitForRendering(notification)
243
452
                    tryCompare(notification, "height", initialHeight)
467
                    tryCompare(notification, "height", initialHeight)
244
453
                } else {
468
                } else {
245
454
                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
469
                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
246
455
                    actionSpy.wait()
247
456
                    compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
470
                    compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
248
457
                }
471
                }
249
458
            }
472
            }
250
459
473
251
=== added file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
252
--- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	1970-01-01 00:00:00 +0000
253
+++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2014-03-19 11:24:40 +0000
254
@@ -0,0 +1,237 @@
255
1
/*
256
2
 * Copyright (C) 2014 Canonical, Ltd.
257
3
 *
258
4
 * This program is free software; you can redistribute it and/or modify
259
5
 * it under the terms of the GNU General Public License as published by
260
6
 * the Free Software Foundation; version 3.
261
7
 *
262
8
 * This program is distributed in the hope that it will be useful,
263
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
264
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
265
11
 * GNU General Public License for more details.
266
12
 *
267
13
 * You should have received a copy of the GNU General Public License
268
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
269
15
 */
270
16
271
17
import QtQuick 2.0
272
18
import QtTest 1.0
273
19
import ".."
274
20
import "../../../qml/Notifications"
275
21
import Ubuntu.Components 0.1
276
22
import Unity.Test 0.1
277
23
import Unity.Notifications 1.0
278
24
279
25
Row {
280
26
    id: rootRow
281
27
282
28
    Component {
283
29
        id: mockNotification
284
30
285
31
        QtObject {
286
32
            function invokeAction(actionId) {
287
33
                mockModel.actionInvoked(actionId)
288
34
            }
289
35
        }
290
36
    }
291
37
292
38
    ListModel {
293
39
        id: mockModel
294
40
295
41
        signal actionInvoked(string actionId)
296
42
297
43
        function getRaw(id) {
298
44
            return mockNotification.createObject(mockModel)
299
45
        }
300
46
301
47
        // add the default/PlaceHolder notification to the model
302
48
        Component.onCompleted: {
303
49
            var n = {
304
50
                type: Notification.PlaceHolder,
305
51
                hints: {},
306
52
                summary: "",
307
53
                body: "",
308
54
                icon: "",
309
55
                secondaryIcon: "",
310
56
                actions: []
311
57
            }
312
58
313
59
            append(n)
314
60
        }
315
61
    }
316
62
317
63
    function addSomeSnapDecisionNotifications() {
318
64
        var n = [{
319
65
            type: Notification.SnapDecision,
320
66
            hints: {"x-canonical-private-button-tint": "true"},
321
67
            summary: "Incoming call",
322
68
            body: "Frank Zappa\n+44 (0)7736 027340",
323
69
            icon: "../graphics/avatars/funky.png",
324
70
            secondaryIcon: "../graphics/applicationIcons/phone-app.png",
325
71
            actions: [{ id: "pickup_id", label: "Pick up"},
326
72
                      { id: "decline_1_id", label: "Decline"},
327
73
                      { id: "decline_2_id", label: "Can't talk now, what's up?"},
328
74
                      { id: "decline_3_id", label: "I call you back."},
329
75
                      { id: "decline_4_id", label: "Send custom message..."}]
330
76
        },
331
77
        {
332
78
            type: Notification.SnapDecision,
333
79
            hints: {"x-canonical-private-button-tint": "true",
334
80
                    "x-canonical-non-shaped-icon": "true"},
335
81
            summary: "Incoming file",
336
82
            body: "Frank would like to send you the file: essay.pdf.",
337
83
            icon: "image://theme/search",
338
84
            actions: [{ id: "accept_id", label: "Accept"},
339
85
                      { id: "reject_id", label: "Reject"}]
340
86
        },
341
87
        {
342
88
            type: Notification.SnapDecision,
343
89
            hints: {"x-canonical-private-button-tint": "true",
344
90
                    "x-canonical-non-shaped-icon": "true"},
345
91
            summary: "Authentication error",
346
92
            body: "Please authorise Ubuntu to access your Google account.",
347
93
            icon: "image://theme/search",
348
94
            actions: [{ id: "settings_id", label: "Settings..."},
349
95
                      { id: "cancel_id", label: "Cancel"}]
350
96
        },
351
97
        {
352
98
            type: Notification.SnapDecision,
353
99
            hints: {"x-canonical-private-button-tint": "true",
354
100
                    "x-canonical-non-shaped-icon": "true"},
355
101
            summary: "Morning alarm",
356
102
            body: "It's 6:30... time to get up!",
357
103
            icon: "image://theme/search",
358
104
            actions: [{ id: "ok_reply", label: "Ok"},
359
105
                      { id: "snooze_id", label: "Snooze"}]
360
106
        },
361
107
        {
362
108
            type: Notification.SnapDecision,
363
109
            hints: {"x-canonical-private-button-tint": "true"},
364
110
            summary: "Jenny Sample",
365
111
            body: "Hey there! Have you been watching the latest episode of that TV-show I told you about last week?",
366
112
            icon: "../graphics/avatars/amanda.png",
367
113
            secondaryIcon: "../graphics/applicationIcons/messages-app.png",
368
114
            actions: [{ id: "reply_id", label: "Reply"},
369
115
                      { id: "ignore_id", label: "Ignore"}]
370
116
        }]
371
117
372
118
        mockModel.append(n)
373
119
    }
374
120
375
121
    function clearNotifications() {
376
122
        // remove all but the first (PlaceHolder) notification
377
123
        mockModel.remove(1, mockModel.count - 1)
378
124
    }
379
125
380
126
    function removeTopMostNotification() {
381
127
        // leave real/first (PlaceHolder) notification untouched
382
128
        if (mockModel.count > 1)
383
129
            mockModel.remove(1)
384
130
    }
385
131
386
132
    Rectangle {
387
133
        id: notificationsRect
388
134
389
135
        width: units.gu(40)
390
136
        height: units.gu(71)
391
137
392
138
        MouseArea{
393
139
            id: clickThroughCatcher
394
140
395
141
            anchors.fill: parent
396
142
        }
397
143
398
144
        Notifications {
399
145
            id: notifications
400
146
401
147
            margin: units.gu(1)
402
148
403
149
            anchors.fill: parent
404
150
            model: mockModel
405
151
        }
406
152
    }
407
153
408
154
    Rectangle {
409
155
        id: interactiveControls
410
156
411
157
        width: units.gu(30)
412
158
        height: units.gu(81)
413
159
        color: "grey"
414
160
415
161
        Column {
416
162
            spacing: units.gu(1)
417
163
            anchors.fill: parent
418
164
            anchors.margins: units.gu(1)
419
165
420
166
            Button {
421
167
                width: parent.width
422
168
                text: "add some snap-decisions"
423
169
                onClicked: addSomeSnapDecisionNotifications()
424
170
            }
425
171
426
172
            Button {
427
173
                width: parent.width
428
174
                text: "remove top-most notification"
429
175
                onClicked: removeTopMostNotification()
430
176
            }
431
177
432
178
            Button {
433
179
                width: parent.width
434
180
                text: "clear model"
435
181
                onClicked: clearNotifications()
436
182
            }
437
183
        }
438
184
    }
439
185
440
186
    UnityTestCase {
441
187
        id: root
442
188
        name: "VisualQueueTest"
443
189
        when: windowShown
444
190
445
191
        function test_VisualSnapDecisionsQueue() {
446
192
            // populate model with some mock notifications
447
193
            addSomeSnapDecisionNotifications();
448
194
449
195
            // make sure the view is properly updated before going on
450
196
            waitForRendering(notifications);
451
197
452
198
            var snap_decision = [findChild(notifications, "notification1"),
453
199
                                 findChild(notifications, "notification2"),
454
200
                                 findChild(notifications, "notification3"),
455
201
                                 findChild(notifications, "notification4"),
456
202
                                 findChild(notifications, "notification5")]
457
203
458
204
            for (var index = 0; index < snap_decision.length; index++) {
459
205
                verify(snap_decision[index] !== undefined, index + ". snap-decision wasn't found");
460
206
            }
461
207
462
208
            // check initial states once all five snap-decisions were appended to the model
463
209
            compare(snap_decision[0].state, "expanded", "state of first snap-decision is not expanded");
464
210
            for (var index = 1; index < snap_decision.length; index++) {
465
211
                compare(snap_decision[index].state, "contracted", "state of "+ index + ".snap-decision is not contracted");
466
212
            }
467
213
468
214
            // click/tap on each snap-decision and verify only one is in expanded-state at any time
469
215
            for (var index = 0; index < snap_decision.length; index++) {
470
216
                mouseClick(snap_decision[index], snap_decision[index].width / 2, snap_decision[index].height / 2)
471
217
                for (var kindex = 0; kindex < snap_decision.length; kindex++) {
472
218
                    if (kindex == index) {
473
219
                        compare(snap_decision[kindex].state, "expanded", "state of "+ kindex + ".snap-decision is not expanded");
474
220
                    } else {
475
221
                        compare(snap_decision[kindex].state, "contracted", "state of "+ kindex + ".snap-decision is not contracted");
476
222
                    }
477
223
                }
478
224
            }
479
225
480
226
            // remove top-most and verify one of the remaining ones is still getting expanded
481
227
482
228
            // make first snap-decision expand
483
229
            mouseClick(snap_decision[0], snap_decision[0].width / 2, snap_decision[0].height / 2);
484
230
485
231
            for (var index = 1; index < snap_decision.length; index++) {
486
232
                removeTopMostNotification();
487
233
                compare(snap_decision[index].state, "expanded", "state of " + index + ". snap-decision is not expanded");
488
234
            }
489
235
        }
490
236
    }
491
237
}
Status:	Merged
Approved by:	Michael Zanetti on 2014-03-19
Approved revision:	556
Merged at revision:	787
Proposed branch:	lp:~macslow/unity8/snap-decisions-states
Merge into:	lp:unity8
Prerequisite:	lp:~macslow/unity8/fix-object-name-of-notification-ap-test
Diff against target:	491 lines (+330/-17) 5 files modified qml/Notifications/Notification.qml (+61/-4) qml/Notifications/Notifications.qml (+4/-0) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Notifications/tst_Notifications.qml (+27/-13) tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml (+237/-0)
To merge this branch:	bzr merge lp:~macslow/unity8/snap-decisions-states
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-03-12	Needs Fixing on 2014-03-19
Michael Zanetti (community)			Approve on 2014-03-19
Andrea Cimitan		2014-03-12	Pending
Review via email: mp+210618@code.launchpad.net