on xenial help sign in
Accept asynchronicity in more MenuBar tests
d9f9c66Dalton Durst
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+4−4
@@ -340,11 +340,11 @@ Item {
340 tryCompare(menuItem1, "popupVisible", true);
340 tryCompare(menuItem1, "popupVisible", true);
341 }
341 }
342
342
343− function test_overfow() {
343+ function test_overflow() {
344 menuBackend.modelData = appMenuData.generateTestData(5,2,0,0,"menu");
344 menuBackend.modelData = appMenuData.generateTestData(5,2,0,0,"menu");
345
345
346 var overflow = findChild(menuBar, "overflow");
346 var overflow = findChild(menuBar, "overflow");
347− compare(overflow.visible, false, "Overflow should not be visible");
347+ tryCompare(overflow, "visible", false, 5000, "Overflow should not be visible");
348
348
349 var menu = { "rowData": { "label": "Short" } };
349 var menu = { "rowData": { "label": "Short" } };
350 tryCompareFunction(function() {
350 tryCompareFunction(function() {
@@ -357,12 +357,12 @@ Item {
357 }, true);
357 }, true);
358
358
359 mouseClick(overflow);
359 mouseClick(overflow);
360− verify(overflow.__popup);
360+ tryVerify(function() {return overflow.__popup});
361 var menuItem = findChild(menuBar, "overflow-menu-item0-actionItem");
361 var menuItem = findChild(menuBar, "overflow-menu-item0-actionItem");
362 waitForRendering(menuItem);
362 waitForRendering(menuItem);
363 mouseClick(menuItem);
363 mouseClick(menuItem);
364
364
365− verify(findChild(menuBar, "overflow-menu-item0-menu-item0-actionItem"));
365+ tryVerify(function() {return findChild(menuBar, "overflow-menu-item0-menu-item0-actionItem")});
366
366
367 tryCompareFunction(function() {
367 tryCompareFunction(function() {
368 menuBackend.removeRow(0);
368 menuBackend.removeRow(0);