git.iko.soy/unity8
on xenial help sign in
Better test starting and stopping of alert/wiggle animation.
e46dc1dMirco Müller
qml/Launcher/LauncherDelegate.qml+1
compare with xenial
unifiedsplit
@@ -30,6 +30,7 @@ Item {
30 property bool alerting: false
30 property bool alerting: false
31 property bool revealing: false
31 property bool revealing: false
32 property bool hiding: false
32 property bool hiding: false
33+ readonly property alias wiggling: wiggleAnim.running
33
34
34 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
35 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
35 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
36 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
tests/qmltests/Launcher/tst_Launcher.qml+19−5
@@ -195,6 +195,16 @@ Item {
195 tryCompare(panel, "x", -panel.width, 1000);
195 tryCompare(panel, "x", -panel.width, 1000);
196 }
196 }
197
197
198+ function waitForWiggleToStart(appIcon) {
199+ verify(appIcon != undefined)
200+ tryCompare(appIcon, "wiggling", true, 1000, "wiggle-anim should not be in stopped state")
201+ }
202+
203+ function waitForWiggleToStop(appIcon) {
204+ verify(appIcon != undefined)
205+ tryCompare(appIcon, "wiggling", false, 1000, "wiggle-anim should not be in running state")
206+ }
207+
198 function positionLauncherListAtBeginning() {
208 function positionLauncherListAtBeginning() {
199 var listView = testCase.findChild(launcherLoader.item, "launcherListView");
209 var listView = testCase.findChild(launcherLoader.item, "launcherListView");
200 listView.contentY = -listView.topMargin;
210 listView.contentY = -listView.topMargin;
@@ -673,20 +683,20 @@ Item {
673 }
683 }
674
684
675 function test_alertHidingIcon() {
685 function test_alertHidingIcon() {
676− var appIcon6 = findChild(launcher, "launcherDelegate6");
686+ var appIcon6 = findChild(launcher, "launcherDelegate6")
687+ verify(appIcon6 != undefined)
677 LauncherModel.alert(LauncherModel.get(6).appId, true)
688 LauncherModel.alert(LauncherModel.get(6).appId, true)
678− wait(500)
689+ waitForWiggleToStart(appIcon6)
679− verify(appIcon6.x > 0)
680 LauncherModel.alert(LauncherModel.get(6).appId, false)
690 LauncherModel.alert(LauncherModel.get(6).appId, false)
681 tryCompare(appIcon6, "x", 0, 1000, "x-value of appId #6 should not be non-zero")
691 tryCompare(appIcon6, "x", 0, 1000, "x-value of appId #6 should not be non-zero")
682 }
692 }
683
693
684 function test_alertImplicitHidingIcon() {
694 function test_alertImplicitHidingIcon() {
685− var appIcon4 = findChild(launcher, "launcherDelegate4");
695+ var appIcon4 = findChild(launcher, "launcherDelegate4")
686 LauncherModel.alert(LauncherModel.get(4).appId, true)
696 LauncherModel.alert(LauncherModel.get(4).appId, true)
687 wait(500)
697 wait(500)
688 verify(appIcon4.x > 0)
698 verify(appIcon4.x > 0)
689− dragLauncherIntoView();
699+ dragLauncherIntoView()
690 tryCompare(appIcon4, "x", 0, 1000, "x-value of appId #4 should not be non-zero")
700 tryCompare(appIcon4, "x", 0, 1000, "x-value of appId #4 should not be non-zero")
691 LauncherModel.alert(LauncherModel.get(4).appId, false)
701 LauncherModel.alert(LauncherModel.get(4).appId, false)
692 }
702 }
@@ -734,10 +744,14 @@ Item {
734 var appIcon7 = findChild(launcher, "launcherDelegate7");
744 var appIcon7 = findChild(launcher, "launcherDelegate7");
735 LauncherModel.alert(LauncherModel.get(1).appId, true)
745 LauncherModel.alert(LauncherModel.get(1).appId, true)
736 tryCompare(appIcon1, "angle", 0, 1000, "angle of appId #1 should not be non-zero")
746 tryCompare(appIcon1, "angle", 0, 1000, "angle of appId #1 should not be non-zero")
747+ waitForWiggleToStart(appIcon1)
737 LauncherModel.alert(LauncherModel.get(7).appId, true)
748 LauncherModel.alert(LauncherModel.get(7).appId, true)
738 tryCompare(appIcon7, "angle", 0, 1000, "angle of appId #7 should not be non-zero")
749 tryCompare(appIcon7, "angle", 0, 1000, "angle of appId #7 should not be non-zero")
750+ waitForWiggleToStart(appIcon7)
739 LauncherModel.alert(LauncherModel.get(1).appId, false)
751 LauncherModel.alert(LauncherModel.get(1).appId, false)
752+ waitForWiggleToStop(appIcon1)
740 LauncherModel.alert(LauncherModel.get(7).appId, false)
753 LauncherModel.alert(LauncherModel.get(7).appId, false)
754+ waitForWiggleToStop(appIcon7)
741 }
755 }
742 }
756 }
743}
757}