a76e6d3 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix tests?

a76e6d3Albert Astals Cid10 years ago

tests/qmltests/Panel/tst_Panel.qml+8−5

compare with xenial

unifiedsplit

@@ -320,12 +320,15 @@ PanelTest {

320 tryCompare(panel.indicators, "fullyOpened", true);

321 }

322

323− function pullDownApplicationsMenu() {

323+ function pullDownApplicationsMenu(xPos) {

324 var showDragHandle = findChild(panel.applicationMenus, "showDragHandle");

325+ if (xPos === undefined) {

326+ xPos = showDragHandle.width / 2;

327+ }

325 touchFlick(showDragHandle,

328 touchFlick(showDragHandle,

326− showDragHandle.width / 2,

329+ xPos,

327 showDragHandle.height / 2,

330 showDragHandle.height / 2,

328− showDragHandle.width / 2,

331+ xPos,

329 showDragHandle.height / 2 + (showDragHandle.autoCompleteDragThreshold * 1.1));

332 showDragHandle.height / 2 + (showDragHandle.autoCompleteDragThreshold * 1.1));

330 tryCompare(panel.applicationMenus, "fullyOpened", true);

333 tryCompare(panel.applicationMenus, "fullyOpened", true);

331 }

334 }

@@ -853,7 +856,7 @@ PanelTest {

853 var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");

856 var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");

854

857

855 PanelState.title = "Fake Title"

858 PanelState.title = "Fake Title"

856− pullDownApplicationsMenu();

859+ pullDownApplicationsMenu(0 /*xPos*/);

857 compare(aboutToShowCalledSpy.count, 1);

860 compare(aboutToShowCalledSpy.count, 1);

858

861

859 keyClick(Qt.Key_Right);

862 keyClick(Qt.Key_Right);

@@ -886,7 +889,7 @@ PanelTest {

886 var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");

889 var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");

887

890

888 PanelState.title = "Fake Title"

891 PanelState.title = "Fake Title"

889− pullDownApplicationsMenu();

892+ pullDownApplicationsMenu(0 /*xPos*/);

890

893

891 tryCompare(indicatorsBar, "currentItemIndex", 0);

894 tryCompare(indicatorsBar, "currentItemIndex", 0);

892

895