Rework test for bug 292789 to try and fix the timeout on qm-centos5-01

This commit is contained in:
gavin@gavinsharp.com 2008-04-14 01:50:51 -07:00
parent 1811675432
commit 64695153a3

View File

@ -25,54 +25,81 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=292789
** even for ALLOW_CHROME mechanisms (<script>, <img> etc)
**/
SimpleTest.waitForExplicitFinish();
/** <script src=""> test **/
function testScriptSrc(aCallback) {
is(typeof srGetStrBundle, "function",
"content can still load <script> from chrome://global");
is(typeof XPInstallConfirm, "undefined",
"content should not be able to load <script> from chrome://mozapps");
/** make sure the last one didn't pass because someone
** moved the resource
**/
var resjs = document.createElement("script");
resjs.src = "jar:resource://gre/chrome/toolkit.jar!/content/mozapps/xpinstall/xpinstallConfirm.js";
resjs.onload = scriptOnload;
document.getElementById("content").appendChild(resjs);
is(typeof srGetStrBundle, "function",
"content can still load <script> from chrome://global");
is(typeof XPInstallConfirm, "undefined",
"content should not be able to load <script> from chrome://mozapps");
/** make sure the last one didn't pass because someone
** moved the resource
**/
var resjs = document.createElement("script");
resjs.src = "jar:resource://gre/chrome/toolkit.jar!/content/mozapps/xpinstall/xpinstallConfirm.js";
document.body.appendChild(resjs);
setTimeout('is(typeof XPInstallConfirm, "object",'+
'"xpinstallConfirm.js has not moved unexpectedly")',0);
function scriptOnload() {
is(typeof XPInstallConfirm, "object",
"xpinstallConfirm.js has not moved unexpectedly");
// trigger the callback
if (aCallback)
aCallback();
}
}
/** <img src=""> tests **/
var img_global = "chrome://global/skin/icons/Error.png";
var img_mozapps = "chrome://mozapps/skin/passwordmgr/key.png";
var res_mozapps = "jar:resource://gre/chrome/classic.jar!/skin/classic/mozapps/passwordmgr/key.png";
var imgTests = [[img_global, "success"],
[img_mozapps, "fail"],
[res_mozapps, "success"]];
var curImgTest = 0;
function runImgTest() {
var test = imgTests[curImgTest++];
var callback = curImgTest == imgTests.length ? finishTest : runImgTest;
loadImage(test[0], test[1], callback);
}
function finishTest() {
SimpleTest.finish();
}
function fail(event) {
is(event.target.expected, "fail",
"content should not be allowed to load "+event.target.src);
if (event.target.callback)
event.target.callback();
}
function success(event) {
is(event.target.expected, "success",
"content should be able to load "+event.target.src);
if (event.target.callback)
event.target.callback();
}
function loadImage(uri, expect) {
function loadImage(uri, expect, callback) {
var img = document.createElement("img");
img.onerror = fail;
img.onload = success;
img.expected = expect;
img.callback = callback;
img.src = uri;
//document.getElementById("content").appendChild(img);
}
loadImage(img_global, "success");
loadImage(img_mozapps, "fail");
loadImage(res_mozapps, "success");
// Start off the script src test, and have it start the img tests when complete.
testScriptSrc(runImgTest);
</script>
</pre>
</body>
</html>