From: Witold Choinkowski Date: Thu, 26 Sep 2013 15:50:02 +0000 (+0200) Subject: [messaging mms] method_returns_undefined X-Git-Tag: 2.2.1_release~105^2~54 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9b27b8d3baa50c9d51a1657fe89ba661f9c3dfa;p=test%2Ftct%2Fweb%2Fapi.git [messaging mms] method_returns_undefined Change-Id: I6cfb74cb2b76e1afdeccc021ed15a0b5dc4e8c34 --- diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_subject_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_subject_valid.html index dc6a1b115..79b008b5b 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_subject_valid.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_subject_valid.html @@ -45,13 +45,15 @@ var t = async_test("MessageStorage_findMessages_filter_subject_valid", {timeout: t.step(function () { var mmsService, subjectToSet = new Date().getTime().toString(), subjectFilter, addedMessage, findSuccess, findError, - serviceSuccess, serviceError, returnedValue, + serviceSuccess, serviceError, returnedValue = null, addSuccess, dict; findSuccess = t.step_func(function (messages) { assert_equals(messages.length, 1, "Incorrect number of messages"); assert_equals(messages[0].id, addedMessage.id, "Incorrect message.id"); assert_equals(messages[0].subject, subjectToSet, "Incorrect message.subject"); + + assert_equals(returnedValue, undefined, "Incorrect returned value"); t.done(); }); @@ -63,7 +65,6 @@ t.step(function () { addedMessage = message; subjectFilter = new tizen.AttributeFilter("subject", "EXACTLY", subjectToSet); returnedValue = mmsService.messageStorage.findMessages(subjectFilter, findSuccess, findError); - assert_equals(returnedValue, undefined, "Incorrect returned value"); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_timestamp_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_timestamp_valid.html index 08513bef0..21eec926d 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_timestamp_valid.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_timestamp_valid.html @@ -44,7 +44,7 @@ setup({ timeout: 90000 }); var t = async_test("MessageStorage_findMessages_filter_timestamp_valid", { timeout: 90000 }); t.step(function () { - var findSuccess, findError, serviceSuccess, serviceError, returnedValue, i, + var findSuccess, findError, serviceSuccess, serviceError, returnedValue = null, i, msg, dateTime, before, after, filter, mmsService, sendSuccess, sendError; findSuccess = t.step_func(function (messages) { @@ -53,6 +53,8 @@ t.step(function () { assert_greater_than_equal(messages[i].timestamp.getFullYear(), dateTime.getFullYear(), "Incorrect year"); assert_less_than_equal(messages[i].timestamp.getFullYear(), dateTime.getFullYear() + 1, "Incorrect year"); } + + assert_equals(returnedValue, undefined, "Incorrect returned value"); t.done(); }); @@ -67,7 +69,6 @@ t.step(function () { filter = new tizen.AttributeRangeFilter("timestamp", before, after); returnedValue = mmsService.messageStorage.findMessages(filter, findSuccess, findError); - assert_equals(returnedValue, undefined, "Incorrect returned value"); }); sendError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage.html index 930946bde..50973a35b 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage.html @@ -41,7 +41,7 @@ setup({timeout: 90000}); var t = async_test("MessageStorage_mms_addDraftMessage", {timeout:90000}); t.step(function () { var serviceSuccess, serviceError, messageService, messageStorage, message, - currentDate = new Date(), subjectToSet = currentDate.getTime().toString(), plainBodyToSet = "plainBody", returnedValue, + currentDate = new Date(), subjectToSet = currentDate.getTime().toString(), plainBodyToSet = "plainBody", returnedValue = null, addDraftSuccess, addDraftError, filter, findMessagesSuccess, findMessagesError; @@ -49,6 +49,7 @@ t.step(function () { assert_equals(messages.length, 1, "Received incorrect number of messages"); assert_equals(messages[0].subject, subjectToSet, "subject attribute is incorrect."); assert_equals(messages[0].body.plainBody, plainBodyToSet, "plainBody attribute is incorrect."); + t.done(); }); @@ -57,6 +58,7 @@ t.step(function () { }); addDraftSuccess = t.step_func(function () { + assert_equals(returnedValue, undefined, "Incorrect returned value."); filter = new tizen.AttributeFilter("subject", "EXACTLY", subjectToSet); messageStorage.findMessages(filter, findMessagesSuccess, findMessagesError); }); @@ -71,7 +73,6 @@ t.step(function () { messageStorage = messageService.messageStorage; message = new tizen.Message("messaging.mms", {subject: subjectToSet, plainBody: plainBodyToSet, to: [TEST_SMS_RECIPIENT]}); returnedValue = messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError); - assert_equals(returnedValue, undefined, "Incorrect returned value."); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage_without_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage_without_errorCallback.html index 76781e6b4..39d99e378 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage_without_errorCallback.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage_without_errorCallback.html @@ -41,7 +41,7 @@ setup({timeout: 90000}); var t = async_test("MessageStorage_mms_addDraftMessage_without_errorCallback", {timeout:90000}); t.step(function () { var serviceSuccess, serviceError, messageService, messageStorage, message, - currentDate = new Date(), subjectToSet = currentDate.getTime().toString(), plainBodyToSet = "plainBody", returnedValue, + currentDate = new Date(), subjectToSet = currentDate.getTime().toString(), plainBodyToSet = "plainBody", returnedValue = null, addDraftSuccess, filter, findMessagesSuccess, findMessagesError; @@ -59,6 +59,8 @@ t.step(function () { addDraftSuccess = t.step_func(function () { filter = new tizen.AttributeFilter("subject", "EXACTLY", subjectToSet); messageStorage.findMessages(filter, findMessagesSuccess, findMessagesError); + + assert_equals(returnedValue, undefined, "Incorrect returned value."); }); serviceSuccess = t.step_func(function (services) { @@ -67,7 +69,6 @@ t.step(function () { messageStorage = messageService.messageStorage; message = new tizen.Message("messaging.mms", {subject: subjectToSet, plainBody: plainBodyToSet, to: [TEST_SMS_RECIPIENT]}); returnedValue = messageStorage.addDraftMessage(message, addDraftSuccess); - assert_equals(returnedValue, undefined, "Incorrect returned value."); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage_without_successCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage_without_successCallback.html index 2a25dbfa4..e90852744 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage_without_successCallback.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addDraftMessage_without_successCallback.html @@ -42,7 +42,7 @@ var t = async_test("MessageStorage_mms_addDraftMessage_without_successCallback", t.step(function () { var serviceSuccess, serviceError, messageService, messageStorage, message, currentDate = new Date(), subjectToSet = currentDate.getTime().toString(), plainBodyToSet = "plainBody", - returnedValue, removeAllSuccess; + returnedValue = null, removeAllSuccess; removeAllSuccess = t.step_func(function () { t.done(); diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html index d9b5b6337..6c263f536 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html @@ -43,18 +43,35 @@ Authors: setup({timeout: 90000}); var t = async_test("MessageStorage_mms_findConversations_filter_from", {timeout: 90000}), - returnedValue = null, findSuccess, fromFound, findError, addSuccess, addError, - serviceSuccess, service, datetime, message, messageStorage, serviceError, i; + messageReceived, foundConversationId = false, listenerId = null, listener, message, + findError, findSuccess, i, returnedValue = null, service, + serviceError, serviceSuccess, datetime, messageStorage, sendError, sendSuccess, + fromFound, plainBodyFilter, fromAndPlainBodyFilter; t.step(function () { + add_result_callback(function (res) { + try { + if (listenerId !== null) { + messageStorage.removeChangeListener(listenerId); + } + } catch (err) { + // do nothing in case removeChangeListener throw an exception + } + }); findSuccess = t.step_func(function (conversations) { - assert_equals(returnedValue, undefined, "Incorrect returned value"); + assert_greater_than(conversations.length, 0, "Received empty conversation array"); for (i = 0; i < conversations.length; i++) { assert_not_equals(conversations[i].from, null, "from is null"); fromFound = conversations[i].from.indexOf(TEST_SMS_RECIPIENT); assert_greater_than_equal(fromFound, 0, "Recipient not found"); + + if (conversations[i].id === messageReceived.conversationId) { + foundConversationId = true; + } } + assert_true(foundConversationId, "ConversationId from added message was not found"); + assert_equals(returnedValue, undefined, "Incorrect returned value"); t.done(); }); @@ -62,12 +79,26 @@ t.step(function () { assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message); }); - addSuccess = t.step_func(function () { - returnedValue = service.messageStorage.findConversations(fromFilter, findSuccess, findError); + listener = { + messagesadded: t.step_func(function (messages) { + assert_equals(messages.length, 1, "Incorrect number of messages."); + messageReceived = messages[0]; + assert_equals(messageReceived.body.plainBody, datetime, "Incorrect plainBody found"); + assert_not_equals(messageReceived.id, message.id, "Incorrect id found - id of sent message"); + + messageStorage.removeChangeListener(listenerId); + listenerId = null; + + returnedValue = service.messageStorage.findConversations(fromFilter, findSuccess, findError); + }) + }; + + sendSuccess = t.step_func(function () { + //just ignore this }); - addError = t.step_func(function (error) { - assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message); + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); }); serviceSuccess = t.step_func(function (services) { @@ -81,7 +112,10 @@ t.step(function () { }); messageStorage = service.messageStorage; - service.messageStorage.addDraftMessage(message, addSuccess, addError); + plainBodyFilter = new tizen.AttributeFilter("body.plainBody", "EXACTLY", datetime); + fromAndPlainBodyFilter = new tizen.CompositeFilter("INTERSECTION", [fromFilter, plainBodyFilter]); + listenerId = messageStorage.addMessagesChangeListener(listener, fromAndPlainBodyFilter); + service.sendMessage(message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html index d79528583..7190362b8 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html @@ -39,37 +39,76 @@ Authors: setup({timeout: 90000}); var t = async_test("MessageStorage_mms_findMessages_from_with_errorCallback", {timeout: 90000}), - returnedValue = null, findSuccess, findError, addSuccess, addError, serviceSuccess, - serviceError, datetime, message, i, fromFound, service, messageStorage; + getMessageServicesErrorCB, getMessageServicesSuccessCB, messageService, messageStorage, + message, messageReceived, findSuccessCB, findErrorCB, i, onMessagesAdded, + datetime, filterSuccess = 0, watchId = null, callbackListener, + sendSuccess, sendError, returnedValue = null, fromFound, plainBodyFilter, fromAndPlainBodyFilter; + t.step(function () { + add_result_callback(function (res) { + try { + if (watchId !== null) { + messageStorage.removeChangeListener(watchId); + } + } catch (err) { + // do nothing in case removeChangeListener throw an exception + } + }); - findSuccess = t.step_func(function (msg) { - assert_equals(returnedValue, undefined, "Incorrect returned value"); + findSuccessCB = t.step_func(function (msg) { + assert_greater_than(msg.length, 0, "No messages found"); for (i = 0; i < msg.length; i++) { assert_not_equals(msg[i].from, null, "from is null"); fromFound = msg[i].from.indexOf(TEST_SMS_RECIPIENT); assert_greater_than_equal(fromFound, 0, "Recipient not found"); + + if (msg[i].id === messageReceived.id) { + filterSuccess++; + } } + assert_equals(filterSuccess, 1, "Incorrect number of found message"); + + assert_equals(returnedValue, undefined, "Incorrect returned value"); t.done(); }); - findError = t.step_func(function (error) { + findErrorCB = t.step_func(function (error) { assert_unreached("findMessage() error callback: name:" + error.name + ", msg:" + error.message); }); - addSuccess = t.step_func(function () { - returnedValue = messageStorage.findMessages(fromFilter, findSuccess, findError); + onMessagesAdded = t.step_func(function (messages) { + assert_equals(messages.length, 1, "Incorrect number of messages."); + messageReceived = messages[0]; + assert_equals(messageReceived.body.plainBody, datetime, "Incorrect plainBody found"); + assert_not_equals(messageReceived.id, message.id, "Incorrect id found - id of sent message"); + + messageStorage.removeChangeListener(watchId); + watchId = null; + returnedValue = messageStorage.findMessages(fromFilter, findSuccessCB, findErrorCB); }); - addError = t.step_func(function (error) { - assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message); + callbackListener = { + messagesupdated: t.step_func(function (messages) { + assert_unreached("Should not enter messagesupdated: " + messages.length); + }), + messagesadded: onMessagesAdded, + messagesremoved: t.step_func(function (messages) { + assert_unreached("Should not enter messagesremoved: " + messages.length); + }) + }; + + sendSuccess = t.step_func(function () { + //just ignore this }); - serviceSuccess = t.step_func(function (services) { + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); + }); + + getMessageServicesSuccessCB = t.step_func(function (services) { assert_greater_than(services.length, 0, "Received empty services array"); - service = services[0]; datetime = tizen.time.getCurrentDateTime().toString(); message = new tizen.Message("messaging.mms", { @@ -77,16 +116,19 @@ t.step(function () { to: [ TEST_SMS_RECIPIENT ] }); - messageStorage = service.messageStorage; - service.messageStorage.addDraftMessage(message, addSuccess, addError); - + messageService = services[0]; + messageStorage = messageService.messageStorage; + plainBodyFilter = new tizen.AttributeFilter("body.plainBody", "EXACTLY", datetime); + fromAndPlainBodyFilter = new tizen.CompositeFilter("INTERSECTION", [fromFilter, plainBodyFilter]); + watchId = messageStorage.addMessagesChangeListener(callbackListener, fromAndPlainBodyFilter); + messageService.sendMessage(message, sendSuccess, sendError); }); - serviceError = t.step_func(function (error) { + getMessageServicesErrorCB = t.step_func(function (error) { assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); }); - tizen.messaging.getMessageServices("messaging.mms", serviceSuccess, serviceError); + tizen.messaging.getMessageServices("messaging.mms", getMessageServicesSuccessCB, getMessageServicesErrorCB); }); diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages.html index 8d0cdb2c7..f3ceb8c17 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages.html @@ -46,7 +46,7 @@ t.step(function () { initDictForMutableMessage = mmsMessageInitDict, initDictForConstMessage = mmsMessageInitDict, plainBodyToSetForMutableMessage = plainBodyToSet + "_mutable", plainBodyToSetForConstMessage = plainBodyToSet + "_const", - addDraftSuccess, addDraftError, addDraftSuccessCounter = 0, returnedValue, + addDraftSuccess, addDraftError, addDraftSuccessCounter = 0, returnedValue = null, updateSuccess, updateError, mutableMessagefilter, constMessagefilter, findMutableMessagesSuccess, findMutableMessagesError, foundMutableMessage, mutable = "MUTABLE", findConstMessagesSuccess, findConstMessagesError, foundConstMessage, consts = "CONST", diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_errorCallback.html index 6372c2f43..f836162a7 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_errorCallback.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_errorCallback.html @@ -46,7 +46,7 @@ t.step(function () { initDictForMutableMessage = mmsMessageInitDict, initDictForConstMessage = mmsMessageInitDict, plainBodyToSetForMutableMessage = plainBodyToSet + "_mutable", plainBodyToSetForConstMessage = plainBodyToSet + "_const", - addDraftSuccess, addDraftError, addDraftSuccessCounter = 0, returnedValue, + addDraftSuccess, addDraftError, addDraftSuccessCounter = 0, returnedValue = null, updateSuccess, mutableMessagefilter, constMessagefilter, findMutableMessagesSuccess, findMutableMessagesError, foundMutableMessage, mutable = "MUTABLE", findConstMessagesSuccess, findConstMessagesError, foundConstMessage, consts = "CONST", diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_successCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_successCallback.html index 22610c83a..df56c3171 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_successCallback.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_successCallback.html @@ -46,7 +46,7 @@ t.step(function () { initDictForMutableMessage = mmsMessageInitDict, initDictForConstMessage = mmsMessageInitDict, plainBodyToSetForMutableMessage = plainBodyToSet + "_mutable", plainBodyToSetForConstMessage = plainBodyToSet + "_const", - addDraftSuccess, addDraftError, addDraftSuccessCounter = 0, returnedValue; + addDraftSuccess, addDraftError, addDraftSuccessCounter = 0, returnedValue = null; addDraftSuccess = t.step_func(function () { addDraftSuccessCounter++; diff --git a/tct-messaging-mms-tizen-tests/messaging/Messaging_mms_getMessageServices.html b/tct-messaging-mms-tizen-tests/messaging/Messaging_mms_getMessageServices.html index e10e84546..f589bfb58 100644 --- a/tct-messaging-mms-tizen-tests/messaging/Messaging_mms_getMessageServices.html +++ b/tct-messaging-mms-tizen-tests/messaging/Messaging_mms_getMessageServices.html @@ -40,7 +40,7 @@ setup({timeout: 90000}); var t = async_test("Messaging_mms_getMessageServices", {timeout: 90000}); t.step(function () { - var serviceSuccess, i, returnedValue; + var serviceSuccess, i, returnedValue = null; serviceSuccess = t.step_func(function (services) { assert_equals(returnedValue, undefined, "Incorrect returned value."); diff --git a/tct-messaging-mms-tizen-tests/messaging/Messaging_mms_getMessageServices_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/Messaging_mms_getMessageServices_with_errorCallback.html index a72d6e00a..33485575e 100644 --- a/tct-messaging-mms-tizen-tests/messaging/Messaging_mms_getMessageServices_with_errorCallback.html +++ b/tct-messaging-mms-tizen-tests/messaging/Messaging_mms_getMessageServices_with_errorCallback.html @@ -40,7 +40,7 @@ setup({timeout: 90000}); var t = async_test("Messaging_mms_getMessageServices_with_errorCallback", {timeout: 90000}); t.step(function () { - var serviceSuccess, serviceError, i, returnedValue; + var serviceSuccess, serviceError, i, returnedValue = null; serviceSuccess = t.step_func(function (services) { assert_equals(returnedValue, undefined, "Incorrect returned value.");