Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 868432 - Alter tests to be aware of delayed changes in scrolling. r=roc

Browse Source
This commit is contained in:
JosiahOne 2013-05-08 22:25:09 -04:00
parent 26551896bf
commit 4b2747cd47
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/libeditor/base/tests/test_selection_move_commands.xul
View File

@ -123,8 +123,10 @@ function execTests() {
}
doCommand("cmd_scrollBottom");
yield;
testScrollCommand("cmd_scrollBottom", root.scrollHeight - 100);
doCommand("cmd_scrollTop");
yield;
testScrollCommand("cmd_scrollTop", 0);
doCommand("cmd_scrollPageDown");

31
toolkit/content/tests/chrome/test_showcaret.xul
View File

@ -33,8 +33,6 @@ function runTest()
window.frames[0].focus();
document.commandDispatcher.getControllerForCommand("cmd_moveBottom").doCommand("cmd_moveBottom");
ok(frames[0].scrollY > 0, "scrollY for non-showcaret");
is(sel1.focusNode, frames[0].document.body, "focusNode for non-showcaret");
is(sel1.focusOffset, 0, "focusOffset for non-showcaret");
@ -49,6 +47,22 @@ function runTest()
otherWindow = window.open("window_showcaret.xul", "_blank", "chrome,width=400,height=200");
otherWindow.addEventListener("focus", otherWindowFocused, false);
var sel1 = frames[0].getSelection();
sel1.collapse(frames[0].document.body, 0);
var sel2 = frames[1].getSelection();
sel2.collapse(frames[1].document.body, 0);
window.frames[0].focus();
document.commandDispatcher.getControllerForCommand("cmd_moveBottom").doCommand("cmd_moveBottom");
/* We aren't sure exactly how long the cmd_moveBottom will take.
* Therefore, check for success every second. If we don't have success within 10 seconds, assume the scroll
* will never pass the test and fail it.
*/
var timeoutUntilFail = window.setTimeout(scrollYTimeout, 10000);
var testScroll = self.setInterval(function(){continueTest()}, 10);
}
function otherWindowFocused()
@ -73,6 +87,19 @@ function otherWindowFocused()
SimpleTest.finish();
}
function continueTest() {
if (frames[0].scrollY > 0) {
return;
}
testScroll = window.clearInterval(testScroll);
window.clearTimeout(timeoutUntilFail);
return;
}
function scrollYTimeout() {
ok(frames[0].scrollY > 0, "scrollY for non-showcaret");
}
]]>
</script>