Backed out changeset 9d80f8548ac9 (bug 1148933) for b2g xpcshell bustage CLOSED TREE

--HG--
extra : amend_source : 7df4682dceccd5e785a8b45d50761e87713c7fe9

services/common/moz.build

@@ -17,6 +17,7 @@ EXTRA_JS_MODULES['services-common'] += [
     'hawkclient.js',
     'hawkrequest.js',
     'logmanager.js',
+    'storageservice.js',
     'stringbundle.js',
     'tokenserverclient.js',
     'utils.js',

services/common/services-common.js

@@ -8,4 +8,5 @@
 pref("services.common.log.logger.rest.request", "Debug");
 pref("services.common.log.logger.rest.response", "Debug");
 
+pref("services.common.storageservice.sendVersionInfo", true);
 pref("services.common.log.logger.tokenserverclient", "Debug");

services/common/tests/unit/test_load_modules.js

@@ -6,6 +6,7 @@ const modules = [
   "bagheeraclient.js",
   "logmanager.js",
   "rest.js",
+  "storageservice.js",
   "stringbundle.js",
   "tokenserverclient.js",
   "utils.js",

services/common/tests/unit/test_storageservice_bso.js

@@ -0,0 +1,124 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+Cu.import("resource://services-common/storageservice.js");
+
+function run_test() {
+  initTestLogging("Trace");
+
+  run_next_test();
+}
+
+add_test(function test_bso_constructor() {
+  _("Ensure created BSO instances are initialized properly.");
+
+  let bso = new BasicStorageObject();
+  do_check_eq(bso.id, null);
+  do_check_eq(bso.collection, null);
+  do_check_attribute_count(bso.data, 0);
+  do_check_eq(bso.payload, null);
+  do_check_eq(bso.modified, null);
+  do_check_eq(bso.sortindex, 0);
+  do_check_eq(bso.ttl, null);
+
+  bso = new BasicStorageObject("foobar");
+  do_check_eq(bso.id, "foobar");
+  do_check_eq(bso.collection, null);
+  do_check_attribute_count(bso.data, 0);
+
+  bso = new BasicStorageObject("foo", "coll");
+  do_check_eq(bso.id, "foo");
+  do_check_eq(bso.collection, "coll");
+  do_check_attribute_count(bso.data, 0);
+
+  run_next_test();
+});
+
+add_test(function test_bso_attributes() {
+  _("Ensure attribute getters and setters work.");
+
+  let bso = new BasicStorageObject("foobar");
+  bso.payload = "pay";
+  do_check_eq(bso.payload, "pay");
+
+  bso.modified = 35423;
+  do_check_eq(bso.modified, 35423);
+
+  bso.sortindex = 10;
+  do_check_eq(bso.sortindex, 10);
+
+  bso.ttl = 60;
+  do_check_eq(bso.ttl, 60);
+
+  run_next_test();
+});
+
+add_test(function test_bso_deserialize() {
+  _("Ensure that deserialize() works.");
+
+  _("A simple working test.");
+  let json = '{"id": "foobar", "payload": "pay", "modified": 1223145532}';
+  let bso = new BasicStorageObject();
+  bso.deserialize(json);
+  do_check_neq(bso, null);
+  do_check_eq(bso.id, "foobar");
+  do_check_eq(bso.payload, "pay");
+  do_check_eq(bso.modified, 1223145532);
+
+  _("Invalid JSON.");
+  json = '{id: "foobar}';
+  bso = new BasicStorageObject();
+  try {
+    bso.deserialize(json);
+    do_check_true(false);
+  } catch (ex) {
+    do_check_eq(ex.name, "SyntaxError");
+  }
+
+  _("Invalid key in JSON.");
+  json = '{"id": "foo", "payload": "pay", "BADKEY": "irrelevant"}';
+  bso = new BasicStorageObject();
+  try {
+    bso.deserialize(json);
+    do_check_true(false);
+  } catch (ex) {
+    do_check_eq(ex.name, "Error");
+    do_check_eq(ex.message.indexOf("Invalid key"), 0);
+  }
+
+  _("Loading native JS objects works.");
+  bso = new BasicStorageObject();
+  bso.deserialize({id: "foo", payload: "pay"});
+  do_check_neq(bso, null);
+  do_check_eq(bso.id, "foo");
+  do_check_eq(bso.payload, "pay");
+
+  _("Passing invalid type is caught.");
+  bso = new BasicStorageObject();
+  try {
+    bso.deserialize(["foo", "bar"]);
+    do_check_true(false);
+  } catch (ex) {
+    do_check_eq(ex.name, "Error");
+  }
+
+  run_next_test();
+});
+
+add_test(function test_bso_toJSON() {
+  _("Ensure JSON serialization works.");
+
+  let bso = new BasicStorageObject();
+  do_check_attribute_count(bso.toJSON(), 0);
+
+  bso.id = "foo";
+  bso.payload = "pay";
+  let json = bso.toJSON();
+  let original = json;
+
+  do_check_attribute_count(original, 2);
+  do_check_eq(original.id, "foo");
+  do_check_eq(original.payload, "pay");
+
+  run_next_test();
+});

services/common/tests/unit/xpcshell.ini

@@ -34,6 +34,12 @@ skip-if = toolkit == 'gonk'
 [test_restrequest.js]
 [test_tokenauthenticatedrequest.js]
 
+# Storage service APIs
+[test_storageservice_bso.js]
+[test_storageservice_client.js]
+# Bug 969624: Intermittent fail on Android 2.3 and Android 4.3 emulators
+skip-if = android_version == "10" || android_version == "18"
+
 [test_tokenserverclient.js]
 skip-if = os == "android"