update test to use templates, r?bsilverberg
Also, add another variable to the failure messages now that they are being
run for each area.
MozReview-Commit-ID: ApKFhWsW3DM
--- a/toolkit/components/extensions/test/mochitest/test_ext_storage.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_storage.html
@@ -17,26 +17,26 @@ const STORAGE_SYNC_PREF = "extension.sto
/**
* Utility function to ensure that all supported APIs for getting are
* tested.
*/
function checkGet(areaName, prop, value) {
let storage = browser.storage[areaName];
return storage.get(null).then(data => {
- browser.test.assertEq(value, data[prop], "null getter worked for " + prop);
+ browser.test.assertEq(value, data[prop], `null getter worked for ${prop} in ${areaName}`);
return storage.get(prop);
}).then(data => {
- browser.test.assertEq(value, data[prop], "string getter worked for " + prop);
+ browser.test.assertEq(value, data[prop], `string getter worked for ${prop} in ${areaName}`);
return storage.get([prop]);
}).then(data => {
- browser.test.assertEq(value, data[prop], "array getter worked for " + prop);
+ browser.test.assertEq(value, data[prop], `array getter worked for ${prop} in ${areaName}`);
return storage.get({[prop]: undefined});
}).then(data => {
- browser.test.assertEq(value, data[prop], "object getter worked for " + prop);
+ browser.test.assertEq(value, data[prop], `object getter worked for ${prop} in ${areaName}`);
});
}
add_task(function* test_local_cache_invalidation() {
function background(checkGet) {
browser.test.onMessage.addListener(msg => {
if (msg === "set-initial") {
browser.storage.local.set({"test-prop1": "value1", "test-prop2": "value2"}).then(() => {
@@ -281,17 +281,17 @@ function backgroundScript(checkGet) {
}
promise.then(() => browser.test.sendMessage("test-finished"));
});
browser.test.sendMessage("ready");
}
let extensionData = {
- background: "(" + backgroundScript.toString() + ")(" + checkGet.toString() + ")",
+ background: `(${backgroundScript})(${checkGet})`,
manifest: {
permissions: ["storage"],
},
};
add_task(function* test_backgroundScript() {
SpecialPowers.setBoolPref(STORAGE_SYNC_PREF, true);
SimpleTest.registerCleanupFunction(() => {