--- a/toolkit/mozapps/extensions/test/xpcshell/test_badschema.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_badschema.js
@@ -1,407 +1,306 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
// Checks that we rebuild something sensible from a database with a bad schema
-
-ChromeUtils.import("resource://testing-common/httpd.js");
-var testserver = new HttpServer();
-testserver.start(-1);
+var testserver = AddonTestUtils.createHttpServer();
gPort = testserver.identity.primaryPort;
-// register static files with server and interpolate port numbers in them
+// register files with server
+testserver.registerDirectory("/addons/", do_get_file("addons"));
mapFile("/data/test_corrupt.json", testserver);
// The test extension uses an insecure update url.
-Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
+Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
+Services.prefs.setBoolPref(PREF_EM_STRICT_COMPATIBILITY, false);
+
+const ADDONS = {
+ "addon1@tests.mozilla.org": {
+ "install.rdf": {
+ id: "addon1@tests.mozilla.org",
+ version: "1.0",
+ name: "Test 1",
+ targetApplications: [{
+ id: "xpcshell@tests.mozilla.org",
+ minVersion: "2",
+ maxVersion: "2"
+ }]
+ },
+ desiredValues: {
+ isActive: true,
+ userDisabled: false,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
+
+ "addon2@tests.mozilla.org": {
+ "install.rdf": {
+ id: "addon2@tests.mozilla.org",
+ version: "1.0",
+ name: "Test 2",
+ targetApplications: [{
+ id: "xpcshell@tests.mozilla.org",
+ minVersion: "2",
+ maxVersion: "2"
+ }]
+ },
+ initialState: {
+ userDisabled: true,
+ },
+ desiredValues: {
+ isActive: false,
+ userDisabled: true,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
-// Will be enabled
-var addon1 = {
- id: "addon1@tests.mozilla.org",
- version: "1.0",
- name: "Test 1",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "2",
- maxVersion: "2"
- }]
-};
+ "addon3@tests.mozilla.org": {
+ "install.rdf": {
+ id: "addon3@tests.mozilla.org",
+ version: "1.0",
+ name: "Test 3",
+ updateURL: "http://localhost:" + gPort + "/data/test_corrupt.json",
+ targetApplications: [{
+ id: "xpcshell@tests.mozilla.org",
+ minVersion: "1",
+ maxVersion: "1"
+ }]
+ },
+ findUpdates: true,
+ desiredValues: {
+ isActive: true,
+ userDisabled: false,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
+
+ "addon4@tests.mozilla.org": {
+ "install.rdf": {
+ id: "addon4@tests.mozilla.org",
+ version: "1.0",
+ name: "Test 4",
+ updateURL: "http://localhost:" + gPort + "/data/test_corrupt.json",
+ targetApplications: [{
+ id: "xpcshell@tests.mozilla.org",
+ minVersion: "1",
+ maxVersion: "1"
+ }]
+ },
+ initialState: {
+ userDisabled: true,
+ },
+ findUpdates: true,
+ desiredValues: {
+ isActive: false,
+ userDisabled: true,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
-// Will be disabled
-var addon2 = {
- id: "addon2@tests.mozilla.org",
- version: "1.0",
- name: "Test 2",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "2",
- maxVersion: "2"
- }]
-};
+ "addon5@tests.mozilla.org": {
+ "install.rdf": {
+ id: "addon5@tests.mozilla.org",
+ version: "1.0",
+ name: "Test 5",
+ targetApplications: [{
+ id: "xpcshell@tests.mozilla.org",
+ minVersion: "1",
+ maxVersion: "1"
+ }]
+ },
+ desiredValues: {
+ isActive: true,
+ userDisabled: false,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
+
+ "addon6@tests.mozilla.org": {
+ "install.rdf": {
+ id: "addon6@tests.mozilla.org",
+ version: "1.0",
+ name: "Test 6",
+ bootstrap: "true",
+ targetApplications: [{
+ id: "xpcshell@tests.mozilla.org",
+ minVersion: "2",
+ maxVersion: "2"
+ }]
+ },
+ desiredValues: {
+ isActive: true,
+ userDisabled: false,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
-// Will get a compatibility update and be enabled
-var addon3 = {
- id: "addon3@tests.mozilla.org",
- version: "1.0",
- name: "Test 3",
- updateURL: "http://localhost:" + gPort + "/data/test_corrupt.json",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "1",
- maxVersion: "1"
- }]
-};
+ "addon7@tests.mozilla.org": {
+ "install.rdf": {
+ id: "addon7@tests.mozilla.org",
+ version: "1.0",
+ name: "Test 7",
+ bootstrap: "true",
+ targetApplications: [{
+ id: "xpcshell@tests.mozilla.org",
+ minVersion: "2",
+ maxVersion: "2"
+ }]
+ },
+ initialState: {
+ userDisabled: true,
+ },
+ desiredValues: {
+ isActive: false,
+ userDisabled: true,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
-// Will get a compatibility update and be disabled
-var addon4 = {
- id: "addon4@tests.mozilla.org",
- version: "1.0",
- name: "Test 4",
- updateURL: "http://localhost:" + gPort + "/data/test_corrupt.json",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "1",
- maxVersion: "1"
- }]
+ "theme1@tests.mozilla.org": {
+ "install.rdf": {
+ id: "theme1@tests.mozilla.org",
+ version: "1.0",
+ name: "Theme 1",
+ internalName: "classic/1.0",
+ targetApplications: [{
+ id: "xpcshell@tests.mozilla.org",
+ minVersion: "2",
+ maxVersion: "2"
+ }]
+ },
+ desiredValues: {
+ isActive: false,
+ userDisabled: true,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
+
+ "theme2@tests.mozilla.org": {
+ manifest: {
+ manifest_version: 2,
+ name: "Theme 2",
+ version: "1.0",
+ theme: { images: { headerURL: "example.png" } },
+ applications: {
+ gecko: {
+ id: "theme2@tests.mozilla.org",
+ },
+ },
+ },
+ initialState: {
+ userDisabled: false,
+ },
+ desiredValues: {
+ isActive: true,
+ userDisabled: false,
+ appDisabled: false,
+ pendingOperations: 0,
+ },
+ afterCorruption: {},
+ afterSecondRestart: {},
+ },
};
-// Stays incompatible
-var addon5 = {
- id: "addon5@tests.mozilla.org",
- version: "1.0",
- name: "Test 5",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "1",
- maxVersion: "1"
- }]
-};
-
-// Enabled bootstrapped
-var addon6 = {
- id: "addon6@tests.mozilla.org",
- version: "1.0",
- name: "Test 6",
- bootstrap: "true",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "2",
- maxVersion: "2"
- }]
-};
+const IDS = Object.keys(ADDONS);
-// Disabled bootstrapped
-var addon7 = {
- id: "addon7@tests.mozilla.org",
- version: "1.0",
- name: "Test 7",
- bootstrap: "true",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "2",
- maxVersion: "2"
- }]
-};
-
-// The default theme
-var theme1 = {
- id: "theme1@tests.mozilla.org",
- version: "1.0",
- name: "Theme 1",
- internalName: "classic/1.0",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "2",
- maxVersion: "2"
- }]
-};
-
-// The selected theme
-var theme2 = {
- manifest: {
- manifest_version: 2,
- name: "Theme 2",
- version: "1.0",
- theme: { images: { headerURL: "example.png" } },
- applications: {
- gecko: {
- id: "theme2@tests.mozilla.org",
- }
- }
- },
-};
+function promiseUpdates(addon) {
+ return new Promise(resolve => {
+ addon.findUpdates({onUpdateFinished: resolve},
+ AddonManager.UPDATE_WHEN_PERIODIC_UPDATE);
+ });
+}
const profileDir = gProfD.clone();
profileDir.append("extensions");
-function run_test() {
- do_test_pending();
+add_task(async function setup() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2", "2");
- writeInstallRDFForExtension(addon1, profileDir);
- writeInstallRDFForExtension(addon2, profileDir);
- writeInstallRDFForExtension(addon3, profileDir);
- writeInstallRDFForExtension(addon4, profileDir);
- writeInstallRDFForExtension(addon5, profileDir);
- writeInstallRDFForExtension(addon6, profileDir);
- writeInstallRDFForExtension(addon7, profileDir);
- writeInstallRDFForExtension(theme1, profileDir);
- let theme2XPI = createTempWebExtensionFile(theme2);
- AddonTestUtils.manuallyInstall(theme2XPI).then(() => {
- // Create and configure the HTTP server.
- testserver.registerDirectory("/addons/", do_get_file("addons"));
-
- // Startup the profile and setup the initial state
- startupManager();
+ for (let addon of Object.values(ADDONS)) {
+ if (addon["install.rdf"]) {
+ await promiseWriteInstallRDFForExtension(addon["install.rdf"], profileDir);
+ } else {
+ let webext = createTempWebExtensionFile({manifest: addon.manifest});
+ await AddonTestUtils.manuallyInstall(webext);
+ }
+ }
- AddonManager.getAddonsByIDs(["addon2@tests.mozilla.org",
- "addon3@tests.mozilla.org",
- "addon4@tests.mozilla.org",
- "addon7@tests.mozilla.org",
- "theme2@tests.mozilla.org"], function([a2, a3, a4,
- a7, t2]) {
- // Set up the initial state
- a2.userDisabled = true;
- a4.userDisabled = true;
- a7.userDisabled = true;
- t2.userDisabled = false;
- a3.findUpdates({
- onUpdateFinished() {
- a4.findUpdates({
- onUpdateFinished() {
- executeSoon(run_test_1);
- }
- }, AddonManager.UPDATE_WHEN_PERIODIC_UPDATE);
- }
- }, AddonManager.UPDATE_WHEN_PERIODIC_UPDATE);
- });
- });
-}
-
-function end_test() {
- testserver.stop(do_test_finished);
-}
-
-function run_test_1() {
- restartManager();
+ await promiseStartupManager();
- AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
- "addon2@tests.mozilla.org",
- "addon3@tests.mozilla.org",
- "addon4@tests.mozilla.org",
- "addon5@tests.mozilla.org",
- "addon6@tests.mozilla.org",
- "addon7@tests.mozilla.org",
- "theme1@tests.mozilla.org",
- "theme2@tests.mozilla.org"], function([a1, a2, a3,
- a4, a5, a6,
- a7, t1, t2]) {
- Assert.notEqual(a1, null);
- Assert.ok(a1.isActive);
- Assert.ok(!a1.userDisabled);
- Assert.ok(!a1.appDisabled);
- Assert.equal(a1.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a2, null);
- Assert.ok(!a2.isActive);
- Assert.ok(a2.userDisabled);
- Assert.ok(!a2.appDisabled);
- Assert.equal(a2.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a3, null);
- Assert.ok(a3.isActive);
- Assert.ok(!a3.userDisabled);
- Assert.ok(!a3.appDisabled);
- Assert.equal(a3.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a4, null);
- Assert.ok(!a4.isActive);
- Assert.ok(a4.userDisabled);
- Assert.ok(!a4.appDisabled);
- Assert.equal(a4.pendingOperations, AddonManager.PENDING_NONE);
+ let addons = await getAddons(IDS);
+ for (let [id, addon] of Object.entries(ADDONS)) {
+ if (addon.initialState) {
+ Object.assign(addons.get(id), addon.initialState);
+ }
+ if (addon.findUpdates) {
+ await promiseUpdates(addons.get(id));
+ }
+ }
+});
- Assert.notEqual(a5, null);
- Assert.ok(!a5.isActive);
- Assert.ok(!a5.userDisabled);
- Assert.ok(a5.appDisabled);
- Assert.equal(a5.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a6, null);
- Assert.ok(a6.isActive);
- Assert.ok(!a6.userDisabled);
- Assert.ok(!a6.appDisabled);
- Assert.equal(a6.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a7, null);
- Assert.ok(!a7.isActive);
- Assert.ok(a7.userDisabled);
- Assert.ok(!a7.appDisabled);
- Assert.equal(a7.pendingOperations, AddonManager.PENDING_NONE);
+add_task(async function test_after_restart() {
+ await promiseRestartManager();
- Assert.notEqual(t1, null);
- Assert.ok(!t1.isActive);
- Assert.ok(t1.userDisabled);
- Assert.ok(!t1.appDisabled);
- Assert.equal(t1.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(t2, null);
- Assert.ok(t2.isActive);
- Assert.ok(!t2.userDisabled);
- Assert.ok(!t2.appDisabled);
- Assert.equal(t2.pendingOperations, AddonManager.PENDING_NONE);
-
- executeSoon(run_test_1_modified_db);
- });
-}
-
-
-function run_test_1_modified_db() {
- // After restarting the database won't be open so we can alter
- // the schema
- shutdownManager();
- changeXPIDBVersion(100);
- startupManager();
+ info("Test add-on state after restart");
+ let addons = await getAddons(IDS);
+ for (let [id, addon] of Object.entries(ADDONS)) {
+ checkAddon(id, addons.get(id), addon.desiredValues);
+ }
- // Accessing the add-ons should open and recover the database. Since
- // migration occurs everything should be recovered correctly
- AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
- "addon2@tests.mozilla.org",
- "addon3@tests.mozilla.org",
- "addon4@tests.mozilla.org",
- "addon5@tests.mozilla.org",
- "addon6@tests.mozilla.org",
- "addon7@tests.mozilla.org",
- "theme1@tests.mozilla.org",
- "theme2@tests.mozilla.org"], function([a1, a2, a3,
- a4, a5, a6,
- a7, t1, t2]) {
- Assert.notEqual(a1, null);
- Assert.ok(a1.isActive);
- Assert.ok(!a1.userDisabled);
- Assert.ok(!a1.appDisabled);
- Assert.equal(a1.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a2, null);
- Assert.ok(!a2.isActive);
- Assert.ok(a2.userDisabled);
- Assert.ok(!a2.appDisabled);
- Assert.equal(a2.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a3, null);
- Assert.ok(a3.isActive);
- Assert.ok(!a3.userDisabled);
- Assert.ok(!a3.appDisabled);
- Assert.equal(a3.pendingOperations, AddonManager.PENDING_NONE);
+ await promiseShutdownManager();
+});
- Assert.notEqual(a4, null);
- Assert.ok(!a4.isActive);
- Assert.ok(a4.userDisabled);
- Assert.ok(!a4.appDisabled);
- Assert.equal(a4.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a5, null);
- Assert.ok(!a5.isActive);
- Assert.ok(!a5.userDisabled);
- Assert.ok(a5.appDisabled);
- Assert.equal(a5.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a6, null);
- Assert.ok(a6.isActive);
- Assert.ok(!a6.userDisabled);
- Assert.ok(!a6.appDisabled);
- Assert.equal(a6.pendingOperations, AddonManager.PENDING_NONE);
+add_task(async function test_after_schema_version_change() {
+ // After restarting the database won't be open so we can alter
+ // the schema
+ changeXPIDBVersion(100);
- Assert.notEqual(a7, null);
- Assert.ok(!a7.isActive);
- Assert.ok(a7.userDisabled);
- Assert.ok(!a7.appDisabled);
- Assert.equal(a7.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(t1, null);
- Assert.ok(!t1.isActive);
- Assert.ok(t1.userDisabled);
- Assert.ok(!t1.appDisabled);
- Assert.equal(t1.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(t2, null);
- Assert.ok(t2.isActive);
- Assert.ok(!t2.userDisabled);
- Assert.ok(!t2.appDisabled);
- Assert.equal(t2.pendingOperations, AddonManager.PENDING_NONE);
-
- executeSoon(run_test_1_after_rebuild);
- });
-}
+ await promiseStartupManager(false);
-function run_test_1_after_rebuild() {
- restartManager();
+ info("Test add-on state after schema version change");
+ let addons = await getAddons(IDS);
+ for (let [id, addon] of Object.entries(ADDONS)) {
+ checkAddon(id, addons.get(id),
+ Object.assign({}, addon.desiredValues, addon.afterCorruption));
+ }
- AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
- "addon2@tests.mozilla.org",
- "addon3@tests.mozilla.org",
- "addon4@tests.mozilla.org",
- "addon5@tests.mozilla.org",
- "addon6@tests.mozilla.org",
- "addon7@tests.mozilla.org",
- "theme1@tests.mozilla.org",
- "theme2@tests.mozilla.org"], function([a1, a2, a3,
- a4, a5, a6,
- a7, t1, t2]) {
- Assert.notEqual(a1, null);
- Assert.ok(a1.isActive);
- Assert.ok(!a1.userDisabled);
- Assert.ok(!a1.appDisabled);
- Assert.equal(a1.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a2, null);
- Assert.ok(!a2.isActive);
- Assert.ok(a2.userDisabled);
- Assert.ok(!a2.appDisabled);
- Assert.equal(a2.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a3, null);
- Assert.ok(a3.isActive);
- Assert.ok(!a3.userDisabled);
- Assert.ok(!a3.appDisabled);
- Assert.equal(a3.pendingOperations, AddonManager.PENDING_NONE);
+ await promiseShutdownManager();
+});
- Assert.notEqual(a4, null);
- Assert.ok(!a4.isActive);
- Assert.ok(a4.userDisabled);
- Assert.ok(!a4.appDisabled);
- Assert.equal(a4.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a5, null);
- Assert.ok(!a5.isActive);
- Assert.ok(!a5.userDisabled);
- Assert.ok(a5.appDisabled);
- Assert.equal(a5.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(a6, null);
- Assert.ok(a6.isActive);
- Assert.ok(!a6.userDisabled);
- Assert.ok(!a6.appDisabled);
- Assert.equal(a6.pendingOperations, AddonManager.PENDING_NONE);
+add_task(async function test_after_second_restart() {
+ await promiseStartupManager(false);
- Assert.notEqual(a7, null);
- Assert.ok(!a7.isActive);
- Assert.ok(a7.userDisabled);
- Assert.ok(!a7.appDisabled);
- Assert.equal(a7.pendingOperations, AddonManager.PENDING_NONE);
+ info("Test add-on state after second restart");
+ let addons = await getAddons(IDS);
+ for (let [id, addon] of Object.entries(ADDONS)) {
+ checkAddon(id, addons.get(id),
+ Object.assign({}, addon.desiredValues, addon.afterSecondRestart));
+ }
- Assert.notEqual(t1, null);
- Assert.ok(!t1.isActive);
- Assert.ok(t1.userDisabled);
- Assert.ok(!t1.appDisabled);
- Assert.equal(t1.pendingOperations, AddonManager.PENDING_NONE);
-
- Assert.notEqual(t2, null);
- Assert.ok(t2.isActive);
- Assert.ok(!t2.userDisabled);
- Assert.ok(!t2.appDisabled);
- Assert.equal(t2.pendingOperations, AddonManager.PENDING_NONE);
-
- end_test();
- });
-}
+ await promiseShutdownManager();
+});