5612925 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Need this for the tests to pass locally after new chnage

5612925Albert Astals Cid10 years ago

tests/qmltests/Dash/tst_Dash.qml+4−3

compare with xenial

unifiedsplit

@@ -310,8 +310,9 @@ Item {

310 var stopX = units.gu(1)

311 var stopY = startY;

312 waitForRendering(dashContentList)

313− mouseFlick(dash, startX, startY, stopX, stopY);

313+ mouseFlick(dash, startX, startY, stopX, stopY, true, true, units.gu(200));

314+ compare(dashContentList.currentIndex, 1, "Could not flick to scope id 1");

314− mouseFlick(dash, startX, startY, stopX, stopY);

315+ mouseFlick(dash, startX, startY, stopX, stopY, units.gu(200));

315 compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");

316 compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");

316 var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");

317 var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");

317 dashCommunicatorService.mockSetCurrentScope(0, true, false);

318 dashCommunicatorService.mockSetCurrentScope(0, true, false);

@@ -411,7 +412,7 @@ Item {

411 compare(dashContentList.currentItem.scopeId, "clickscope");

412 compare(dashContentList.currentItem.scopeId, "clickscope");

412

413

413 // Move to second scope

414 // Move to second scope

414− mouseFlick(dash, dash.width / 2, units.gu(2), dash.width / 5, units.gu(2));

415+ mouseFlick(dash, dash.width / 2, units.gu(2), dash.width / 5, units.gu(2), true, true, units.gu(20));

415 tryCompare(dashContentList, "currentIndex", 1);

416 tryCompare(dashContentList, "currentIndex", 1);

416 compare(dashContentList.currentItem.scopeId, "MockScope1");

417 compare(dashContentList.currentItem.scopeId, "MockScope1");

417 }

418 }

tests/qmltests/Launcher/tst_Launcher.qml+3−3

@@ -813,7 +813,7 @@ Rectangle {

813

814 // Dragging a bit (> 1.5 gu)

815 newMouseX -= units.gu(2)

816− mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)

816+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false)

817 currentMouseX = newMouseX

818

819 // Other items need to expand and become 0.6 opaque

@@ -821,8 +821,8 @@ Rectangle {

821 tryCompare(item0, "itemOpacity", 0.6)

822

823 // Dragging a bit more

824− newMouseY += initialItemHeight * 1.5

824+ newMouseY += initialItemHeight * 1.25

825− mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)

825+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false)

826 currentMouseY = newMouseY

827

828 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)