зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1258139: Part 1 - [webext] Refactor storage API code. r=rpl
MozReview-Commit-ID: L6cO7mVnN5E --HG-- extra : rebase_source : f6fe51fd9b90b2a1bc4928775a07d2c7bd522663
This commit is contained in:
Kris Maglione
Родитель
93ebedfeeb
Коммит
e6cd1c5fce
|
|
@ -92,13 +92,7 @@ this.ExtensionStorage = {
|
|||
remove(extensionId, items) {
|
||||
return this.read(extensionId).then(extData => {
|
||||
let changes = {};
|
||||
if (Array.isArray(items)) {
|
||||
for (let prop of items) {
|
||||
changes[prop] = {oldValue: extData[prop]};
|
||||
delete extData[prop];
|
||||
}
|
||||
} else {
|
||||
let prop = items;
|
||||
for (let prop of [].concat(items)) {
|
||||
changes[prop] = {oldValue: extData[prop]};
|
||||
delete extData[prop];
|
||||
}
|
||||
|
|
@ -112,11 +106,9 @@ this.ExtensionStorage = {
|
|||
clear(extensionId) {
|
||||
return this.read(extensionId).then(extData => {
|
||||
let changes = {};
|
||||
if (extData) {
|
||||
for (let prop of Object.keys(extData)) {
|
||||
changes[prop] = {oldValue: extData[prop]};
|
||||
delete extData[prop];
|
||||
}
|
||||
for (let prop of Object.keys(extData)) {
|
||||
changes[prop] = {oldValue: extData[prop]};
|
||||
delete extData[prop];
|
||||
}
|
||||
|
||||
this.notifyListeners(extensionId, changes);
|
||||
|
|
@ -138,13 +130,8 @@ this.ExtensionStorage = {
|
|||
result[prop] = keys[prop];
|
||||
}
|
||||
}
|
||||
} else if (typeof(keys) == "string") {
|
||||
let prop = keys;
|
||||
if (prop in extData) {
|
||||
result[prop] = extData[prop];
|
||||
}
|
||||
} else {
|
||||
for (let prop of keys) {
|
||||
for (let prop of [].concat(keys)) {
|
||||
if (prop in extData) {
|
||||
result[prop] = extData[prop];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,21 +14,17 @@ extensions.registerSchemaAPI("storage", "storage", (extension, context) => {
|
|||
return {
|
||||
storage: {
|
||||
local: {
|
||||
get: function(keys, callback) {
|
||||
return context.wrapPromise(
|
||||
ExtensionStorage.get(extension.id, keys), callback);
|
||||
get: function(keys) {
|
||||
return ExtensionStorage.get(extension.id, keys);
|
||||
},
|
||||
set: function(items, callback) {
|
||||
return context.wrapPromise(
|
||||
ExtensionStorage.set(extension.id, items), callback);
|
||||
set: function(items) {
|
||||
return ExtensionStorage.set(extension.id, items);
|
||||
},
|
||||
remove: function(items, callback) {
|
||||
return context.wrapPromise(
|
||||
ExtensionStorage.remove(extension.id, items), callback);
|
||||
remove: function(items) {
|
||||
return ExtensionStorage.remove(extension.id, items);
|
||||
},
|
||||
clear: function(callback) {
|
||||
return context.wrapPromise(
|
||||
ExtensionStorage.clear(extension.id), callback);
|
||||
clear: function() {
|
||||
return ExtensionStorage.clear(extension.id);
|
||||
},
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
"name": "get",
|
||||
"type": "function",
|
||||
"description": "Gets one or more items from storage.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "keys",
|
||||
|
|
@ -66,6 +67,7 @@
|
|||
"unsupported": true,
|
||||
"type": "function",
|
||||
"description": "Gets the amount of space (in bytes) being used by one or more items.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "keys",
|
||||
|
|
@ -94,6 +96,7 @@
|
|||
"name": "set",
|
||||
"type": "function",
|
||||
"description": "Sets multiple items.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "items",
|
||||
|
|
@ -114,6 +117,7 @@
|
|||
"name": "remove",
|
||||
"type": "function",
|
||||
"description": "Removes one or more items from storage.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "keys",
|
||||
|
|
@ -136,6 +140,7 @@
|
|||
"name": "clear",
|
||||
"type": "function",
|
||||
"description": "Removes all items from storage.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "callback",
|
||||
|
|
|
|||
|
|
@ -14,49 +14,26 @@
|
|||
"use strict";
|
||||
|
||||
function backgroundScript() {
|
||||
function set(items) {
|
||||
return new Promise(resolve => {
|
||||
browser.storage.local.set(items, resolve);
|
||||
});
|
||||
}
|
||||
|
||||
function get(items) {
|
||||
return new Promise(resolve => {
|
||||
browser.storage.local.get(items, resolve);
|
||||
});
|
||||
}
|
||||
|
||||
function remove(items) {
|
||||
return new Promise(resolve => {
|
||||
browser.storage.local.remove(items, resolve);
|
||||
});
|
||||
}
|
||||
|
||||
function clear(items) {
|
||||
return new Promise(resolve => {
|
||||
browser.storage.local.clear(resolve);
|
||||
});
|
||||
}
|
||||
|
||||
let storage = browser.storage.local;
|
||||
function check(prop, value) {
|
||||
return get(null).then(data => {
|
||||
browser.test.assertEq(data[prop], value, "null getter worked for " + prop);
|
||||
return get(prop);
|
||||
return storage.get(null).then(data => {
|
||||
browser.test.assertEq(value, data[prop], "null getter worked for " + prop);
|
||||
return storage.get(prop);
|
||||
}).then(data => {
|
||||
browser.test.assertEq(data[prop], value, "string getter worked for " + prop);
|
||||
return get([prop]);
|
||||
browser.test.assertEq(value, data[prop], "string getter worked for " + prop);
|
||||
return storage.get([prop]);
|
||||
}).then(data => {
|
||||
browser.test.assertEq(data[prop], value, "array getter worked for " + prop);
|
||||
return get({[prop]: undefined});
|
||||
browser.test.assertEq(value, data[prop], "array getter worked for " + prop);
|
||||
return storage.get({[prop]: undefined});
|
||||
}).then(data => {
|
||||
browser.test.assertEq(data[prop], value, "object getter worked for " + prop);
|
||||
browser.test.assertEq(value, data[prop], "object getter worked for " + prop);
|
||||
});
|
||||
}
|
||||
|
||||
let globalChanges = {};
|
||||
|
||||
browser.storage.onChanged.addListener((changes, storage) => {
|
||||
browser.test.assertEq(storage, "local", "storage is local");
|
||||
browser.test.assertEq("local", storage, "storage is local");
|
||||
Object.assign(globalChanges, changes);
|
||||
});
|
||||
|
||||
|
|
@ -76,64 +53,64 @@ function backgroundScript() {
|
|||
/* eslint-disable dot-notation */
|
||||
|
||||
// Set some data and then test getters.
|
||||
set({"test-prop1": "value1", "test-prop2": "value2"}).then(() => {
|
||||
storage.set({"test-prop1": "value1", "test-prop2": "value2"}).then(() => {
|
||||
checkChanges({"test-prop1": {newValue: "value1"}, "test-prop2": {newValue: "value2"}});
|
||||
return check("test-prop1", "value1");
|
||||
}).then(() => {
|
||||
return check("test-prop2", "value2");
|
||||
}).then(() => {
|
||||
return get({"test-prop1": undefined, "test-prop2": undefined, "other": "default"});
|
||||
return storage.get({"test-prop1": undefined, "test-prop2": undefined, "other": "default"});
|
||||
}).then(data => {
|
||||
browser.test.assertEq(data["test-prop1"], "value1", "prop1 correct");
|
||||
browser.test.assertEq(data["test-prop2"], "value2", "prop2 correct");
|
||||
browser.test.assertEq(data["other"], "default", "other correct");
|
||||
return get(["test-prop1", "test-prop2", "other"]);
|
||||
browser.test.assertEq("value1", data["test-prop1"], "prop1 correct");
|
||||
browser.test.assertEq("value2", data["test-prop2"], "prop2 correct");
|
||||
browser.test.assertEq("default", data["other"], "other correct");
|
||||
return storage.get(["test-prop1", "test-prop2", "other"]);
|
||||
}).then(data => {
|
||||
browser.test.assertEq(data["test-prop1"], "value1", "prop1 correct");
|
||||
browser.test.assertEq(data["test-prop2"], "value2", "prop2 correct");
|
||||
browser.test.assertEq("value1", data["test-prop1"], "prop1 correct");
|
||||
browser.test.assertEq("value2", data["test-prop2"], "prop2 correct");
|
||||
browser.test.assertFalse("other" in data, "other correct");
|
||||
|
||||
// Remove data in various ways.
|
||||
}).then(() => {
|
||||
return remove("test-prop1");
|
||||
return storage.remove("test-prop1");
|
||||
}).then(() => {
|
||||
checkChanges({"test-prop1": {oldValue: "value1"}});
|
||||
return get(["test-prop1", "test-prop2"]);
|
||||
return storage.get(["test-prop1", "test-prop2"]);
|
||||
}).then(data => {
|
||||
browser.test.assertFalse("test-prop1" in data, "prop1 absent");
|
||||
browser.test.assertTrue("test-prop2" in data, "prop2 present");
|
||||
|
||||
return set({"test-prop1": "value1"});
|
||||
return storage.set({"test-prop1": "value1"});
|
||||
}).then(() => {
|
||||
checkChanges({"test-prop1": {newValue: "value1"}});
|
||||
return get(["test-prop1", "test-prop2"]);
|
||||
return storage.get(["test-prop1", "test-prop2"]);
|
||||
}).then(data => {
|
||||
browser.test.assertEq(data["test-prop1"], "value1", "prop1 correct");
|
||||
browser.test.assertEq(data["test-prop2"], "value2", "prop2 correct");
|
||||
browser.test.assertEq("value1", data["test-prop1"], "prop1 correct");
|
||||
browser.test.assertEq("value2", data["test-prop2"], "prop2 correct");
|
||||
}).then(() => {
|
||||
return remove(["test-prop1", "test-prop2"]);
|
||||
return storage.remove(["test-prop1", "test-prop2"]);
|
||||
}).then(() => {
|
||||
checkChanges({"test-prop1": {oldValue: "value1"}, "test-prop2": {oldValue: "value2"}});
|
||||
return get(["test-prop1", "test-prop2"]);
|
||||
return storage.get(["test-prop1", "test-prop2"]);
|
||||
}).then(data => {
|
||||
browser.test.assertFalse("test-prop1" in data, "prop1 absent");
|
||||
browser.test.assertFalse("test-prop2" in data, "prop2 absent");
|
||||
|
||||
// test storage.clear
|
||||
}).then(() => {
|
||||
return set({"test-prop1": "value1", "test-prop2": "value2"});
|
||||
return storage.set({"test-prop1": "value1", "test-prop2": "value2"});
|
||||
}).then(() => {
|
||||
return clear();
|
||||
return storage.clear();
|
||||
}).then(() => {
|
||||
checkChanges({"test-prop1": {oldValue: "value1"}, "test-prop2": {oldValue: "value2"}});
|
||||
return get(["test-prop1", "test-prop2"]);
|
||||
return storage.get(["test-prop1", "test-prop2"]);
|
||||
}).then(data => {
|
||||
browser.test.assertFalse("test-prop1" in data, "prop1 absent");
|
||||
browser.test.assertFalse("test-prop2" in data, "prop2 absent");
|
||||
|
||||
// Test cache invalidation.
|
||||
}).then(() => {
|
||||
return set({"test-prop1": "value1", "test-prop2": "value2"});
|
||||
return storage.set({"test-prop1": "value1", "test-prop2": "value2"});
|
||||
}).then(() => {
|
||||
globalChanges = {};
|
||||
browser.test.sendMessage("invalidate");
|
||||
|
|
@ -145,25 +122,28 @@ function backgroundScript() {
|
|||
|
||||
// Make sure we can store complex JSON data.
|
||||
}).then(() => {
|
||||
return set({"test-prop1": {str: "hello", bool: true, undef: undefined, obj: {}, arr: [1, 2]}});
|
||||
return storage.set({"test-prop1": {str: "hello", bool: true, undef: undefined, obj: {}, arr: [1, 2]}});
|
||||
}).then(() => {
|
||||
browser.test.assertEq(globalChanges["test-prop1"].oldValue, "value1", "oldValue correct");
|
||||
browser.test.assertEq(typeof(globalChanges["test-prop1"].newValue), "object", "newValue is obj");
|
||||
browser.test.assertEq("value1", globalChanges["test-prop1"].oldValue, "oldValue correct");
|
||||
browser.test.assertEq("object", typeof(globalChanges["test-prop1"].newValue), "newValue is obj");
|
||||
globalChanges = {};
|
||||
return get({"test-prop1": undefined});
|
||||
return storage.get({"test-prop1": undefined});
|
||||
}).then(data => {
|
||||
let obj = data["test-prop1"];
|
||||
|
||||
browser.test.assertEq(obj.str, "hello", "string part correct");
|
||||
browser.test.assertEq(obj.bool, true, "bool part correct");
|
||||
browser.test.assertEq(obj.undef, undefined, "undefined part correct");
|
||||
browser.test.assertEq(typeof(obj.obj), "object", "object part correct");
|
||||
browser.test.assertEq("hello", obj.str, "string part correct");
|
||||
browser.test.assertEq(true, obj.bool, "bool part correct");
|
||||
browser.test.assertEq(undefined, obj.undef, "undefined part correct");
|
||||
browser.test.assertEq("object", typeof(obj.obj), "object part correct");
|
||||
browser.test.assertTrue(Array.isArray(obj.arr), "array part present");
|
||||
browser.test.assertEq(obj.arr[0], 1, "arr[0] part correct");
|
||||
browser.test.assertEq(obj.arr[1], 2, "arr[1] part correct");
|
||||
browser.test.assertEq(obj.arr.length, 2, "arr.length part correct");
|
||||
browser.test.assertEq(1, obj.arr[0], "arr[0] part correct");
|
||||
browser.test.assertEq(2, obj.arr[1], "arr[1] part correct");
|
||||
browser.test.assertEq(2, obj.arr.length, "arr.length part correct");
|
||||
}).then(() => {
|
||||
browser.test.notifyPass("storage");
|
||||
}).catch(e => {
|
||||
browser.test.fail(`Error: ${e} :: ${e.stack}`);
|
||||
browser.test.notifyFail("storage");
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -174,14 +154,17 @@ let extensionData = {
|
|||
},
|
||||
};
|
||||
|
||||
add_task(function* test_contentscript() {
|
||||
add_task(function* test_backgroundScript() {
|
||||
let extension = ExtensionTestUtils.loadExtension(extensionData);
|
||||
yield Promise.all([extension.startup(), extension.awaitMessage("invalidate")]);
|
||||
|
||||
yield extension.startup();
|
||||
|
||||
yield extension.awaitMessage("invalidate");
|
||||
SpecialPowers.invalidateExtensionStorageCache();
|
||||
extension.sendMessage("invalidated");
|
||||
|
||||
yield extension.awaitFinish("storage");
|
||||
yield extension.unload();
|
||||
info("extension unloaded");
|
||||
});
|
||||
|
||||
</script>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче