Skip to content

Commit

Permalink
Bug 1698668 - Replace most uses of testItem with uses of is and activ…
Browse files Browse the repository at this point in the history 
…ateItem, for better errors messages. r=harry

Depends on D108549

Differential Revision: https://phabricator.services.mozilla.com/D108550
  • Loading branch information
@mstange
mstange committed Mar 18, 2021
1 parent cc7ff48 commit d30b941
Showing 1 changed file with 54 additions and 38 deletions.
92 changes: 54 additions & 38 deletions widget/tests/standalone_native_menu_window.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,26 @@
window.arguments[0].SimpleTest.ok(condition, message);
}

function is(a, b, message) {
window.arguments[0].SimpleTest.is(a, b, message);
}

function isnot(a, b, message) {
window.arguments[0].SimpleTest.isnot(a, b, message);
}

function todo(condition, message) {
window.arguments[0].SimpleTest.todo(condition, message);
}

function todo_is(a, b, message) {
window.arguments[0].SimpleTest.todo_is(a, b, message);
}

function todo_isnot(a, b, message) {
window.arguments[0].SimpleTest.todo_isnot(a, b, message);
}

function onTestsFinished() {
window.close();
window.arguments[0].SimpleTest.finish();
Expand Down Expand Up @@ -226,66 +242,66 @@
var sna = "Command handler(s) should not have activated";

// Test middle items.
ok(testItem(menu, "1|1", "cmd_NewItem1"), "#1:" + sa);
ok(testItem(menu, "1|3|1", "cmd_NewItem4"), "#2:" + sa);
is(activateItem(menu, "1|1"), "cmd_NewItem1", "#1:" + sa);
is(activateItem(menu, "1|3|1"), "cmd_NewItem4", "#2:" + sa);

// Hide newMenu0.
newMenu0.setAttribute("hidden", "true");
ok(runBaseMenuTests(menu), "base tests #3: " + sa); // the base menu should still be unhidden
ok(!testItem(menu, "1|0", ""), "#3:" + sna);
ok(!testItem(menu, "1|1", ""), "#4:" + sna);
ok(!testItem(menu, "1|2", ""), "#5:" + sna);
ok(!testItem(menu, "1|3|0", ""), "#6:" + sna);
ok(!testItem(menu, "1|3|1", ""), "#7:" + sna);
ok(!testItem(menu, "1|3|2", ""), "#8:" + sna);
is(activateItem(menu, "1|0"), "", "#3:" + sna);
is(activateItem(menu, "1|1"), "", "#4:" + sna);
is(activateItem(menu, "1|2"), "", "#5:" + sna);
is(activateItem(menu, "1|3|0"), "", "#6:" + sna);
is(activateItem(menu, "1|3|1"), "", "#7:" + sna);
is(activateItem(menu, "1|3|2"), "", "#8:" + sna);

// Show newMenu0.
newMenu0.setAttribute("hidden", "false");
menu.forceUpdateNativeMenuAt("1|3");
ok(runBaseMenuTests(menu), "base tests #4:" + sa);
ok(testItem(menu, "1|0", "cmd_NewItem0"), "#9:" + sa);
ok(testItem(menu, "1|1", "cmd_NewItem1"), "#10:" + sa);
ok(testItem(menu, "1|2", "cmd_NewItem2"), "#11:" + sa);
ok(testItem(menu, "1|3|0", "cmd_NewItem3"), "#12:" + sa);
ok(testItem(menu, "1|3|1", "cmd_NewItem4"), "#13:" + sa);
ok(testItem(menu, "1|3|2", "cmd_NewItem5"), "#14:" + sa);
is(activateItem(menu, "1|0"), "cmd_NewItem0", "#9:" + sa);
is(activateItem(menu, "1|1"), "cmd_NewItem1", "#10:" + sa);
is(activateItem(menu, "1|2"), "cmd_NewItem2", "#11:" + sa);
is(activateItem(menu, "1|3|0"), "cmd_NewItem3", "#12:" + sa);
is(activateItem(menu, "1|3|1"), "cmd_NewItem4", "#13:" + sa);
is(activateItem(menu, "1|3|2"), "cmd_NewItem5", "#14:" + sa);

// Hide items.
newMenuItem1.setAttribute("hidden", "true");
newMenuItem4.setAttribute("hidden", "true");
menu.forceUpdateNativeMenuAt("1|2");
ok(runBaseMenuTests(menu), "base tests #5:" + sa);
ok(testItem(menu, "1|0", "cmd_NewItem0"), "#15:" + sa);
ok(testItem(menu, "1|1", "cmd_NewItem2"), "#16:" + sa);
ok(!testItem(menu, "1|2", ""), "#17:" + sna);
ok(testItem(menu, "1|2|0", "cmd_NewItem3"), "#18:" + sa);
ok(testItem(menu, "1|2|1", "cmd_NewItem5"), "#19:" + sa);
ok(!testItem(menu, "1|2|2", ""), "#20:" + sna);
is(activateItem(menu, "1|0"), "cmd_NewItem0", "#15:" + sa);
is(activateItem(menu, "1|1"), "cmd_NewItem2", "#16:" + sa);
is(activateItem(menu, "1|2"), "", "#17:" + sna);
is(activateItem(menu, "1|2|0"), "cmd_NewItem3", "#18:" + sa);
is(activateItem(menu, "1|2|1"), "cmd_NewItem5", "#19:" + sa);
is(activateItem(menu, "1|2|2"), "", "#20:" + sna);

// Show items.
newMenuItem1.setAttribute("hidden", "false");
newMenuItem4.setAttribute("hidden", "false");
//forceUpdateNativeMenuAt("1|3");
ok(runBaseMenuTests(menu), "base tests #6:" + sa);
ok(testItem(menu, "1|0", "cmd_NewItem0"), "#21:" + sa);
ok(testItem(menu, "1|1", "cmd_NewItem1"), "#22:" + sa);
ok(testItem(menu, "1|2", "cmd_NewItem2"), "#23:" + sa);
ok(testItem(menu, "1|3|0", "cmd_NewItem3"), "#24:" + sa);
ok(testItem(menu, "1|3|1", "cmd_NewItem4"), "#25:" + sa);
ok(testItem(menu, "1|3|2", "cmd_NewItem5"), "#26:" + sa);
is(activateItem(menu, "1|0"), "cmd_NewItem0", "#21:" + sa);
is(activateItem(menu, "1|1"), "cmd_NewItem1", "#22:" + sa);
is(activateItem(menu, "1|2"), "cmd_NewItem2", "#23:" + sa);
is(activateItem(menu, "1|3|0"), "cmd_NewItem3", "#24:" + sa);
is(activateItem(menu, "1|3|1"), "cmd_NewItem4", "#25:" + sa);
is(activateItem(menu, "1|3|2"), "cmd_NewItem5", "#26:" + sa);

// At this point in the tests the state of the menus has been returned
// to the originally diagramed state.

// Remove menu.
menuNode.removeChild(newMenu0);
ok(runBaseMenuTests(menu), "base tests #7:" + sa);
ok(!testItem(menu, "1|0", ""), "#27:" + sna);
ok(!testItem(menu, "1|1", ""), "#28:" + sna);
ok(!testItem(menu, "1|2", ""), "#29:" + sna);
ok(!testItem(menu, "1|3|0", ""), "#30:" + sna);
ok(!testItem(menu, "1|3|1", ""), "#31:" + sna);
ok(!testItem(menu, "1|3|2", ""), "#32:" + sna);
is(activateItem(menu, "1|0"), "", "#27:" + sna);
is(activateItem(menu, "1|1"), "", "#28:" + sna);
is(activateItem(menu, "1|2"), "", "#29:" + sna);
is(activateItem(menu, "1|3|0"), "", "#30:" + sna);
is(activateItem(menu, "1|3|1"), "", "#31:" + sna);
is(activateItem(menu, "1|3|2"), "", "#32:" + sna);
// return state to original diagramed state
menuNode.appendChild(newMenu0);

Expand All @@ -299,12 +315,12 @@
menuNode.appendChild(newMenu0);
menu.forceUpdateNativeMenuAt("1|3");
//todo(runBaseMenuTests(menu), "base tests #8");
todo(testItem(menu, "1|0", "cmd_NewItem0"), "#33:" +sa);
todo(testItem(menu, "1|1", "cmd_NewItem1"), "#34:" +sa);
todo(testItem(menu, "1|2", "cmd_NewItem2"), "#35:" +sa);
todo(testItem(menu, "1|3|0", "cmd_NewItem3"), "#36:" +sa);
todo(testItem(menu, "1|3|1", "cmd_NewItem4"), "#37:" +sa);
todo(testItem(menu, "1|3|2", "cmd_NewItem5"), "#38:" +sa);
todo_is(activateItem(menu, "1|0"), "cmd_NewItem0", "#33:" +sa);
todo_is(activateItem(menu, "1|1"), "cmd_NewItem1", "#34:" +sa);
todo_is(activateItem(menu, "1|2"), "cmd_NewItem2", "#35:" +sa);
todo_is(activateItem(menu, "1|3|0"), "cmd_NewItem3", "#36:" +sa);
todo_is(activateItem(menu, "1|3|1"), "cmd_NewItem4", "#37:" +sa);
todo_is(activateItem(menu, "1|3|2"), "cmd_NewItem5", "#38:" +sa);
// return state to original diagramed state
menuNode.removeChild(tmpMenu0);

Expand Down

0 comments on commit d30b941

Please sign in to comment.