From 2c9697303dd53d86098463644cbff8c5a0e4d72e Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Tue, 26 Nov 2013 13:19:32 +0800 Subject: [PATCH] Bug 943198 - Follow-up of bug 814637: enable new marionette tests of IccManager. r=hsinyi --- dom/icc/tests/marionette/manifest.ini | 2 -- .../test_icc_access_invalid_object.js | 25 +++++++------------ .../test_icc_detected_undetected_event.js | 25 +++++++------------ 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dom/icc/tests/marionette/manifest.ini b/dom/icc/tests/marionette/manifest.ini index cbd18fc23683..41ea70e37aa6 100644 --- a/dom/icc/tests/marionette/manifest.ini +++ b/dom/icc/tests/marionette/manifest.ini @@ -24,6 +24,4 @@ qemu = true [test_stk_setup_idle_mode_text.js] [test_stk_bip_command.js] [test_icc_access_invalid_object.js] -disabled = Bug 933654 [test_icc_detected_undetected_event.js] -disabled = Bug 933654 diff --git a/dom/icc/tests/marionette/test_icc_access_invalid_object.js b/dom/icc/tests/marionette/test_icc_access_invalid_object.js index 98628ac2196f..d55eb85ae26f 100644 --- a/dom/icc/tests/marionette/test_icc_access_invalid_object.js +++ b/dom/icc/tests/marionette/test_icc_access_invalid_object.js @@ -5,25 +5,18 @@ MARIONETTE_TIMEOUT = 30000; MARIONETTE_HEAD_JS = "icc_header.js"; function setRadioEnabled(enabled) { - SpecialPowers.addPermission("settings-write", true, document); + let connection = navigator.mozMobileConnections[0]; + ok(connection); - // TODO: Bug 856553 - [B2G] RIL: need an API to enable/disable radio - let settings = navigator.mozSettings; - let setLock = settings.createLock(); - let obj = { - "ril.radio.disabled": !enabled + let request = connection.setRadioEnabled(enabled); + + request.onsuccess = function onsuccess() { + log('setRadioEnabled: ' + enabled); }; - let setReq = setLock.set(obj); - setReq.addEventListener("success", function onSetSuccess() { - log("set 'ril.radio.disabled' to " + enabled); - }); - - setReq.addEventListener("error", function onSetError() { - ok(false, "cannot set 'ril.radio.disabled' to " + enabled); - }); - - SpecialPowers.removePermission("settings-write", document); + request.onerror = function onerror() { + ok(false, "setRadioEnabled should be ok"); + }; } /* Test access invalid icc object */ diff --git a/dom/icc/tests/marionette/test_icc_detected_undetected_event.js b/dom/icc/tests/marionette/test_icc_detected_undetected_event.js index a8e270569c94..919ff14630ad 100644 --- a/dom/icc/tests/marionette/test_icc_detected_undetected_event.js +++ b/dom/icc/tests/marionette/test_icc_detected_undetected_event.js @@ -5,25 +5,18 @@ MARIONETTE_TIMEOUT = 30000; MARIONETTE_HEAD_JS = "icc_header.js"; function setRadioEnabled(enabled) { - SpecialPowers.addPermission("settings-write", true, document); + let connection = navigator.mozMobileConnections[0]; + ok(connection); - // TODO: Bug 856553 - [B2G] RIL: need an API to enable/disable radio - let settings = navigator.mozSettings; - let setLock = settings.createLock(); - let obj = { - "ril.radio.disabled": !enabled + let request = connection.setRadioEnabled(enabled); + + request.onsuccess = function onsuccess() { + log('setRadioEnabled: ' + enabled); }; - let setReq = setLock.set(obj); - setReq.addEventListener("success", function onSetSuccess() { - log("set 'ril.radio.disabled' to " + enabled); - }); - - setReq.addEventListener("error", function onSetError() { - ok(false, "cannot set 'ril.radio.disabled' to " + enabled); - }); - - SpecialPowers.removePermission("settings-write", document); + request.onerror = function onerror() { + ok(false, "setRadioEnabled should be ok"); + }; } /* Test iccundetected event */