diff --git a/dom/mobilemessage/tests/marionette/test_filter_date.js b/dom/mobilemessage/tests/marionette/test_filter_date.js index 4102a5da86dd..7073c97d70d0 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_date.js +++ b/dom/mobilemessage/tests/marionette/test_filter_date.js @@ -21,16 +21,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let filter = new MozSmsFilter; - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -45,8 +43,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -138,20 +136,18 @@ function getMsgs() { log("Getting SMS messages with dates between " + yesterday + " and " + tomorrow +"."); - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); // Store found message - foundSmsList.push(cursor.message); + foundSmsList.push(cursor.result); // Now get next message in the list cursor.continue(); } else { @@ -169,8 +165,8 @@ function getMsgs() { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_filter_date_notfound.js b/dom/mobilemessage/tests/marionette/test_filter_date_notfound.js index 3abd2931d7e7..02b978baa7c7 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_date_notfound.js +++ b/dom/mobilemessage/tests/marionette/test_filter_date_notfound.js @@ -21,16 +21,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let filter = new MozSmsFilter; - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -45,8 +43,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -138,18 +136,16 @@ function getMsgs() { log("Getting SMS messages with dates between " + twoDaysAgo + " and " + yesterday +"."); - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); log("SMS getMessages returned a message but should not have."); ok(false, "SMS date filter did not work"); } else { @@ -159,8 +155,8 @@ function getMsgs() { deleteAllMsgs(cleanUp); }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_filter_mixed.js b/dom/mobilemessage/tests/marionette/test_filter_mixed.js index 8be418a6fc57..a4a8c022aad9 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_mixed.js +++ b/dom/mobilemessage/tests/marionette/test_filter_mixed.js @@ -64,10 +64,9 @@ function getAllMessages(callback, filter, reverse) { let messages = []; let request = sms.getMessages(filter, reverse || false); request.onsuccess = function(event) { - let cursor = event.target.result; - if (cursor.message) { - messages.push(cursor.message); - cursor.continue(); + if (request.result) { + messages.push(request.result); + request.continue(); return; } diff --git a/dom/mobilemessage/tests/marionette/test_filter_number_multiple.js b/dom/mobilemessage/tests/marionette/test_filter_number_multiple.js index eda947c696d9..8dc7d98c0809 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_number_multiple.js +++ b/dom/mobilemessage/tests/marionette/test_filter_number_multiple.js @@ -23,16 +23,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let filter = new MozSmsFilter; - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -47,8 +45,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -192,20 +190,18 @@ function getMsgs(secondNumber) { log("Getting the SMS messages with numbers " + defaultRemoteNumber + " and " + secondNumber + "."); - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); // Store found message - foundSmsList.push(cursor.message); + foundSmsList.push(cursor.result); // Now get next message in the list cursor.continue(); } else { @@ -223,8 +219,8 @@ function getMsgs(secondNumber) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_filter_number_single.js b/dom/mobilemessage/tests/marionette/test_filter_number_single.js index 7226f278a1a0..6bfd3db233fd 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_number_single.js +++ b/dom/mobilemessage/tests/marionette/test_filter_number_single.js @@ -23,16 +23,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let filter = new MozSmsFilter; - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -47,8 +45,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -150,20 +148,18 @@ function getMsgs() { filter.numbers = new Array(defaultRemoteNumber); log("Getting the SMS messages from sender " + defaultRemoteNumber + "."); - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); // Store found message - foundSmsList.push(cursor.message); + foundSmsList.push(cursor.result); // Now get next message in the list cursor.continue(); } else { @@ -181,8 +177,8 @@ function getMsgs() { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_filter_read.js b/dom/mobilemessage/tests/marionette/test_filter_read.js index 7fd72e637b6c..1ae5bba06625 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_read.js +++ b/dom/mobilemessage/tests/marionette/test_filter_read.js @@ -21,16 +21,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let filter = new MozSmsFilter; - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -45,8 +43,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -170,20 +168,18 @@ function getMsgs() { filter.read = true; log("Getting the read SMS messages."); - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); // Store found message - foundSmsList.push(cursor.message); + foundSmsList.push(cursor.result); // Now get next message in the list cursor.continue(); } else { @@ -201,8 +197,8 @@ function getMsgs() { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_filter_received.js b/dom/mobilemessage/tests/marionette/test_filter_received.js index bec0bf485fe6..d7e00f6ff7bf 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_received.js +++ b/dom/mobilemessage/tests/marionette/test_filter_received.js @@ -21,16 +21,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let filter = new MozSmsFilter; - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -45,8 +43,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -182,20 +180,18 @@ function getMsgs() { filter.delivery = "received"; log("Getting the received SMS messages."); - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); // Store found message - foundSmsList.push(cursor.message); + foundSmsList.push(cursor.result); // Now get next message in the list cursor.continue(); } else { @@ -213,8 +209,8 @@ function getMsgs() { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_filter_sent.js b/dom/mobilemessage/tests/marionette/test_filter_sent.js index de68f8e53206..17f6cd1c9764 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_sent.js +++ b/dom/mobilemessage/tests/marionette/test_filter_sent.js @@ -21,16 +21,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let filter = new MozSmsFilter; - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -45,8 +43,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -179,20 +177,18 @@ function getMsgs() { filter.delivery = "sent"; log("Getting the sent SMS messages."); - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); // Store found message - foundSmsList.push(cursor.message); + foundSmsList.push(cursor.result); // Now get next message in the list cursor.continue(); } else { @@ -210,8 +206,8 @@ function getMsgs() { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_filter_unread.js b/dom/mobilemessage/tests/marionette/test_filter_unread.js index 17e67445d488..d59be27c9e7f 100644 --- a/dom/mobilemessage/tests/marionette/test_filter_unread.js +++ b/dom/mobilemessage/tests/marionette/test_filter_unread.js @@ -21,16 +21,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let filter = new MozSmsFilter; - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -45,8 +43,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -164,20 +162,18 @@ function getMsgs() { filter.read = false; log("Getting the unread SMS messages."); - let request = sms.getMessages(filter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(filter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); // Store found message - foundSmsList.push(cursor.message); + foundSmsList.push(cursor.result); // Now get next message in the list cursor.continue(); } else { @@ -195,8 +191,8 @@ function getMsgs() { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_getmessages.js b/dom/mobilemessage/tests/marionette/test_getmessages.js index fda749b49f41..e6af053ff8fb 100644 --- a/dom/mobilemessage/tests/marionette/test_getmessages.js +++ b/dom/mobilemessage/tests/marionette/test_getmessages.js @@ -25,16 +25,14 @@ function deleteAllMsgs(nextFunction) { let msgList = new Array(); let smsFilter = new MozSmsFilter; - let request = sms.getMessages(smsFilter, false); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(smsFilter, false); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { // Check if message was found - if (cursor.message) { - msgList.push(cursor.message.id); + if (cursor.result) { + msgList.push(cursor.result.id); // Now get next message in the list cursor.continue(); } else { @@ -49,8 +47,8 @@ function deleteAllMsgs(nextFunction) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); @@ -144,21 +142,19 @@ function getMsgs(reverse) { // Note: This test is intended for getMessages, so just a basic test with // no filter (default); separate tests will be written for sms filtering - let request = sms.getMessages(smsFilter, reverse); - ok(request instanceof MozSmsRequest, - "request is instanceof " + request.constructor); + let cursor = sms.getMessages(smsFilter, reverse); + ok(cursor instanceof DOMCursor, + "cursor is instanceof " + cursor.constructor); - request.onsuccess = function(event) { - log("Received 'onsuccess' smsrequest event."); - ok(event.target.result, "smsrequest event.target.result"); - cursor = event.target.result; + cursor.onsuccess = function(event) { + log("Received 'onsuccess' event."); - if (cursor.message) { + if (cursor.result) { // Another message found - log("Got SMS (id: " + cursor.message.id + ")."); + log("Got SMS (id: " + cursor.result.id + ")."); foundSmsCount++; // Store found message - foundSmsList.push(cursor.message); + foundSmsList.push(cursor.result); // Now get next message in the list cursor.continue(); } else { @@ -175,8 +171,8 @@ function getMsgs(reverse) { } }; - request.onerror = function(event) { - log("Received 'onerror' smsrequest event."); + cursor.onerror = function(event) { + log("Received 'onerror' event."); ok(event.target.error, "domerror obj"); log("sms.getMessages error: " + event.target.error.name); ok(false,"Could not get SMS messages"); diff --git a/dom/mobilemessage/tests/marionette/test_message_classes.js b/dom/mobilemessage/tests/marionette/test_message_classes.js index f2567738dc41..374ee3ff21d0 100644 --- a/dom/mobilemessage/tests/marionette/test_message_classes.js +++ b/dom/mobilemessage/tests/marionette/test_message_classes.js @@ -70,12 +70,11 @@ function test_message_class_0() { checkMessage(message, -1, 0, "class-0"); // Make sure the message is not stored. - let request = sms.getMessages(null, false); - request.onsuccess = function onsuccess() { - let cursor = request.result; - if (cursor.message) { + let cursor = sms.getMessages(null, false); + cursor.onsuccess = function onsuccess() { + if (cursor.result) { // Here we check whether there is any message of the same sender. - isnot(cursor.message.sender, message.sender, "cursor.message.sender"); + isnot(cursor.result.sender, message.sender, "cursor.result.sender"); cursor.continue(); return; @@ -89,7 +88,7 @@ function test_message_class_0() { window.setTimeout(do_test.bind(null, dcsIndex), 0); } }; - request.onerror = function onerror() { + cursor.onerror = function onerror() { ok(false, "Can't fetch messages from SMS database"); }; }); diff --git a/dom/mobilemessage/tests/test_sms_basics.html b/dom/mobilemessage/tests/test_sms_basics.html index b9b55de05636..094457ccd720 100644 --- a/dom/mobilemessage/tests/test_sms_basics.html +++ b/dom/mobilemessage/tests/test_sms_basics.html @@ -46,7 +46,6 @@ function test() { checkInterface("SmsEvent"); checkInterface("SmsRequest"); checkInterface("SmsFilter"); - checkInterface("SmsCursor"); // If sms is disabled and permission is removed, sms is disabled. SpecialPowers.setBoolPref("dom.sms.enabled", false); diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index b651dc8cfd70..eec124be3896 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -426,7 +426,6 @@ var interfaceNamesInGlobalScope = "SVGTests", "RGBColor", "HTMLLabelElement", - "MozSmsCursor", "EventSource", "MozNavigatorSms", "MozNavigatorMobileMessage",