diff -r 000000000000 -r 6474c204b198 dom/mobileconnection/tests/marionette/test_call_barring_set_error.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/mobileconnection/tests/marionette/test_call_barring_set_error.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,74 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 60000;
+
+SpecialPowers.addPermission("mobileconnection", true, document);
+
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let connection;
+ifr.onload = function() {
+  connection = ifr.contentWindow.navigator.mozMobileConnections[0];
+
+  ok(connection instanceof ifr.contentWindow.MozMobileConnection,
+     "connection is instanceof " + connection.constructor);
+
+  nextTest();
+};
+document.body.appendChild(ifr);
+
+let caseId = 0;
+let options = [
+  buildOption(5, true, '0000', 0),  // invalid program.
+
+  // test null.
+  buildOption(null, true, '0000', 0),
+  buildOption(0, null, '0000', 0),
+  buildOption(0, true, null, 0),
+  buildOption(0, true, '0000', null),
+
+  // test undefined.
+  {'enabled': true, 'password': '0000', 'serviceClass': 0},
+  {'program': 0, 'password': '0000', 'serviceClass': 0},
+  {'program': 0, 'enabled': true, 'serviceClass': 0},
+  {'program': 0, 'enabled': true, 'password': '0000'},
+];
+
+function buildOption(program, enabled, password, serviceClass) {
+  return {
+    'program': program,
+    'enabled': enabled,
+    'password': password,
+    'serviceClass': serviceClass
+  };
+}
+
+function testSetCallBarringOptionError(option) {
+  let request = connection.setCallBarringOption(option);
+  request.onsuccess = function() {
+    ok(false,
+       'should not fire onsuccess for invaild call barring option: '
+       + JSON.stringify(option));
+  };
+  request.onerror = function(event) {
+    is(event.target.error.name, 'InvalidParameter', JSON.stringify(option));
+    nextTest();
+  };
+}
+
+function nextTest() {
+  if (caseId >= options.length) {
+    cleanUp();
+  } else {
+    let option = options[caseId++];
+    log('test for ' + JSON.stringify(option));
+    testSetCallBarringOptionError(option);
+  }
+}
+
+function cleanUp() {
+  SpecialPowers.removePermission("mobileconnection", document);
+  finish();
+}