From 976704d637bc17317bbefe72df878699965f7ab8 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 27 Mar 2018 15:51:38 -0700 Subject: [PATCH] Bug 1449255: Part 13 - Remove test_bug757663.js, which doesn't test anything anymore. r=aswan MozReview-Commit-ID: 6K45YVu95nl --HG-- extra : rebase_source : 2ec66a1a3b5d53cbf91a175b1ac5bb7c483c454f --- .../test/addons/test_bug757663/install.rdf | 24 ---- .../test/xpcshell/test_bug757663.js | 112 ------------------ .../extensions/test/xpcshell/xpcshell.ini | 1 - 3 files changed, 137 deletions(-) delete mode 100644 toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf delete mode 100644 toolkit/mozapps/extensions/test/xpcshell/test_bug757663.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf deleted file mode 100644 index be8d85b1b1fd..000000000000 --- a/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - bug757663@tests.mozilla.org - 1.0 - true - - - Test Bootstrap 1 - Test Description - - - - xpcshell@tests.mozilla.org - 1 - 1 - - - - - diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug757663.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug757663.js deleted file mode 100644 index bb9a066ae672..000000000000 --- a/toolkit/mozapps/extensions/test/xpcshell/test_bug757663.js +++ /dev/null @@ -1,112 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ - */ - -// This test verifies that removing a listener during a callback for that type -// of listener still results in all listeners being called. - -var addon1 = { - id: "addon1@tests.mozilla.org", - version: "2.0", - name: "Test 1", - bootstrap: "true", - targetApplications: [{ - id: "xpcshell@tests.mozilla.org", - minVersion: "1", - maxVersion: "1" - }] -}; - -var listener1 = { - sawEvent: false, - onDisabling() { - this.sawEvent = true; - AddonManager.removeAddonListener(this); - }, - onNewInstall() { - this.sawEvent = true; - AddonManager.removeInstallListener(this); - } -}; -var listener2 = { - sawEvent: false, - onDisabling() { - this.sawEvent = true; - }, - onNewInstall() { - this.sawEvent = true; - } -}; -var listener3 = { - sawEvent: false, - onDisabling() { - this.sawEvent = true; - }, - onNewInstall() { - this.sawEvent = true; - } -}; - -const profileDir = gProfD.clone(); -profileDir.append("extensions"); - - -function run_test() { - do_test_pending(); - createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2"); - - writeInstallRDFForExtension(addon1, profileDir); - startupManager(); - - run_test_1(); -} - -function run_test_1() { - AddonManager.addAddonListener(listener1); - AddonManager.addAddonListener(listener2); - AddonManager.addAddonListener(listener3); - - AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org"], function([a1]) { - Assert.notEqual(a1, null); - Assert.ok(!a1.userDisabled); - Assert.ok(a1.isActive); - - a1.userDisabled = true; - - Assert.ok(listener1.sawEvent); - listener1.sawEvent = false; - Assert.ok(listener2.sawEvent); - listener2.sawEvent = false; - Assert.ok(listener3.sawEvent); - listener3.sawEvent = false; - - AddonManager.removeAddonListener(listener1); - AddonManager.removeAddonListener(listener2); - AddonManager.removeAddonListener(listener3); - - a1.uninstall(); - run_test_2(); - }); -} - -function run_test_2() { - AddonManager.addInstallListener(listener1); - AddonManager.addInstallListener(listener2); - AddonManager.addInstallListener(listener3); - - AddonManager.getInstallForFile(do_get_addon("test_bug757663"), function(aInstall) { - - Assert.ok(listener1.sawEvent); - listener1.sawEvent = false; - Assert.ok(listener2.sawEvent); - listener2.sawEvent = false; - Assert.ok(listener3.sawEvent); - listener3.sawEvent = false; - - AddonManager.removeInstallListener(listener1); - AddonManager.removeInstallListener(listener2); - AddonManager.removeInstallListener(listener3); - - executeSoon(do_test_finished); - }); -} diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini index f4eced5afaf1..f63fb9991020 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini +++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini @@ -94,7 +94,6 @@ tags = blocklist [test_bug655254.js] [test_bug740612.js] [test_bug753900.js] -[test_bug757663.js] [test_cache_certdb.js] run-if = addon_signing [test_cacheflush.js]