dc5895d · unity8 · git.iko.soy

git.iko.soy/unity8

fix a test

commitdc5895dea25fa6f4059a1bd709b1e3a5d9905fe1 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 29 Aug 2016, 17:45 (10 years ago) parenta82b085

3 files changed+13−13

compare with xenial

unifiedsplit

qml/Stage/Spread/StagedRightEdgeMaths.qml−4 qml/Stage/Stage.qml+1 tests/qmltests/tst_Shell.qml+12−9

qml/Stage/Spread/StagedRightEdgeMaths.qml−4

@@ -50,10 +50,6 @@ QtObject {

5050 readonly property int animatedX: {

5151 var nextStage = appRepeater.itemAt(nextInStack) ? appRepeater.itemAt(nextInStack).stage : ApplicationInfoInterface.MainStage;

5252

53− if (model.application.appId == "unity8-dash") {

54− print("calculating X for dash:", itemIndex, nextInStack, nextStage, "(Main:", ApplicationInfoInterface.MainStage,")", appRepeater.itemAt(nextInStack).stage)

55− }

56−

5753 var startX = 0;

5854 if (isMainStageApp) {

5955 if (progress < breakPoint) {

qml/Stage/Stage.qml+1

@@ -388,6 +388,7 @@ AbstractStage {

388388

389389 Spread {

390390 id: spreadItem

391+ objectName: "spreadItem"

391392 anchors.fill: appContainer

392393 leftMargin: root.leftMargin

393394 model: root.topLevelSurfaceList

tests/qmltests/tst_Shell.qml+12−9

@@ -1707,30 +1707,33 @@ Rectangle {

17071707 function test_altBackTabNavigation() {

17081708 loadDesktopShellWithApps();

17091709

1710− var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");

1711− verify(spreadRepeater !== null);

1710+ print("findItem")

1711+ var spreadItem = findChild(shell, "spreadItem");

1712+ print("starting verify")

1713+ verify(spreadItem !== null);

1714+ print("verify done")

17121715

17131716 keyPress(Qt.Key_Alt)

17141717 keyClick(Qt.Key_Tab);

1715− tryCompare(spreadRepeater, "highlightedIndex", 1);

1718+ tryCompare(spreadItem, "highlightedIndex", 1);

17161719

17171720 keyClick(Qt.Key_Tab);

1718− tryCompare(spreadRepeater, "highlightedIndex", 2);

1721+ tryCompare(spreadItem, "highlightedIndex", 2);

17191722

17201723 keyClick(Qt.Key_Tab);

1721− tryCompare(spreadRepeater, "highlightedIndex", 3);

1724+ tryCompare(spreadItem, "highlightedIndex", 3);

17221725

17231726 keyClick(Qt.Key_Tab);

1724− tryCompare(spreadRepeater, "highlightedIndex", 4);

1727+ tryCompare(spreadItem, "highlightedIndex", 4);

17251728

17261729 keyClick(Qt.Key_Backtab);

1727− tryCompare(spreadRepeater, "highlightedIndex", 3);

1730+ tryCompare(spreadItem, "highlightedIndex", 3);

17281731

17291732 keyClick(Qt.Key_Backtab);

1730− tryCompare(spreadRepeater, "highlightedIndex", 2);

1733+ tryCompare(spreadItem, "highlightedIndex", 2);

17311734

17321735 keyClick(Qt.Key_Backtab);

1733− tryCompare(spreadRepeater, "highlightedIndex", 1);

1736+ tryCompare(spreadItem, "highlightedIndex", 1);

17341737

17351738 keyRelease(Qt.Key_Alt);

17361739 }