diff options
Diffstat (limited to 'toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js')
-rw-r--r-- | toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js | 60 |
1 files changed, 25 insertions, 35 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js b/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js index f4b6a0535..c24b5a1b0 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js @@ -39,7 +39,7 @@ mapFile("/data/test_dictionary.rdf", testserver); var HunspellEngine = { dictionaryDirs: [], listener: null, - + QueryInterface: function hunspell_qi(iid) { if (iid.equals(Components.interfaces.nsISupports) || iid.equals(Components.interfaces.nsIFactory) || @@ -89,7 +89,7 @@ var HunspellEngine = { Components.manager.nsIComponentRegistrar.registerFactory(this.classID, "Test hunspell", this.contractID, this); }, - + deactivate: function hunspell_deactivate() { Components.manager.nsIComponentRegistrar.unregisterFactory(this.classID, this); Components.manager.nsIComponentRegistrar.registerFactory(this.origClassID, @@ -175,16 +175,6 @@ function check_test_1() { let dir = do_get_addon_root_uri(profileDir, "ab-CD@dictionaries.addons.mozilla.org"); - let chromeReg = AM_Cc["@mozilla.org/chrome/chrome-registry;1"]. - getService(AM_Ci.nsIChromeRegistry); - try { - chromeReg.convertChromeURL(NetUtil.newURI("chrome://dict/content/dict.xul")); - do_throw("Chrome manifest should not have been registered"); - } - catch (e) { - // Expected the chrome url to not be registered - } - AddonManager.getAddonsWithOperationsByTypes(null, function(list) { do_check_eq(list.length, 0); @@ -348,7 +338,7 @@ function run_test_8() { let dir = profileDir.clone(); dir.append("ab-CD@dictionaries.addons.mozilla.org"); - dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0o755); + dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0755); let zip = AM_Cc["@mozilla.org/libjar/zip-reader;1"]. createInstance(AM_Ci.nsIZipReader); zip.open(do_get_addon("test_dictionary")); @@ -356,7 +346,7 @@ function run_test_8() { zip.extract("install.rdf", dir); dir = dir.parent; dir.append("dictionaries"); - dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0o755); + dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0755); dir.append("ab-CD.dic"); zip.extract("dictionaries/ab-CD.dic", dir); zip.close(); @@ -401,7 +391,7 @@ function run_test_12() { let dir = profileDir.clone(); dir.append("ab-CD@dictionaries.addons.mozilla.org"); - dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0o755); + dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0755); let zip = AM_Cc["@mozilla.org/libjar/zip-reader;1"]. createInstance(AM_Ci.nsIZipReader); zip.open(do_get_addon("test_dictionary")); @@ -409,7 +399,7 @@ function run_test_12() { zip.extract("install.rdf", dir); dir = dir.parent; dir.append("dictionaries"); - dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0o755); + dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0755); dir.append("ab-CD.dic"); zip.extract("dictionaries/ab-CD.dic", dir); zip.close(); @@ -452,10 +442,10 @@ function run_test_16() { startupManager(false); AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", - callback_soon(function(b1_2) { + callback_soon(function(b1) { // Should still be stopped do_check_false(HunspellEngine.isDictionaryEnabled("ab-CD.dic")); - do_check_false(b1_2.isActive); + do_check_false(b1.isActive); shutdownManager(); gAppInfo.inSafeMode = false; @@ -464,8 +454,8 @@ function run_test_16() { // Should have started do_check_true(HunspellEngine.isDictionaryEnabled("ab-CD.dic")); - AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1_3) { - b1_3.uninstall(); + AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) { + b1.uninstall(); do_execute_soon(run_test_17); }); @@ -481,7 +471,7 @@ function run_test_17() { let dir = userExtDir.clone(); dir.append("ab-CD@dictionaries.addons.mozilla.org"); - dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0o755); + dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0755); let zip = AM_Cc["@mozilla.org/libjar/zip-reader;1"]. createInstance(AM_Ci.nsIZipReader); zip.open(do_get_addon("test_dictionary")); @@ -489,7 +479,7 @@ function run_test_17() { zip.extract("install.rdf", dir); dir = dir.parent; dir.append("dictionaries"); - dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0o755); + dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0755); dir.append("ab-CD.dic"); zip.extract("dictionaries/ab-CD.dic", dir); zip.close(); @@ -583,8 +573,8 @@ function check_test_23() { do_check_eq(list.length, 0); restartManager(); - AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1_2) { - b1_2.uninstall(); + AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) { + b1.uninstall(); do_execute_soon(run_test_25); }); })); @@ -617,11 +607,11 @@ function run_test_25() { do_check_false(HunspellEngine.isDictionaryEnabled("ab-CD.dic")); - AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1_2) { - do_check_neq(b1_2, null); - do_check_eq(b1_2.version, "2.0"); - do_check_true(b1_2.isActive); - do_check_eq(b1_2.pendingOperations, AddonManager.PENDING_NONE); + AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) { + do_check_neq(b1, null); + do_check_eq(b1.version, "2.0"); + do_check_true(b1.isActive); + do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE); do_execute_soon(run_test_26); }); @@ -650,14 +640,14 @@ function run_test_26() { do_check_true(HunspellEngine.isDictionaryEnabled("ab-CD.dic")); - AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1_2) { - do_check_neq(b1_2, null); - do_check_eq(b1_2.version, "1.0"); - do_check_true(b1_2.isActive); - do_check_eq(b1_2.pendingOperations, AddonManager.PENDING_NONE); + AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) { + do_check_neq(b1, null); + do_check_eq(b1.version, "1.0"); + do_check_true(b1.isActive); + do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE); HunspellEngine.deactivate(); - b1_2.uninstall(); + b1.uninstall(); do_execute_soon(run_test_27); }); })); |