From: Junghyuk Park Date: Fri, 27 Sep 2013 06:39:50 +0000 (+0900) Subject: [Messaging] Improved stability of mms and sms tests X-Git-Tag: 2.2.1_release~113 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=163a721abbb66ec5d29cfcd2417baa7e5c4a3cc2;p=test%2Ftct%2Fweb%2Fapi.git [Messaging] Improved stability of mms and sms tests Change-Id: I860e6debb7ab69e2bc086a4791109b0a83c6dfb6 --- diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html old mode 100644 new mode 100755 index 889e09c0d..2407b2b97 --- a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html @@ -37,86 +37,58 @@ Authors: //==== ONLOAD_DELAY 90 //==== TEST_CRITERIA CBOA setup({ timeout: 90000 }); -var t = async_test("MessageConversationsChangeCallback_mms_conversationsremoved", {timeout: 90000}), changeCallback, - serviceSuccess, serviceError, messageService, messageStorage, - currentDate = new Date(), subjectToSet = currentDate.getTime().toString(), - initDict = mmsMessageInitDict, message, - addSuccess, addError, messageFilter, - findMessageSuccess, findMessageError, foundMessage, conversationFilter, - findConversationSuccess, findConversationError, foundConversation, listenerId, - removeConversationError, returnedValue; +var t = async_test("MessageConversationsChangeCallback_mms_conversationsremoved", {timeout: 90000}), + serviceSuccess, serviceError, service, message, + removeAllSuccess, sendSuccess, sendError, conversationChangeCB, + removeConversationError, removedConversationId; t.step(function () { - //cleanup after TC - add_result_callback(function () { + add_result_callback(function (res) { try { - messageStorage.removeChangeListener(listenerId); + service.messageStorage.removeChangeListener(watcherId); } catch (err) { // do nothing in case removeChangeListener throw an exception } }); - changeCallback = { - conversationsadded: t.step_func(function (addedConversations) { - assert_unreached("conversationsadded invoked"); - }), - conversationsupdated: t.step_func(function (updatedConversations) { - assert_unreached("conversationsupdated invoked"); - }), - conversationsremoved: t.step_func(function (removedConversations) { - assert_type(removedConversations, "array", "Not an array."); - assert_equals(removedConversations.length, 1, "Incorrect length of conversations."); - t.done(); - }) - }; - removeConversationError = t.step_func(function (error) { assert_unreached("removeConversations() error callback: name:" + error.name + ", msg:" + error.message); }); - findConversationSuccess = t.step_func(function (conversations) { - assert_equals(conversations.length, 1, "Incorrect number of found conversations"); - foundConversation = conversations[0]; - - listenerId = messageStorage.addConversationsChangeListener(changeCallback); - returnedValue = messageStorage.removeConversations([foundConversation], null, removeConversationError); - assert_equals(returnedValue, undefined, "Incorrect returned value"); - }); - - findConversationError = t.step_func(function (error) { - assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message); - }); - - findMessageSuccess = t.step_func(function (messages) { - assert_equals(messages.length, 1, "Incorrect number of found messages"); - foundMessage = messages[0]; - - conversationFilter = new tizen.AttributeFilter("id", "EXACTLY", foundMessage.conversationId); - messageStorage.findConversations(conversationFilter, findConversationSuccess, findConversationError); - }); + conversationChangeCB = { + conversationsadded : t.step_func(function (conversations) { + assert_type(conversations, "array", "conversations"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for (var i in conversations) { + if (conversations[i].id === message.conversationId) { + removedConversationId = conversations[i].id; + service.messageStorage.removeConversations([conversations[i]], null, removeConversationError); + break; + } + } + }), + conversationsremoved : t.step_func(function (conversations) { + assert_type(conversations, "array", "conversations"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + t.done(); + }) + }; - findMessageError = t.step_func(function (error) { - assert_unreached("findMessages() 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); }); - addSuccess = t.step_func(function () { - messageFilter = new tizen.AttributeFilter("id", "EXACTLY", message.id); - messageStorage.findMessages(messageFilter, findMessageSuccess, findMessageError); - }); + removeAllSuccess = t.step_func(function () { + watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB); - addError = t.step_func(function (error) { - assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message); + message = new tizen.Message("messaging.mms", mmsMessageInitDict); + service.sendMessage(message, null, sendError); }); serviceSuccess = t.step_func(function (services) { assert_greater_than(services.length, 0, "Received empty services array"); - messageService = services[0]; - messageStorage = messageService.messageStorage; - - initDict.subject = subjectToSet; - message = new tizen.Message("messaging.mms", initDict); - messageService.messageStorage.addDraftMessage(message, addSuccess, addError); - + service = services[0]; + removeAllMessages(t, service, removeAllSuccess); }); serviceError = t.step_func(function (error) { @@ -125,7 +97,6 @@ t.step(function () { tizen.messaging.getMessageServices("messaging.mms", serviceSuccess, serviceError); }); - diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html old mode 100644 new mode 100755 index 77da8e97f..06667ac98 --- a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html @@ -37,62 +37,52 @@ Authors: //==== ONLOAD_DELAY 90 //==== TEST_CRITERIA CBT CBOA setup({ timeout: 90000 }); -var t = async_test("MessageConversationsChangeCallback_mms_conversationsupdated", {timeout: 90000}), changeCallback, - serviceSuccess, serviceError, messageService, messageStorage, listenerId, - currentDate = new Date(), subjectToSet = currentDate.getTime().toString(), - initDict = mmsMessageInitDict, sendMessage1st, sendMessage2nd, timestampBeforeChange, - sendSuccess1st, sendError1st, sendError2nd; -initDict.subject = subjectToSet; +var t = async_test("MessageConversationsChangeCallback_mms_conversationsupdated", {timeout: 90000}), + serviceSuccess, serviceError, service, message1, message2, + removeAllSuccess, sendSuccess, sendError, conversationChangeCB; t.step(function () { + add_result_callback(function (res) { + try { + service.messageStorage.removeChangeListener(watcherId); + } catch (err) { + // do nothing in case removeChangeListener throw an exception + } + }); - changeCallback = { - conversationsadded: t.step_func(function (addedConversations) { - assert_unreached("conversationsadded invoked"); - }), - conversationsupdated: t.step_func(function (updatedConversations) { - assert_equals(updatedConversations.length, 1, "Incorrect length of conversations."); - check_readonly(updatedConversations[0], "id", updatedConversations[0].id, "string", "dummyValue"); - check_readonly(updatedConversations[0], "type", "messaging.mms", "string", "dummyValue"); - assert_true(updatedConversations[0].timestamp instanceof Date, "Not a data"); - timestampBeforeChange = updatedConversations[0].timestamp.getTime(); - updatedConversations[0].timestamp = new Date(); - assert_equals(updatedConversations[0].timestamp.getTime(), timestampBeforeChange, "timestamp modified"); - check_readonly(updatedConversations[0], "messageCount", updatedConversations[0].messageCount, "number", 123); - check_readonly(updatedConversations[0], "unreadMessages", updatedConversations[0].unreadMessages, "number", 123); - check_readonly(updatedConversations[0], "preview", updatedConversations[0].preview, "string", "dummyValue"); - check_readonly(updatedConversations[0], "subject", subjectToSet, "string", "dummyValue"); - check_readonly(updatedConversations[0], "isRead", updatedConversations[0].isRead, "boolean", "dummyValue"); - check_readonly(updatedConversations[0], "lastMessageId", updatedConversations[0].lastMessageId, "string", "dummyValue"); - t.done(); - }), - conversationsremoved: t.step_func(function (removedConversations) { - assert_unreached("conversationsremoved invoked"); + conversationChangeCB = { + conversationsupdated : t.step_func(function (conversations) { + assert_type(conversations, "array", "conversations"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for (var i in conversations) { + if (conversations[i].id === message2.conversationId) { + t.done(); + break; + } + } }) }; - sendError2nd = t.step_func(function (error) { + sendError = t.step_func(function (error) { assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); }); - sendSuccess1st = t.step_func(function (recipients) { - listenerId = messageStorage.addConversationsChangeListener(changeCallback); + sendSuccess = t.step_func(function () { + watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB); - sendMessage2nd = new tizen.Message("messaging.mms", initDict); - messageService.sendMessage(sendMessage2nd, function (){}, sendError2nd); + message2 = new tizen.Message("messaging.mms", mmsMessageInitDict); + service.sendMessage(message2, null, sendError); }); - sendError1st = t.step_func(function (error) { - assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); + removeAllSuccess = t.step_func(function () { + message1 = new tizen.Message("messaging.mms", mmsMessageInitDict); + service.sendMessage(message1, sendSuccess, sendError); }); serviceSuccess = t.step_func(function (services) { - assert_true(services.length > 0, "Received empty services array"); - messageService = services[0]; - messageStorage = messageService.messageStorage; - - sendMessage1st = new tizen.Message("messaging.mms", initDict); - messageService.sendMessage(sendMessage1st, sendSuccess1st, sendError1st); + assert_greater_than(services.length, 0, "Received empty services array"); + service = services[0]; + removeAllMessages(t, service, removeAllSuccess); }); serviceError = t.step_func(function (error) { @@ -101,16 +91,6 @@ t.step(function () { tizen.messaging.getMessageServices("messaging.mms", serviceSuccess, serviceError); }); - -//cleanup after TC -add_result_callback(function () { - try { - messageStorage.removeChangeListener(listenerId); - } catch (err) { - // do nothing in case removeChangeListener throw an exception - } -}); - diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html old mode 100644 new mode 100755 index 5740e35db..e4a2de866 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html @@ -50,62 +50,55 @@ Authors: //==== TEST_CRITERIA CBOA setup({timeout: 90000}); var t = async_test("MessageConversationsChangeCallback_conversationsadded_withfilter", {timeout:90000}), -conversationChangeCB, removeSuccessCB, removeErrorCB, conversationsArrayCB, findErrorCB, -serviceListCB, serviceError, listenerFilter, msg, service, filter; + serviceSuccess, serviceError, service, message, filter, + removeAllSuccess, sendError, conversationChangeCB; t.step(function () { + + add_result_callback(function (res) { + try { + service.messageStorage.removeChangeListener(watcherId); + } catch (err) { + // do nothing in case removeChangeListener throw an exception + } + }); + conversationChangeCB = { - conversationsupdated : t.step_func(function (conversations) { - assert_unreached("should not in conversationsupdated: " + conversations.length); - }), conversationsadded : t.step_func(function (conversations) { - assert_true(conversations.length > 0, "No conversation added"); - t.done(); - }), - conversationsremoved : t.step_func(function (conversations) { - assert_unreached("should not in conversationsremoved: " + conversations.length); + assert_type(conversations, "array", "conversations"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for (var i in conversations) { + if (conversations[i].id === message.conversationId) { + t.done(); + break; + } + } }) }; - removeSuccessCB = t.step_func(function () { - //conversation deleted so add listener and send new message to trigger conversationsadded - listenerFilter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT_2); - service.messageStorage.addConversationsChangeListener(conversationChangeCB, filter); - msg = new tizen.Message("messaging.sms", {plainBody : "MessageConversationsChangeCallback test.",to : [ TEST_SMS_RECIPIENT_2 ]}); - // Send request - service.sendMessage(msg); + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); }); - removeErrorCB = t.step_func(function (error) { - assert_unreached("removeConversations() error callback: name:" + error.name + ", msg:" + error.message); - }); - - conversationsArrayCB = t.step_func(function (conversations) { - if (conversations.length === 0) { - removeSuccessCB(); - } else { - //conversation exists so delete it first - service.messageStorage.removeConversations(conversations, removeSuccessCB, removeErrorCB); - } - }); + removeAllSuccess = t.step_func(function () { + filter = new tizen.AttributeFilter("to", "CONTAINS", smsMessageInitDict.to[0]); + watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB, filter); - findErrorCB = t.step_func(function (error) { - assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message); + message = new tizen.Message("messaging.sms", smsMessageInitDict); + service.sendMessage(message, null, sendError); }); - serviceListCB = t.step_func(function (services) { - assert_true(services.length > 0, "No message service found"); + serviceSuccess = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); service = services[0]; - // precondition - find and remove conversation if already exists - filter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT_2); - service.messageStorage.findConversations(filter, conversationsArrayCB, findErrorCB); + removeAllMessages(t, service, removeAllSuccess); }); serviceError = t.step_func(function (error) { assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); }); - tizen.messaging.getMessageServices("messaging.sms", serviceListCB, serviceError); + tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError); }); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html old mode 100644 new mode 100755 index 7a733a41c..daa9b61f2 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html @@ -50,62 +50,52 @@ Authors: //==== TEST_CRITERIA CBOA setup({timeout: 90000}); var t = async_test("MessageConversationsChangeCallback_conversationsadded_withoutfilter", {timeout:90000}), -conversationChangeCB, messagesRemoved, messageRemovalFailure, findSuccessCB, findErrorCB, -serviceListCB, serviceError, service, filter; + serviceSuccess, serviceError, service, message, removeAllSuccess, sendError, conversationChangeCB; t.step(function () { + add_result_callback(function (res) { + try { + service.messageStorage.removeChangeListener(watcherId); + } catch (err) { + // do nothing in case removeChangeListener throw an exception + } + }); + conversationChangeCB = { - conversationsupdated : t.step_func(function (conversations) { - assert_unreached("should not in conversationsupdated: " + conversations.length); - }), conversationsadded : t.step_func(function (conversations) { - assert_true(conversations.length > 0, "No conversation added"); - t.done(); - }), - conversationsremoved : t.step_func(function (conversations) { - assert_unreached("should not in conversationsremoved: " + conversations.length); + assert_type(conversations, "array", "conversations"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for (var i in conversations) { + if (conversations[i].id === message.conversationId) { + t.done(); + break; + } + } }) }; - messagesRemoved = t.step_func(function () { - service.messageStorage.addConversationsChangeListener(conversationChangeCB); - var msg = new tizen.Message("messaging.sms", { plainBody : "MessageConversationsChangeCallback test.", to : [ TEST_SMS_RECIPIENT_2 ] }); - // Send request - service.sendMessage(msg); - }); - - messageRemovalFailure = t.step_func(function (error) { - assert_unreached("removeMessages() 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); }); - findSuccessCB = t.step_func(function (messages) { - // Remove all found message to be sure that newly sent message - // will create new conversation - if(messages.length > 0) { - service.messageStorage.removeMessages(messages, messagesRemoved, messageRemovalFailure); - } - else { - messagesRemoved(); - } - }); + removeAllSuccess = t.step_func(function () { + watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB); - findErrorCB = t.step_func(function (error) { - assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message); + message = new tizen.Message("messaging.sms", smsMessageInitDict); + service.sendMessage(message, null, sendError); }); - serviceListCB = t.step_func(function (services) { - assert_true(services.length > 0, "No message service found"); + serviceSuccess = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); service = services[0]; - // precondition - find and remove conversation if already exists - filter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT_2); - service.messageStorage.findMessages(filter, findSuccessCB, findErrorCB); + removeAllMessages(t, service, removeAllSuccess); }); serviceError = t.step_func(function (error) { assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); }); - tizen.messaging.getMessageServices("messaging.sms", serviceListCB, serviceError); + tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError); }); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html new file mode 100755 index 000000000..5a545fb72 --- /dev/null +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html @@ -0,0 +1,102 @@ + + + + +MessageConversationsChangeCallback_conversationsremoved_withfilter + + + + + + +
+ + + diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html new file mode 100755 index 000000000..3b06a773a --- /dev/null +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html @@ -0,0 +1,102 @@ + + + + +MessageConversationsChangeCallback_conversationsremoved_withoutfilter + + + + + + +
+ + + diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html old mode 100644 new mode 100755 index 3e5246b06..c2e8706e5 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html @@ -52,50 +52,61 @@ Authors: // Check the conversationupdated method when some message updated with argument filter setup({timeout:90000}); var t = async_test("MessageConversationsChangeCallback_conversationsupdated_withfilter", {timeout: 90000}), - service, messageStorage, conversationChangeCB, filter, addSuccess, add2Success, serviceListCB, watchId; + serviceSuccess, serviceError, service, message1, message2, removeAllSuccess, + filter, sendSuccess, sendError, conversationChangeCB; -t.step(function () { //cleanup after TC - add_result_callback(function () { +t.step(function () { + + add_result_callback(function (res) { try { - messageStorage.removeChangeListener(watchId); + service.messageStorage.removeChangeListener(watcherId); } catch (err) { // do nothing in case removeChangeListener throw an exception } }); conversationChangeCB = { - conversationsupdated: t.step_func(function (conversations) { - assert_true(conversations.length > 0, "conversations updated!"); - t.done(); - }), - conversationsadded: t.step_func(function (conversations) { - assert_unreached("should not in conversationsadded: " + conversations.length); - }), - conversationsremoved: t.step_func(function (conversations) { - assert_unreached("should not in conversationsremoved: " + conversations.length); + conversationsupdated : t.step_func(function (conversations) { + assert_type(conversations, "array", "conversations"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for (var i in conversations) { + if (conversations[i].id === message2.conversationId) { + t.done(); + break; + } + } }) }; - add2Success = t.step_func(function () { + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); + }); + + sendSuccess = t.step_func(function () { + filter = new tizen.AttributeFilter("to", "CONTAINS", smsMessageInitDict.to[0]); + watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB, filter); + + message2 = new tizen.Message("messaging.sms", smsMessageInitDict); + service.sendMessage(message2, null, sendError); }); - addSuccess = t.step_func(function () { - filter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.sms"); - watchId = messageStorage.addConversationsChangeListener(conversationChangeCB, filter); - //add next draft message to conversation and trigger conversationsupdated - addSMSDraft(t, service, smsMessageInitDict, add2Success); + removeAllSuccess = t.step_func(function () { + message1 = new tizen.Message("messaging.sms", smsMessageInitDict); + service.sendMessage(message1, sendSuccess, sendError); }); - serviceListCB = t.step_func(function (services) { - assert_true(services.length > 0, "Received empty services array"); + serviceSuccess = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); service = services[0]; - messageStorage = service.messageStorage; - addSMSDraft(t, service, smsMessageInitDict, addSuccess); + removeAllMessages(t, service, removeAllSuccess); }); - tizen.messaging.getMessageServices("messaging.sms", serviceListCB); -}); + serviceError = t.step_func(function (error) { + assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); + }); + tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError); +}); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html old mode 100644 new mode 100755 index 700bbd84c..283106e6c --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html @@ -52,50 +52,60 @@ Authors: // Check the conversationupdated method when no message updated setup({timeout:90000}); var t = async_test("MessageConversationsChangeCallback_conversationsupdated_withoutfilter", {timeout: 90000}), - service, messageStorage, conversationChangeCB, addSuccess, add2Success, serviceListCB, watchId; + serviceSuccess, serviceError, service, message1, message2, + removeAllSuccess, sendSuccess, sendError, conversationChangeCB; t.step(function () { - //cleanup after TC - add_result_callback(function () { + + add_result_callback(function (res) { try { - messageStorage.removeChangeListener(watchId); + service.messageStorage.removeChangeListener(watcherId); } catch (err) { // do nothing in case removeChangeListener throw an exception } }); conversationChangeCB = { - conversationsupdated: t.step_func(function (conversations) { - assert_true(conversations.length > 0, "conversations updated!"); - t.done(); - }), - conversationsadded: t.step_func(function (conversations) { - assert_unreached("should not in conversationsadded: " + conversations.length); - }), - conversationsremoved: t.step_func(function (conversations) { - assert_unreached("should not in conversationsremoved: " + conversations.length); + conversationsupdated : t.step_func(function (conversations) { + assert_type(conversations, "array", "conversations"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for (var i in conversations) { + if (conversations[i].id === message2.conversationId) { + t.done(); + break; + } + } }) }; - add2Success = t.step_func(function () { + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); + }); + + sendSuccess = t.step_func(function () { + watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB); + + message2 = new tizen.Message("messaging.sms", smsMessageInitDict); + service.sendMessage(message2, null, sendError); }); - addSuccess = t.step_func(function () { - watchId = messageStorage.addConversationsChangeListener(conversationChangeCB); - //add next draft message to conversation and trigger conversationsupdated - addSMSDraft(t, service, smsMessageInitDict, add2Success); + removeAllSuccess = t.step_func(function () { + message1 = new tizen.Message("messaging.sms", smsMessageInitDict); + service.sendMessage(message1, sendSuccess, sendError); }); - serviceListCB = t.step_func(function (services) { - assert_true(services.length > 0, "Received empty services array"); + serviceSuccess = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); service = services[0]; - messageStorage = service.messageStorage; - addSMSDraft(t, service, smsMessageInitDict, addSuccess); + removeAllMessages(t, service, removeAllSuccess); }); - tizen.messaging.getMessageServices("messaging.sms", serviceListCB); -}); + serviceError = t.step_func(function (error) { + assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); + }); + tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError); +}); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html deleted file mode 100644 index 706bf1707..000000000 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - -MessageConversationsChangeCallback_sms_conversationsremoved - - - - - - -
- - - diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html deleted file mode 100644 index 7f83fb374..000000000 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - -MessageConversationsChangeCallback_sms_conversationsupdated - - - - - - -
- - - diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html old mode 100644 new mode 100755 index 85465bf56..e602a02b7 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html @@ -52,47 +52,53 @@ Authors: setup({timeout: 90000}); var t = async_test("MessageStorage_addConversationsChangeListener_withoutfilter", {timeout: 90000}), - service, msg, conversationChangeCB, serviceListCB, watchId, messageStorage; + serviceSuccess, serviceError, service, message, removeAllSuccess, sendError, conversationChangeCB; t.step(function () { + add_result_callback(function (res) { + try { + service.messageStorage.removeChangeListener(watcherId); + } catch (err) { + // do nothing in case removeChangeListener throw an exception + } + }); + conversationChangeCB = { - conversationsadded: t.step_func(function (conversations) { - assert_greater_than(conversations.length, 0, "Received empty add conversations array"); - t.done(); - }), - conversationsupdated: t.step_func(function (conversations) { - assert_greater_than(conversations.length, 0, "Received empty update conversations array"); - t.done(); - }), - conversationsremoved: t.step_func(function (conversations) { - assert_unreached("conversations removed: " + conversations.length); + conversationsadded : t.step_func(function (conversations) { + assert_type(conversations, "array", "conversations"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for (var i in conversations) { + if (conversations[i].id === message.conversationId) { + t.done(); + break; + } + } }) }; - serviceListCB = t.step_func(function (services) { + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); + }); + + removeAllSuccess = t.step_func(function () { + watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB); + + message = new tizen.Message("messaging.sms", smsMessageInitDict); + service.sendMessage(message, null, sendError); + }); + + serviceSuccess = t.step_func(function (services) { assert_greater_than(services.length, 0, "Received empty services array"); service = services[0]; - messageStorage = service.messageStorage; - watchId = service.messageStorage.addConversationsChangeListener(conversationChangeCB); - msg = new tizen.Message("messaging.sms", { - plainBody: "test.", - to: [TEST_SMS_RECIPIENT] - }); - service.messageStorage.addDraftMessage(msg); + removeAllMessages(t, service, removeAllSuccess); }); - tizen.messaging.getMessageServices("messaging.sms", serviceListCB); -}); + serviceError = t.step_func(function (error) { + assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); + }); -//cleanup after TC -add_result_callback(function () { - try { - messageStorage.removeChangeListener(watchId); - } catch (err) { - // do nothing in case removeChangeListener throw an exception - } + tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError); }); - diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withfilter.html old mode 100644 new mode 100755 index f24b7e44e..c7d040fa6 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withfilter.html @@ -58,16 +58,16 @@ var t = async_test("MessageStorage_addMessagesChangeListener_withfilter", {timeo t.step(function (){ messageChangeCallback = { - messagesupdated : t.step_func(function (messages) { - assert_unreached("messages updated invoked."); - }), messagesadded : t.step_func(function (messages) { - assert_type(messages, "array", "Not an array"); - assert_equals(messages.length, 1, "Incorrect number of messages."); - t.done(); - }), - messagesremoved : t.step_func(function (messages) { - assert_unreached("messages removed invoked."); + assert_type(messages, "array", "Not an array."); + assert_greater_than(messages.length, 0, "Received empty messages array"); + for (var i in messages) { + assert_true(messages[i] instanceof tizen.Message, "Not a message."); + if (messages[i].id === message.id) { + t.done(); + break; + } + } }) }; diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html old mode 100644 new mode 100755 index 0114d5a36..fdf4ee377 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html @@ -55,21 +55,26 @@ var t = async_test("MessageStorage_addMessagesChangeListener_withoutfilter", {ti service, listenerId, serviceListCB, message, messageStorage, messageChangeCallback, serviceError; t.step(function () { + //cleanup after TC + add_result_callback(function () { + try { + messageStorage.removeChangeListener(listenerId); + } catch (err) { + // do nothing in case removeChangeListener throw an exception + } + }); + messageChangeCallback = { - messagesupdated : t.step_func(function (messages) { - assert_unreached("messages updated invoked."); - }), messagesadded : t.step_func(function (messages) { - try { - assert_type(messages, "array", "Not an array"); - assert_equals(messages.length, 1, "Incorrect number of messages."); - } finally { - messageStorage.removeChangeListener(listenerId); + assert_type(messages, "array", "Not an array."); + assert_greater_than(messages.length, 0, "Received empty messages array"); + for (var i in messages) { + assert_true(messages[i] instanceof tizen.Message, "Not a message."); + if (messages[i].id === message.id) { + t.done(); + break; + } } - t.done(); - }), - messagesremoved : t.step_func(function (messages) { - assert_unreached("messages removed invoked."); }) }; diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html old mode 100644 new mode 100755 index 922d69fd3..18e5d5bd8 --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html @@ -51,7 +51,7 @@ Authors: setup({timeout:90000}); var t = async_test("MessagesChangeCallback_messagesadded_withoutfilter", {timeout:90000}), - serviceError, serviceSuccess, sendSuccess, sendError, msg, messageChangeCB, service, watcherId; + serviceError, serviceSuccess, sendSuccess, sendError, message, messageChangeCB, service, watcherId; t.step(function () { @@ -64,15 +64,16 @@ t.step(function () { }); messageChangeCB = { - messagesadded: t.step_func(function (msgs) { - assert_true(msgs.length > 0, "messages added!"); - t.done(); - }), - messagesupdated: t.step_func(function (msgs) { - assert_unreached("should not in messagesupdated"); - }), - messagesremoved: t.step_func(function (msgs) { - assert_unreached("should not in messagesremoved"); + messagesadded: t.step_func(function (addedMessages) { + assert_type(addedMessages, "array", "Not an array."); + assert_greater_than(addedMessages.length, 0, "Received empty messages array"); + for (var i in addedMessages) { + assert_true(addedMessages[i] instanceof tizen.Message, "Not a message."); + if (addedMessages[i].id === message.id) { + t.done(); + break; + } + } }) }; @@ -86,9 +87,9 @@ t.step(function () { // registers to be notified when the storage changes service = services[0]; watcherId = service.messageStorage.addMessagesChangeListener(messageChangeCB); - msg = new tizen.Message("messaging.sms", + message = new tizen.Message("messaging.sms", {plainBody : "test.",to : [ TEST_SMS_RECIPIENT_2 ]}); - service.sendMessage(msg, sendSuccess, sendError); + service.sendMessage(message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html old mode 100644 new mode 100755 index c98f9f41e..3b8cf256d --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html @@ -65,9 +65,16 @@ t.step(function () { }); messageChangeCB = { - messagesupdated: t.step_func(function (messages) { - assert_greater_than(messages.length, 0, "No messages updated!"); - t.done(); + messagesupdated: t.step_func(function (updatedMessages) { + assert_type(updatedMessages, "array", "Not an array."); + assert_greater_than(updatedMessages.length, 0, "Received empty messages array"); + for (var i in updatedMessages) { + assert_true(updatedMessages[i] instanceof tizen.Message, "Not a message."); + if (updatedMessages[i].id === msg.id) { + t.done(); + break; + } + } }) }; diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesadded_without_filter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesadded_without_filter.html old mode 100644 new mode 100755 index 2ee50256b..ca2379b8d --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesadded_without_filter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesadded_without_filter.html @@ -65,15 +65,14 @@ t.step(function () { changeCallback = { messagesadded: t.step_func(function (addedMessages) { assert_type(addedMessages, "array", "Not an array."); - assert_equals(addedMessages.length, 1, "Received incorrect number of messages: " + addedMessages.length); - assert_true(addedMessages[0] instanceof tizen.Message, "Not a message."); - messageService.loadMessageBody(addedMessages[0], loadSuccess, loadError); - }), - messagesupdated: t.step_func(function (updatedMessages) { - assert_unreached("memssagesupdated callback invoked."); - }), - messagesremoved: t.step_func(function (removedMessages) { - assert_unreached("messagesremoved callback invoked."); + assert_greater_than(addedMessages.length, 0, "Received empty messages array"); + for (var i in addedMessages) { + assert_true(addedMessages[i] instanceof tizen.Message, "Not a message."); + if (addedMessages[i].id === message.id) { + messageService.loadMessageBody(addedMessages[i], loadSuccess, loadError); + break; + } + } }) }; diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesremoved_without_filter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesremoved_without_filter.html old mode 100644 new mode 100755 index 625c93d47..26a414039 --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesremoved_without_filter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesremoved_without_filter.html @@ -53,18 +53,17 @@ t.step(function () { }); changeCallback = { - messagesadded: t.step_func(function (addedMessages) { - assert_unreached("messagesadded callback invoked."); - }), - messagesupdated: t.step_func(function (updatedMessages) { - assert_unreached("messagesupdated callback invoked."); - }), messagesremoved: t.step_func(function (removedMessages) { assert_type(removedMessages, "array", "Not an array."); - assert_equals(removedMessages.length, 1, "Received incorrect number of messages: " + removedMessages.length); - assert_true(removedMessages[0] instanceof tizen.Message, "Not a message."); - assert_equals(removedMessages[0].id, message.id, "Invalid message given to callback"); - t.done(); + assert_greater_than(removedMessages.length, 0, "Received empty messages array"); + + for (var i in removedMessages) { + assert_true(removedMessages[i] instanceof tizen.Message, "Not a message."); + if (removedMessages[i].id === message.id) { + t.done(); + break; + } + } }) }; diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesupdated_without_filter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesupdated_without_filter.html old mode 100644 new mode 100755 index 840728636..176e1b9a9 --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesupdated_without_filter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesupdated_without_filter.html @@ -63,17 +63,17 @@ t.step(function () { }); changeCallback = { - messagesadded: t.step_func(function (addedMessages) { - assert_unreached("messagesadded callback invoked."); - }), messagesupdated: t.step_func(function (updatedMessages) { assert_type(updatedMessages, "array", "Not an array."); - assert_equals(updatedMessages.length, 1, "Received incorrect number of messages: " + updatedMessages.length); - assert_true(updatedMessages[0] instanceof tizen.Message, "Not a message."); - messageService.loadMessageBody(updatedMessages[0], loadSuccess, loadError); - }), - messagesremoved: t.step_func(function (removedMessages) { - assert_unreached("messagesremoved callback invoked."); + assert_greater_than(updatedMessages.length, 0, "Received empty messages array"); + + for (var i in updatedMessages) { + assert_true(updatedMessages[i] instanceof tizen.Message, "Not a message."); + if (updatedMessages[i].id === message.id) { + messageService.loadMessageBody(updatedMessages[i], loadSuccess, loadError); + break; + } + } }) }; diff --git a/tct-messaging-sms-tizen-tests/tests.full.xml b/tct-messaging-sms-tizen-tests/tests.full.xml old mode 100644 new mode 100755 index d1f179570..dbf66e63e --- a/tct-messaging-sms-tizen-tests/tests.full.xml +++ b/tct-messaging-sms-tizen-tests/tests.full.xml @@ -162,9 +162,9 @@ - + - /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html + /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html @@ -174,9 +174,9 @@ - + - /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html + /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html diff --git a/tct-messaging-sms-tizen-tests/tests.xml b/tct-messaging-sms-tizen-tests/tests.xml old mode 100644 new mode 100755 index 07507dd17..99c3a4146 --- a/tct-messaging-sms-tizen-tests/tests.xml +++ b/tct-messaging-sms-tizen-tests/tests.xml @@ -71,14 +71,14 @@ /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html - + - /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html + /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html - + - /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html + /opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html