Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 696974 - Bookmarks engine: "invalid 'in' operand this._modified" in reconcile. r=gps

Browse Source
This commit is contained in:
Richard Newman 2012-12-22 12:44:05 -08:00
parent 98503a2e1b
commit 9326b3d9c6
2 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/sync/modules/engines.js
View File

@ -93,10 +93,16 @@ Tracker.prototype = {
}, 1000, this, "_lazySave"); }, 1000, this, "_lazySave");
}, },
loadChangedIDs: function T_loadChangedIDs() { loadChangedIDs: function (cb) {
Utils.jsonLoad("changes/" + this.file, this, function(json) { Utils.jsonLoad("changes/" + this.file, this, function(json) {
if (json) { if (json && (typeof(json) == "object")) {
this.changedIDs = json; this.changedIDs = json;
} else {
this._log.warn("Changed IDs file " + this.file + " contains non-object value.");
json = null;
}
if (cb) {
cb.call(this, json);
} }
}); });
}, },

58
services/sync/tests/unit/test_engine.js
View File

@ -6,7 +6,6 @@ Cu.import("resource://services-sync/engines.js");
Cu.import("resource://services-sync/service.js"); Cu.import("resource://services-sync/service.js");
Cu.import("resource://services-sync/util.js"); Cu.import("resource://services-sync/util.js");
function SteamStore(engine) { function SteamStore(engine) {
Store.call(this, "Steam", engine); Store.call(this, "Steam", engine);
this.wasWiped = false; this.wasWiped = false;
@ -64,17 +63,21 @@ Observers.add("weave:engine:wipe-client:finish", engineObserver);
Observers.add("weave:engine:sync:start", engineObserver); Observers.add("weave:engine:sync:start", engineObserver);
Observers.add("weave:engine:sync:finish", engineObserver); Observers.add("weave:engine:sync:finish", engineObserver);
function run_test() {
run_next_test();
}
function test_members() { add_test(function test_members() {
_("Engine object members"); _("Engine object members");
let engine = new SteamEngine(Service); let engine = new SteamEngine(Service);
do_check_eq(engine.Name, "Steam"); do_check_eq(engine.Name, "Steam");
do_check_eq(engine.prefName, "steam"); do_check_eq(engine.prefName, "steam");
do_check_true(engine._store instanceof SteamStore); do_check_true(engine._store instanceof SteamStore);
do_check_true(engine._tracker instanceof SteamTracker); do_check_true(engine._tracker instanceof SteamTracker);
} run_next_test();
});
function test_score() { add_test(function test_score() {
_("Engine.score corresponds to tracker.score and is readonly"); _("Engine.score corresponds to tracker.score and is readonly");
let engine = new SteamEngine(Service); let engine = new SteamEngine(Service);
do_check_eq(engine.score, 0); do_check_eq(engine.score, 0);
@ -89,9 +92,10 @@ function test_score() {
// the attribute's value won't change. // the attribute's value won't change.
} }
do_check_eq(engine.score, 5); do_check_eq(engine.score, 5);
} run_next_test();
});
function test_resetClient() { add_test(function test_resetClient() {
_("Engine.resetClient calls _resetClient"); _("Engine.resetClient calls _resetClient");
let engine = new SteamEngine(Service); let engine = new SteamEngine(Service);
do_check_false(engine.wasReset); do_check_false(engine.wasReset);
@ -103,9 +107,25 @@ function test_resetClient() {
engine.wasReset = false; engine.wasReset = false;
engineObserver.reset(); engineObserver.reset();
} run_next_test();
});
function test_wipeClient() { add_test(function test_invalidChangedIDs() {
_("Test that invalid changed IDs on disk don't end up live.");
let engine = new SteamEngine(Service);
let tracker = engine._tracker;
tracker.changedIDs = 5;
tracker.saveChangedIDs(function onSaved() {
tracker.changedIDs = {placeholder: true};
tracker.loadChangedIDs(function onLoaded(json) {
do_check_null(json);
do_check_true(tracker.changedIDs.placeholder);
run_next_test();
});
});
});
add_test(function test_wipeClient() {
_("Engine.wipeClient calls resetClient, wipes store, clears changed IDs"); _("Engine.wipeClient calls resetClient, wipes store, clears changed IDs");
let engine = new SteamEngine(Service); let engine = new SteamEngine(Service);
do_check_false(engine.wasReset); do_check_false(engine.wasReset);
@ -125,9 +145,10 @@ function test_wipeClient() {
engine.wasReset = false; engine.wasReset = false;
engine._store.wasWiped = false; engine._store.wasWiped = false;
engineObserver.reset(); engineObserver.reset();
} run_next_test();
});
function test_enabled() { add_test(function test_enabled() {
_("Engine.enabled corresponds to preference"); _("Engine.enabled corresponds to preference");
let engine = new SteamEngine(Service); let engine = new SteamEngine(Service);
try { try {
@ -137,12 +158,13 @@ function test_enabled() {
engine.enabled = false; engine.enabled = false;
do_check_false(Svc.Prefs.get("engine.steam")); do_check_false(Svc.Prefs.get("engine.steam"));
run_next_test();
} finally { } finally {
Svc.Prefs.resetBranch(""); Svc.Prefs.resetBranch("");
} }
} });
function test_sync() { add_test(function test_sync() {
let engine = new SteamEngine(Service); let engine = new SteamEngine(Service);
try { try {
_("Engine.sync doesn't call _sync if it's not enabled"); _("Engine.sync doesn't call _sync if it's not enabled");
@ -157,18 +179,10 @@ function test_sync() {
do_check_true(engine.wasSynced); do_check_true(engine.wasSynced);
do_check_eq(engineObserver.topics[0], "weave:engine:sync:start"); do_check_eq(engineObserver.topics[0], "weave:engine:sync:start");
do_check_eq(engineObserver.topics[1], "weave:engine:sync:finish"); do_check_eq(engineObserver.topics[1], "weave:engine:sync:finish");
run_next_test();
} finally { } finally {
Svc.Prefs.resetBranch(""); Svc.Prefs.resetBranch("");
engine.wasSynced = false; engine.wasSynced = false;
engineObserver.reset(); engineObserver.reset();
} }
} });
function run_test() {
test_members();
test_score();
test_resetClient();
test_wipeClient();
test_enabled();
test_sync();
}