Bug 1261233 - prevent test_bug331215.xul from intermittently timing out. r?Gijs
MozReview-Commit-ID: 4dvWUdNTBOx
--- a/toolkit/content/tests/chrome/bug331215_window.xul
+++ b/toolkit/content/tests/chrome/bug331215_window.xul
@@ -14,16 +14,17 @@
width="600"
height="600"
onload="SimpleTest.executeSoon(startTest);"
title="331215 test">
<script type="application/javascript"><![CDATA[
const {interfaces: Ci, classes: Cc, results: Cr, utils: Cu} = Components;
Cu.import("resource://gre/modules/Task.jsm");
+ Cu.import("resource://testing-common/BrowserTestUtils.jsm");
Cu.import("resource://testing-common/ContentTask.jsm");
ContentTask.setTestScope(window.opener.wrappedJSObject);
var gFindBar = null;
var gBrowser;
var imports = ["SimpleTest", "ok", "info"];
for (var name of imports) {
@@ -42,62 +43,58 @@
SimpleTest.finish();
});
}
function* startTestWithBrowser(browserId) {
info("Starting test with browser '" + browserId + "'");
gBrowser = document.getElementById(browserId);
gFindBar.browser = gBrowser;
- let promise = ContentTask.spawn(gBrowser, null, function* () {
- return new Promise(resolve => {
- addEventListener("DOMContentLoaded", function listener() {
- removeEventListener("DOMContentLoaded", listener);
- resolve();
- });
- });
- });
+ let promise = BrowserTestUtils.browserLoaded(gBrowser);
gBrowser.loadURI("data:text/plain,latest");
yield promise;
yield onDocumentLoaded();
}
function* onDocumentLoaded() {
document.getElementById("cmd_find").doCommand();
- yield enterStringIntoFindField("test");
+ yield promiseEnterStringIntoFindField("test");
document.commandDispatcher
.getControllerForCommand("cmd_moveTop")
.doCommand("cmd_moveTop");
- yield enterStringIntoFindField("l");
+ yield promiseEnterStringIntoFindField("l");
ok(gFindBar._findField.getAttribute("status") == "notfound",
- "Findfield status attribute should have been 'notfound'" +
- " after entering ltest");
- yield enterStringIntoFindField("a");
+ "Findfield status attribute should have been 'notfound' after entering test");
+ yield promiseEnterStringIntoFindField("a");
ok(gFindBar._findField.getAttribute("status") != "notfound",
- "Findfield status attribute should not have been 'notfound'" +
- " after entering latest");
+ "Findfield status attribute should not have been 'notfound' after entering latest");
}
- function* enterStringIntoFindField(aString) {
- for (let i = 0; i < aString.length; i++) {
- let event = document.createEvent("KeyboardEvent");
- let promise = new Promise(resolve => {
- let listener = {
- onFindResult: function() {
- gFindBar.browser.finder.removeResultListener(listener);
- resolve();
- }
- };
- gFindBar.browser.finder.addResultListener(listener);
- });
- event.initKeyEvent("keypress", true, true, null, false, false,
- false, false, 0, aString.charCodeAt(i));
- gFindBar._findField.inputField.dispatchEvent(event);
- yield promise;
- }
+ function promiseEnterStringIntoFindField(aString) {
+ return new Promise(resolve => {
+ let listener = {
+ onFindResult: function(result) {
+ if (result.result == Ci.nsITypeAheadFind.FIND_FOUND && result.searchString != aString)
+ return;
+ gFindBar.browser.finder.removeResultListener(listener);
+ resolve();
+ }
+ };
+ gFindBar.browser.finder.addResultListener(listener);
+
+ for (let c of aString) {
+ let code = c.charCodeAt(0);
+ let ev = new KeyboardEvent("keypress", {
+ keyCode: code,
+ charCode: code,
+ bubbles: true
+ });
+ gFindBar._findField.inputField.dispatchEvent(ev);
+ }
+ });
}
]]></script>
<commandset>
<command id="cmd_find" oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
</commandset>
<browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
<browser type="content" primary="true" flex="1" id="content-remote" remote="true" src="about:blank"/>