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

git-svn-id: svn://10.0.0.236/trunk@250192 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com 2008-04-14 08:50:51 +00:00
parent 081ee3d8da
commit 79887f7415

View File

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