git.iko.soy/unity8
on xenial help sign in
fixup failing test
00b0fd9Lukáš Tinkl
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+5−2
compare with xenial
unifiedsplit
@@ -81,10 +81,10 @@ Item {
81 name: "MenuBar"
81 name: "MenuBar"
82 when: windowShown
82 when: windowShown
83
83
84− function init() {
84+ function cleanup() {
85 menuBar.dismiss();
85 menuBar.dismiss();
86− menuBackend.modelData = appMenuData.generateTestData(5,5,2,3, "menu")
87 activatedSpy.clear();
86 activatedSpy.clear();
87+ menuBackend.modelData = null;
88 }
88 }
89
89
90 function test_mouseNavigation() {
90 function test_mouseNavigation() {
@@ -97,6 +97,7 @@ Item {
97 var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);
97 var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);
98
98
99 menuItem0.show();
99 menuItem0.show();
100+ mouseMove(menuItem0, menuItem0.width/2, menuItem0.height/2);
100 compare(priv.currentItem, menuItem0, "CurrentItem should be set to item 0");
101 compare(priv.currentItem, menuItem0, "CurrentItem should be set to item 0");
101 compare(priv.currentItem.popupVisible, true, "Popup should be visible");
102 compare(priv.currentItem.popupVisible, true, "Popup should be visible");
102
103
@@ -178,6 +179,7 @@ Item {
178
179
179 keyPress(data.tag, Qt.AltModifier, 100);
180 keyPress(data.tag, Qt.AltModifier, 100);
180 tryCompare(priv, "currentItem", menuItem);
181 tryCompare(priv, "currentItem", menuItem);
182+ keyRelease(data.tag, Qt.AltModifier, 100);
181 }
183 }
182
184
183 function test_menuActivateClosesMenu() {
185 function test_menuActivateClosesMenu() {
@@ -216,6 +218,7 @@ Item {
216 }
218 }
217
219
218 function test_openAppMenuShortcut() {
220 function test_openAppMenuShortcut() {
221+ menuBackend.modelData = appMenuData.generateTestData(5,5,2,3, "menu")
219 var priv = findInvisibleChild(menuBar, "d");
222 var priv = findInvisibleChild(menuBar, "d");
220
223
221 var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);
224 var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);