bug 580508 - fix test_resolve_uris.js test. r=mossop

This commit is contained in:
Justin Dolske 2010-08-03 16:26:27 +12:00
parent 692ed55c12
commit d244c9fd91
2 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,4 @@
resource foo resource://foo/foo-resource/
resource foo .
content foo resource://foo/foo-content/
locale foo foo resource://foo/foo-locale/
skin foo foo resource://foo/foo-skin/

View File

@ -41,11 +41,14 @@ if (typeof registerManifests === "undefined") {
load("../unit/head_crtestutils.js");
}
let manifests = [
do_get_file("../unit/data/test_resolve_uris.manifest"),
];
let manifestFile = do_get_file("../unit/data/test_resolve_uris.manifest");
let manifests = [ manifestFile ];
registerManifests(manifests);
let ios = Cc["@mozilla.org/network/io-service;1"].
getService(Ci.nsIIOService);
function do_run_test()
{
let cr = Cc["@mozilla.org/chrome/chrome-registry;1"].
@ -89,12 +92,11 @@ function do_run_test()
expectedURI += "override-me.xul";
break;
case "resource":
expectedURI = ios.newFileURI(manifestFile.parent).spec;
sourceURI = "resource://foo/";
break;
};
try {
let ios = Cc["@mozilla.org/network/io-service;1"].
getService(Ci.nsIIOService);
sourceURI = ios.newURI(sourceURI, null, null);
let uri;
if (type == "resource") {