From: Andrzej Krolikowski Date: Fri, 20 Sep 2013 12:33:42 +0000 (+0200) Subject: [Messaging-sms] clean up - part 2 X-Git-Tag: 2.2.1_release~114^2~40 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef07ee43acd03bdf314f803b5d4fd37cbe6b0955;p=test%2Ftct%2Fweb%2Fapi.git [Messaging-sms] clean up - part 2 Change-Id: I55f7052cdb497aa4bd832260483e3d46181e9ed1 --- diff --git a/tct-messaging-sms-tizen-tests/messaging/ConversationArraySuccessCallback_onsuccess_checking.html b/tct-messaging-sms-tizen-tests/messaging/ConversationArraySuccessCallback_onsuccess_checking.html index 9e7183b06..c520622e6 100644 --- a/tct-messaging-sms-tizen-tests/messaging/ConversationArraySuccessCallback_onsuccess_checking.html +++ b/tct-messaging-sms-tizen-tests/messaging/ConversationArraySuccessCallback_onsuccess_checking.html @@ -43,14 +43,12 @@ Authors:

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageService_id_exist.html b/tct-messaging-sms-tizen-tests/messaging/MessageService_id_exist.html index 96e54e860..2c800fe77 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageService_id_exist.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageService_id_exist.html @@ -54,6 +54,7 @@ var t = async_test("MessageService_id_exist", {timeout: 90000}), serviceSuccess, t.step(function () { serviceSuccess = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); assert_true("id" in services[0], "Messaging.MessageService.id property exists"); t.done(); }); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageService_loadBodySMS.html b/tct-messaging-sms-tizen-tests/messaging/MessageService_loadBodySMS.html index 73472e25e..cf4d4eb1e 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageService_loadBodySMS.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageService_loadBodySMS.html @@ -39,6 +39,7 @@ Authors: +

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageService_type_exist.html b/tct-messaging-sms-tizen-tests/messaging/MessageService_type_exist.html index 9d352d286..849418a21 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageService_type_exist.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageService_type_exist.html @@ -38,6 +38,7 @@ Authors: +

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addCCLAddMRemoveCRemoveCCL.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addCCLAddMRemoveCRemoveCCL.html index b6c0228c5..4dcbf6a9d 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addCCLAddMRemoveCRemoveCCL.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addCCLAddMRemoveCRemoveCCL.html @@ -91,7 +91,7 @@ t.step(function () { }); successRemoveConCallback = t.step_func(function () { - return t.done(); + t.done(); }); conversationsFindConArrayCB = t.step_func(function (conversations) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html index 8fb3857d9..85465bf56 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html @@ -38,6 +38,7 @@ Authors: +

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_findMessages.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_findMessages.html index cb25c4767..d1c893669 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_findMessages.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_findMessages.html @@ -38,6 +38,7 @@ Authors: +

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_findMessages_exist.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_findMessages_exist.html index 169b5b3ea..1effbc038 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_findMessages_exist.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_findMessages_exist.html @@ -38,6 +38,7 @@ Authors: +

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_exist.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_exist.html index 21d319ec7..d00d856af 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_exist.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_exist.html @@ -38,6 +38,7 @@ Authors: +

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_forconversations.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_forconversations.html index baa117db8..1ae2fbb50 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_forconversations.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_forconversations.html @@ -38,6 +38,7 @@ Authors: +

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_forfolder.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_forfolder.html index 6a046656c..2eb25fda8 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_forfolder.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_forfolder.html @@ -49,12 +49,10 @@ Authors: //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeChangeListener M //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html //==== TEST_CRITERIA MMINA - -// Check removeChangeListener method with removing folders listener setup({timeout: 90000}); var t = async_test("MessageStorage_removeChangeListener_forfolder", {timeout: 90000}), - watchId, folderChangeCB, serviceListCB; + watchId, folderChangeCB, serviceListCB, serviceError; t.step(function () { folderChangeCB = { @@ -67,13 +65,17 @@ t.step(function () { }; serviceListCB = t.step_func(function (services) { - assert_true(services.length > 0, "No message services."); + assert_greater_than(services.length, 0, "Received empty services array"); watchId = services[0].messageStorage.addFoldersChangeListener(folderChangeCB); services[0].messageStorage.removeChangeListener(watchId); t.done(); }); - 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", serviceListCB, serviceError); }); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_formessages.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_formessages.html index 5e2cb2b6c..34bba6ffe 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_formessages.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_formessages.html @@ -48,12 +48,10 @@ Authors: //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeChangeListener M //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html //==== TEST_CRITERIA MMINA - -// Check removeChangeListener method with removing messages listener setup({timeout: 90000}); var t = async_test("MessageStorage_removeChangeListener_formessages", {timeout: 90000}), - watchId, messageChangeCB, serviceListCB; + watchId, messageChangeCB, serviceListCB, serviceError; t.step(function () { messageChangeCB = { @@ -72,7 +70,11 @@ t.step(function () { t.done(); }); - 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", serviceListCB, serviceError); }); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_valid_argument.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_valid_argument.html index e9c3d3166..a8535a6ac 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_valid_argument.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeChangeListener_valid_argument.html @@ -47,15 +47,13 @@ Authors: //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeChangeListener M //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html //==== TEST_CRITERIA MMINA - -// check the function of removeChangeListener in MessageStore setup({timeout: 90000}); -var t =async_test("MessageStorage_removeChangeListener_valid_argument", {timeout: 90000}); -var watchId, service, serviceListCB; +var t = async_test("MessageStorage_removeChangeListener_valid_argument", {timeout: 90000}), + watchId, service, serviceListCB, serviceError, folderChangeCB; t.step(function () { - var folderChangeCB = { + folderChangeCB = { foldersadded: function (folders) { }, foldersupdated: function (folders) { @@ -65,13 +63,18 @@ t.step(function () { }; serviceListCB = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); service = services[0]; watchId = service.messageStorage.addFoldersChangeListener(folderChangeCB); service.messageStorage.removeChangeListener(watchId); - return t.done(); + t.done(); + }); + + serviceError = t.step_func(function (error) { + assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); }); - tizen.messaging.getMessageServices("messaging.sms", serviceListCB); + tizen.messaging.getMessageServices("messaging.sms", serviceListCB, serviceError); }); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_sms.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_sms.html index c99000553..d524cc0cc 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_sms.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_sms.html @@ -49,43 +49,47 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html //==== ONLOAD_DELAY 90 //==== TEST_CRITERIA MOA - setup({timeout: 90000}); - var t =async_test("MessageStorage_removeConversations_sms", {timeout: 90000}); - var service, msg, filter, successCallback, errorCallback, conversationsArrayCB, queryErrorCB, messageSent, serviceListCB; - - t.step(function () { - successCallback = t.step_func(function () { - return t.done(); - }); - - errorCallback = t.step_func(function (error) { - assert_true(false, error.message); - t.done(); - }); - - conversationsArrayCB = t.step_func(function (conversations) { - assert_true(conversations.length > 0, "find conversation"); - service.messageStorage.removeConversations(conversations, successCallback, errorCallback); - }); - - queryErrorCB = t.step_func(function (error) { - assert_true(false, "Cannot query conversations" + error.message); - t.done(); - }); - - messageSent = t.step_func(function (recipients) { - filter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.sms"); - service.messageStorage.findConversations(filter, conversationsArrayCB, queryErrorCB); - }); - - serviceListCB = t.step_func(function (services) { - service = services[0]; - msg = new tizen.Message("messaging.sms", {plainBody: "test.", to: [TEST_SMS_RECIPIENT]}); - service.sendMessage(msg, messageSent); - }); - - tizen.messaging.getMessageServices("messaging.sms", serviceListCB); - }); +setup({timeout: 90000}); +var t = async_test("MessageStorage_removeConversations_sms", {timeout: 90000}), + service, msg, filter, successCallback, errorCallback, conversationsArrayCB, queryErrorCB, + messageSent, serviceListCB, serviceError; + +t.step(function () { + successCallback = t.step_func(function () { + t.done(); + }); + + errorCallback = t.step_func(function (error) { + assert_unreached("removeConversations() error callback: name:" + error.name + ", msg:" + error.message); + }); + + conversationsArrayCB = t.step_func(function (conversations) { + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + service.messageStorage.removeConversations(conversations, successCallback, errorCallback); + }); + + queryErrorCB = t.step_func(function (error) { + assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message); + }); + + messageSent = t.step_func(function (recipients) { + filter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.sms"); + service.messageStorage.findConversations(filter, conversationsArrayCB, queryErrorCB); + }); + + serviceListCB = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); + service = services[0]; + msg = new tizen.Message("messaging.sms", {plainBody: "test.", to: [TEST_SMS_RECIPIENT]}); + service.sendMessage(msg, messageSent); + }); + + serviceError = t.step_func(function (error) { + assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); + }); + + tizen.messaging.getMessageServices("messaging.sms", serviceListCB, serviceError); +}); diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html index 9bc661a29..c98f9f41e 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html @@ -66,7 +66,7 @@ t.step(function () { messageChangeCB = { messagesupdated: t.step_func(function (messages) { - assert_true(messages.length > 0, "No messages updated!"); + assert_greater_than(messages.length, 0, "No messages updated!"); t.done(); }) }; @@ -78,7 +78,7 @@ t.step(function () { }); messageSuccess = t.step_func(function (messages) { - assert_true(messages.length > 0, "No messages found."); + assert_greater_than(messages.length, 0, "No messages found."); messages[0].isRead = !messages[0].isRead; service.messageStorage.updateMessages(messages, updateSuccess, updateError); }); @@ -98,7 +98,7 @@ t.step(function () { }); serviceSuccess = t.step_func(function (services) { - assert_true(services.length > 0, "No MessageService found"); + assert_greater_than(services.length, 0, "Received empty services array"); service = services[0]; msg = new tizen.Message("messaging.sms", { plainBody : "test.", to : [ TEST_SMS_RECIPIENT_2] });