git.iko.soy/unity8
on xenial help sign in
Adapted the SwipeToAct qml-test too after the merge with trunk.
addc914Mirco Müller
tests/qmltests/Notifications/tst_SwipeToAct.qml+5−8
compare with xenial
unifiedsplit
@@ -166,8 +166,7 @@ Item {
166 summaryVisible: true,
166 summaryVisible: true,
167 bodyVisible: true,
167 bodyVisible: true,
168 iconVisible: true,
168 iconVisible: true,
169− shapedIcon: true,
169+ shaped: true,
170− nonShapedIcon: false,
171 secondaryIconVisible: true,
170 secondaryIconVisible: true,
172 buttonRowVisible: true,
171 buttonRowVisible: true,
173 buttonTinted: false,
172 buttonTinted: false,
@@ -186,8 +185,7 @@ Item {
186 summaryVisible: true,
185 summaryVisible: true,
187 bodyVisible: true,
186 bodyVisible: true,
188 iconVisible: true,
187 iconVisible: true,
189− shapedIcon: true,
188+ shaped: true,
190− nonShapedIcon: false,
191 secondaryIconVisible: true,
189 secondaryIconVisible: true,
192 buttonRowVisible: true,
190 buttonRowVisible: true,
193 buttonTinted: false,
191 buttonTinted: false,
@@ -230,8 +228,6 @@ Item {
230 waitForRendering(notification);
228 waitForRendering(notification);
231
229
232 var icon = findChild(notification, "icon")
230 var icon = findChild(notification, "icon")
233− var shapedIcon = findChild(notification, "shapedIcon")
234− var nonShapedIcon = findChild(notification, "nonShapedIcon")
235 var interactiveArea = findChild(notification, "interactiveArea")
231 var interactiveArea = findChild(notification, "interactiveArea")
236 var secondaryIcon = findChild(notification, "secondaryIcon")
232 var secondaryIcon = findChild(notification, "secondaryIcon")
237 var summaryLabel = findChild(notification, "summaryLabel")
233 var summaryLabel = findChild(notification, "summaryLabel")
@@ -239,8 +235,9 @@ Item {
239 var buttonRow = findChild(notification, "buttonRow")
235 var buttonRow = findChild(notification, "buttonRow")
240
236
241 compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
237 compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
242− compare(shapedIcon.visible, data.shapedIcon, "shaped-icon visibility is incorrect")
238+ if (icon.visible) {
243− compare(nonShapedIcon.visible, data.nonShapedIcon, "non-shaped-icon visibility is incorrect")
239+ compare(icon.shaped, data.shaped, "shaped-status is incorrect")
240+ }
244
241
245 // test input does not fall through
242 // test input does not fall through
246 mouseClick(notification, notification.width / 2, notification.height / 2)
243 mouseClick(notification, notification.width / 2, notification.height / 2)