git.iko.soy/unity8
on xenial help sign in
fix tests
02fba25Lukáš Tinkl
qml/Notifications/Notification.qml+1−1
compare with xenial
unifiedsplit
@@ -217,6 +217,7 @@ StyledItem {
217
217
218 Column {
218 Column {
219 id: outterColumn
219 id: outterColumn
220+ objectName: "outterColumn"
220
221
221 anchors {
222 anchors {
222 left: parent.left
223 left: parent.left
@@ -229,7 +230,6 @@ StyledItem {
229
230
230 Row {
231 Row {
231 id: topRow
232 id: topRow
232− objectName: "topRow"
233
233
234 spacing: notification.margins
234 spacing: notification.margins
235 anchors {
235 anchors {
tests/qmltests/Notifications/tst_Notifications.qml+3−6
@@ -573,10 +573,7 @@ Item {
573 var notification = findChild(notifications, "notification" + (mockModel.count - 1))
573 var notification = findChild(notifications, "notification" + (mockModel.count - 1))
574 waitForRendering(notification);
574 waitForRendering(notification);
575 verify(notification, "notification wasn't found");
575 verify(notification, "notification wasn't found");
576−
577− var topRow = findChild(notification, "topRow");
578− tryCompare(notification, "height", notification.state === "contracted" ? topRow.childrenRect.height + notification.margins * 2
576+ tryCompare(notification, "height", notification.implicitHeight);
579− : notification.implicitHeight);
580
577
581 var icon = findChild(notification, "icon")
578 var icon = findChild(notification, "icon")
582 var centeredIcon = findChild(notification, "centeredIcon")
579 var centeredIcon = findChild(notification, "centeredIcon")
@@ -617,8 +614,8 @@ Item {
617 for (var i = 0; i < mockModel.count; ++i) {
614 for (var i = 0; i < mockModel.count; ++i) {
618 var n = findChild(notifications, "notification" + i)
615 var n = findChild(notifications, "notification" + i)
619 waitForRendering(n);
616 waitForRendering(n);
620− var topRow = findChild(n, "topRow");
617+ var outterColumn = findChild(n, "outterColumn");
621− tryCompare(n, "height", n.state === "contracted" ? topRow.childrenRect.height + n.margins * 2 : n.implicitHeight);
618+ tryCompare(n, "height", outterColumn.height + n.margins * 2);
622 }
619 }
623
620
624 if (data.hasSound) {
621 if (data.hasSound) {