Issue 2040 - Adapted tests for chrome.storage.local

chrome/content/tests/prefs.js

Index: chrome/content/tests/prefs.js
===================================================================
--- a/chrome/content/tests/prefs.js
+++ b/chrome/content/tests/prefs.js
@@ -13,31 +13,41 @@
     }
   });
 
-  function prefExists(name)
+  function checkPrefExists(name, expectedValue, description, assert)
   {
     if ("chrome" in window)
-      return name in localStorage;
+    {
+      let done = assert.async();
+      let key = "pref:" + name;
+      chrome.storage.local.get(key, function(items)
+      {
+        equal(key in items, expectedValue, description);
+        done();
+      });
+    }
     else
-      return Services.prefs.prefHasUserValue("extensions.adblockplus." + name);
+    {
+      equal(Services.prefs.prefHasUserValue("extensions.adblockplus." + name), expectedValue, description);
+    }
   }
 
-  function checkPref(name, expectedValue, description)
+  function checkPref(name, expectedValue, description, assert)
   {
-    let value = null;
     if ("chrome" in window)
     {
-      try
+      let done = assert.async();
+      let key = "pref:" + name;
+      chrome.storage.local.get(key, function(items)
       {
-        value = JSON.parse(localStorage[name]);
-      }
-      catch (e)
-      {
-        Cu.reportError(e);
-      }
+        deepEqual(items[key], expectedValue, description);
+        done();
+      });
     }
     else
     {
       let pref = "extensions.adblockplus." + name;
+      let value = null;
+
       switch (typeof expectedValue)
       {
         case "number":
@@ -53,60 +63,60 @@
           value = JSON.parse(Services.prefs.getComplexValue(pref, Ci.nsISupportsString).data);
           break;
       }
+
+      deepEqual(value, expectedValue, description);
     }
-    deepEqual(value, expectedValue, description);
   }
 
-  test("Numerical pref", function()
+  test("Numerical pref", function(assert)
   {
     Prefs.patternsbackups = 5;
     equal(Prefs.patternsbackups, 5, "Prefs object returns the correct value after setting pref to default value");
-    equal(prefExists("patternsbackups"), false, "User-defined pref has been removed");
+    checkPrefExists("patternsbackups", false, "User-defined pref has been removed", assert);
     Prefs.patternsbackups = 12;
     equal(Prefs.patternsbackups, 12, "Prefs object returns the correct value after setting pref to non-default value");
-    equal(prefExists("patternsbackups"), true, "User-defined pref has been created");
-    checkPref("patternsbackups", 12, "Value has been written");
+    checkPrefExists("patternsbackups", true, "User-defined pref has been created", assert);
+    checkPref("patternsbackups", 12, "Value has been written", assert);
   });
 
-  test("Boolean pref", function()
+  test("Boolean pref", function(assert)
   {
     Prefs.enabled = true;
     equal(Prefs.enabled, true, "Prefs object returns the correct value after setting pref to default value");
-    equal(prefExists("enabled"), false, "User-defined pref has been removed");
+    checkPrefExists("enabled", false, "User-defined pref has been removed", assert);
     Prefs.enabled = false;
     equal(Prefs.enabled, false, "Prefs object returns the correct value after setting pref to non-default value");
-    equal(prefExists("enabled"), true, "User-defined pref has been created");
-    checkPref("enabled", false, "Value has been written");
+    checkPrefExists("enabled", true, "User-defined pref has been created", assert);
+    checkPref("enabled", false, "Value has been written", assert);
   });
 
-  test("String pref", function()
+  test("String pref", function(assert)
   {
     let defaultValue = "https://notification.adblockplus.org/notification.json";
     Prefs.notificationurl = defaultValue;
     equal(Prefs.notificationurl, defaultValue, "Prefs object returns the correct value after setting pref to default value");
-    equal(prefExists("notificationurl"), false, "User-defined pref has been removed");
+    checkPrefExists("notificationurl", false, "User-defined pref has been removed", assert);
 
     let newValue = "https://notification.adblockplus.org/foo\u1234bar.json";
     Prefs.notificationurl = newValue;
     equal(Prefs.notificationurl, newValue, "Prefs object returns the correct value after setting pref to non-default value");
-    equal(prefExists("notificationurl"), true, "User-defined pref has been created");
-    checkPref("notificationurl", newValue, "Value has been written");
+    checkPrefExists("notificationurl", true, "User-defined pref has been created", assert);
+    checkPref("notificationurl", newValue, "Value has been written", assert);
   });
 
-  test("Object pref (complete replacement)", function()
+  test("Object pref (complete replacement)", function(assert)
   {
     Prefs.notificationdata = {};
     deepEqual(Prefs.notificationdata, {}, "Prefs object returns the correct value after setting pref to default value");
-    equal(prefExists("notificationdata"), false, "User-defined pref has been removed");
 
     let newValue = {foo:1, bar: "adsf\u1234"};
     Prefs.notificationdata = newValue;
     equal(Prefs.notificationdata, newValue, "Prefs object returns the correct value after setting pref to non-default value");
-    equal(prefExists("notificationdata"), true, "User-defined pref has been created");
-    checkPref("notificationdata", newValue, "Value has been written");
+    checkPrefExists("notificationdata", true, "User-defined pref has been created", assert);
+    checkPref("notificationdata", newValue, "Value has been written", assert);
   });
 
-  test("Property-wise modification", function()
+  test("Property-wise modification", function(assert)
   {
     Prefs.notificationdata = {};
 
@@ -114,13 +124,12 @@
     Prefs.notificationdata.bar = 2;
     Prefs.notificationdata = JSON.parse(JSON.stringify(Prefs.notificationdata));
     deepEqual(Prefs.notificationdata, {foo:1, bar: 2}, "Prefs object returns the correct value after setting pref to non-default value");
-    equal(prefExists("notificationdata"), true, "User-defined pref has been created");
-    checkPref("notificationdata", {foo:1, bar: 2}, "Value has been written");
+    checkPrefExists("notificationdata", true, "User-defined pref has been created", assert);
+    checkPref("notificationdata", {foo:1, bar: 2}, "Value has been written", assert);
 
     delete Prefs.notificationdata.foo;
     delete Prefs.notificationdata.bar;
     Prefs.notificationdata = JSON.parse(JSON.stringify(Prefs.notificationdata));
     deepEqual(Prefs.notificationdata, {}, "Prefs object returns the correct value after setting pref to default value");
-    equal(prefExists("notificationdata"), false, "User-defined pref has been removed");
   });
 })();