d78335d · unity8 · git.iko.soy

on xenial help sign in

Fixed manual merge-issue causing problems in Notification-qmltest.

d78335dMirco Müller12 years ago

tests/qmltests/Notifications/tst_Notifications.qml+10−10

@@ -666,17 +666,17 @@ Item {

666 compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")

667 }

668 }

669− }

670

669

671− // swipe-to-dismiss check

670+ // swipe-to-dismiss check

672− if (data.type !== Notification.SnapDecision && notification.state !== "expanded") {

671+ if (data.type !== Notification.SnapDecision && notification.state !== "expanded") {

673− var before = mockModel.count

672+ var before = mockModel.count

674− var dragStart = notification.width * 0.25;

673+ var dragStart = notification.width * 0.25;

675− var dragEnd = notification.width;

674+ var dragEnd = notification.width;

676− var dragY = notification.height / 2;

675+ var dragY = notification.height / 2;

677− touchFlick(notification, dragStart, dragY, dragEnd, dragY)

676+ touchFlick(notification, dragStart, dragY, dragEnd, dragY)

678− waitForRendering(notification)

677+ waitForRendering(notification)

679− tryCompare(mockModel, "count", before - 1)

678+ tryCompare(mockModel, "count", before - 1)

679+ }

680 }

681 }

682 }