@@ -166,8 +166,7 @@ Item {
166166 summaryVisible: true,
167167 bodyVisible: true,
168168 iconVisible: true,
169− shapedIcon: true,
170− nonShapedIcon: false,
169+ shaped: true,
171170 secondaryIconVisible: true,
172171 buttonRowVisible: true,
173172 buttonTinted: false,
@@ -186,8 +185,7 @@ Item {
186185 summaryVisible: true,
187186 bodyVisible: true,
188187 iconVisible: true,
189− shapedIcon: true,
190− nonShapedIcon: false,
188+ shaped: true,
191189 secondaryIconVisible: true,
192190 buttonRowVisible: true,
193191 buttonTinted: false,
@@ -230,8 +228,6 @@ Item {
230228 waitForRendering(notification);
231229
232230 var icon = findChild(notification, "icon")
233− var shapedIcon = findChild(notification, "shapedIcon")
234− var nonShapedIcon = findChild(notification, "nonShapedIcon")
235231 var interactiveArea = findChild(notification, "interactiveArea")
236232 var secondaryIcon = findChild(notification, "secondaryIcon")
237233 var summaryLabel = findChild(notification, "summaryLabel")
@@ -239,8 +235,9 @@ Item {
239235 var buttonRow = findChild(notification, "buttonRow")
240236
241237 compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
242− compare(shapedIcon.visible, data.shapedIcon, "shaped-icon visibility is incorrect")
243− compare(nonShapedIcon.visible, data.nonShapedIcon, "non-shaped-icon visibility is incorrect")
238+ if (icon.visible) {
239+ compare(icon.shaped, data.shaped, "shaped-status is incorrect")
240+ }
244241
245242 // test input does not fall through
246243 mouseClick(notification, notification.width / 2, notification.height / 2)