1 files changed, 88 insertions, 115 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_experiment.js b/toolkit/mozapps/extensions/test/xpcshell/test_experiment.js
index 3dcd83da8..25172749d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_experiment.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_experiment.js
@@ -1,131 +1,104 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-var scope = Components.utils.import("resource://gre/modules/addons/XPIProvider.jsm");
+let scope = Components.utils.import("resource://gre/modules/addons/XPIProvider.jsm");
 const XPIProvider = scope.XPIProvider;
-const ID = "experiment1@tests.mozilla.org";
-
-var gIsNightly = false;
 
 function run_test() {
-  BootstrapMonitor.init();
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
   startupManager();
 
-  gIsNightly = isNightlyChannel();
-
   run_next_test();
 }
 
-add_task(function* test_experiment() {
-  BootstrapMonitor.checkAddonNotInstalled(ID);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-
-  yield promiseInstallAllFiles([do_get_addon("test_experiment1")]);
-
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonNotStarted(ID);
-
-  let addon = yield promiseAddonByID(ID);
-  Assert.ok(addon, "Addon is found.");
-
-  Assert.ok(addon.userDisabled, "Experiments are userDisabled by default.");
-  Assert.ok(!addon.appDisabled, "Experiments are not appDisabled by compatibility.");
-  Assert.equal(addon.isActive, false, "Add-on is not active.");
-  Assert.equal(addon.updateURL, null, "No updateURL for experiments.");
-  Assert.equal(addon.applyBackgroundUpdates, AddonManager.AUTOUPDATE_DISABLE,
-               "Background updates are disabled.");
-  Assert.equal(addon.permissions, AddonManager.PERM_CAN_UNINSTALL + AddonManager.PERM_CAN_ENABLE,
-               "Permissions are minimal.");
-  Assert.ok(!(addon.pendingOperations & AddonManager.PENDING_ENABLE),
-            "Should not be pending enable");
-  Assert.ok(!(addon.pendingOperations & AddonManager.PENDING_DISABLE),
-            "Should not be pending disable");
-
-  // Setting applyBackgroundUpdates should not work.
-  addon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_ENABLE;
-  Assert.equal(addon.applyBackgroundUpdates, AddonManager.AUTOUPDATE_DISABLE,
-               "Setting applyBackgroundUpdates shouldn't do anything.");
-
-  let noCompatibleCalled = false;
-  let noUpdateCalled = false;
-  let finishedCalled = false;
-
-  let listener = {
-    onNoCompatibilityUpdateAvailable: () => { noCompatibleCalled = true; },
-    onNoUpdateAvailable: () => { noUpdateCalled = true; },
-    onUpdateFinished: () => { finishedCalled = true; },
-  };
-
-  addon.findUpdates(listener, "testing", null, null);
-  Assert.ok(noCompatibleCalled, "Listener called.");
-  Assert.ok(noUpdateCalled, "Listener called.");
-  Assert.ok(finishedCalled, "Listener called.");
+add_test(function test_experiment() {
+  AddonManager.getInstallForFile(do_get_addon("test_experiment1"), (install) => {
+    completeAllInstalls([install], () => {
+      AddonManager.getAddonByID("experiment1@tests.mozilla.org", (addon) => {
+        Assert.ok(addon, "Addon is found.");
+
+        Assert.ok(addon.userDisabled, "Experiments are userDisabled by default.");
+        Assert.equal(addon.isActive, false, "Add-on is not active.");
+        Assert.equal(addon.updateURL, null, "No updateURL for experiments.");
+        Assert.equal(addon.applyBackgroundUpdates, AddonManager.AUTOUPDATE_DISABLE,
+                     "Background updates are disabled.");
+        Assert.equal(addon.permissions, AddonManager.PERM_CAN_UNINSTALL,
+                     "Permissions are minimal.");
+        Assert.ok(!(addon.pendingOperations & AddonManager.PENDING_ENABLE),
+                  "Should not be pending enable");
+        Assert.ok(!(addon.pendingOperations & AddonManager.PENDING_DISABLE),
+                  "Should not be pending disable");
+
+        // Setting applyBackgroundUpdates should not work.
+        addon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_ENABLE;
+        Assert.equal(addon.applyBackgroundUpdates, AddonManager.AUTOUPDATE_DISABLE,
+                     "Setting applyBackgroundUpdates shouldn't do anything.");
+
+        let noCompatibleCalled = false;
+        let noUpdateCalled = false;
+        let finishedCalled = false;
+
+        let listener = {
+          onNoCompatibilityUpdateAvailable: () => { noCompatibleCalled = true; },
+          onNoUpdateAvailable: () => { noUpdateCalled = true; },
+          onUpdateFinished: () => { finishedCalled = true; },
+        };
+
+        addon.findUpdates(listener, "testing", null, null);
+        Assert.ok(noCompatibleCalled, "Listener called.");
+        Assert.ok(noUpdateCalled, "Listener called.");
+        Assert.ok(finishedCalled, "Listener called.");
+
+        run_next_test();
+      });
+    });
+  });
 });
 
 // Changes to userDisabled should not be persisted to the database.
-add_task(function* test_userDisabledNotPersisted() {
-  let addon = yield promiseAddonByID(ID);
-  Assert.ok(addon, "Add-on is found.");
-  Assert.ok(addon.userDisabled, "Add-on is user disabled.");
-
-  let promise = promiseAddonEvent("onEnabled");
-  addon.userDisabled = false;
-  let [addon2] = yield promise;
-
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-
-  Assert.equal(addon2.id, addon.id, "Changed add-on matches expected.");
-  Assert.equal(addon2.userDisabled, false, "Add-on is no longer user disabled.");
-  Assert.ok(addon2.isActive, "Add-on is active.");
-
-  Assert.ok(ID in XPIProvider.bootstrappedAddons,
-            "Experiment add-on listed in XPIProvider bootstrapped list.");
-
-  addon = yield promiseAddonByID(ID);
-  Assert.ok(addon, "Add-on retrieved.");
-  Assert.equal(addon.userDisabled, false, "Add-on is still enabled after API retrieve.");
-  Assert.ok(addon.isActive, "Add-on is still active.");
-  Assert.ok(!(addon.pendingOperations & AddonManager.PENDING_ENABLE),
-            "Should not be pending enable");
-  Assert.ok(!(addon.pendingOperations & AddonManager.PENDING_DISABLE),
-            "Should not be pending disable");
-
-  // Now when we restart the manager the add-on should revert state.
-  yield promiseRestartManager();
-  let persisted = JSON.parse(Services.prefs.getCharPref("extensions.bootstrappedAddons"));
-  Assert.ok(!(ID in persisted),
-            "Experiment add-on not persisted to bootstrappedAddons.");
-
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonNotStarted(ID);
-
-  addon = yield promiseAddonByID(ID);
-  Assert.ok(addon, "Add-on retrieved.");
-  Assert.ok(addon.userDisabled, "Add-on is disabled after restart.");
-  Assert.equal(addon.isActive, false, "Add-on is not active after restart.");
-  addon.uninstall();
-
-  BootstrapMonitor.checkAddonNotInstalled(ID);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-});
-
-add_task(function* test_checkCompatibility() {
-  if (gIsNightly)
-    Services.prefs.setBoolPref("extensions.checkCompatibility.nightly", false);
-  else
-    Services.prefs.setBoolPref("extensions.checkCompatibility.1", false);
-
-  yield promiseRestartManager();
-
-  yield promiseInstallAllFiles([do_get_addon("test_experiment1")]);
-  let addon = yield promiseAddonByID(ID);
-
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonNotStarted(ID);
-
-  Assert.ok(addon, "Add-on is found.");
-  Assert.ok(addon.userDisabled, "Add-on is user disabled.");
-  Assert.ok(!addon.appDisabled, "Add-on is not app disabled.");
+add_test(function test_userDisabledNotPersisted() {
+  AddonManager.getAddonByID("experiment1@tests.mozilla.org", (addon) => {
+    Assert.ok(addon, "Add-on is found.");
+    Assert.ok(addon.userDisabled, "Add-on is user disabled.");
+
+    let listener = {
+      onEnabled: (addon2) => {
+        AddonManager.removeAddonListener(listener);
+
+        Assert.equal(addon2.id, addon.id, "Changed add-on matches expected.");
+        Assert.equal(addon2.userDisabled, false, "Add-on is no longer user disabled.");
+        Assert.ok(addon2.isActive, "Add-on is active.");
+
+        Assert.ok("experiment1@tests.mozilla.org" in XPIProvider.bootstrappedAddons,
+                  "Experiment add-on listed in XPIProvider bootstrapped list.");
+
+        AddonManager.getAddonByID("experiment1@tests.mozilla.org", (addon) => {
+          Assert.ok(addon, "Add-on retrieved.");
+          Assert.equal(addon.userDisabled, false, "Add-on is still enabled after API retrieve.");
+          Assert.ok(addon.isActive, "Add-on is still active.");
+          Assert.ok(!(addon.pendingOperations & AddonManager.PENDING_ENABLE),
+                    "Should not be pending enable");
+          Assert.ok(!(addon.pendingOperations & AddonManager.PENDING_DISABLE),
+                    "Should not be pending disable");
+
+          // Now when we restart the manager the add-on should revert state.
+          restartManager();
+          let persisted = JSON.parse(Services.prefs.getCharPref("extensions.bootstrappedAddons"));
+          Assert.ok(!("experiment1@tests.mozilla.org" in persisted),
+                    "Experiment add-on not persisted to bootstrappedAddons.");
+
+          AddonManager.getAddonByID("experiment1@tests.mozilla.org", (addon) => {
+            Assert.ok(addon, "Add-on retrieved.");
+            Assert.ok(addon.userDisabled, "Add-on is disabled after restart.");
+            Assert.equal(addon.isActive, false, "Add-on is not active after restart.");
+
+            run_next_test();
+          });
+        });
+      },
+    };
+
+    AddonManager.addAddonListener(listener);
+    addon.userDisabled = false;
+  });
 });