From: Junghyuk Park Date: Wed, 9 Oct 2013 09:31:18 +0000 (+0900) Subject: [Messaging] SMS : resend failed message X-Git-Tag: 2.2.1_release~95 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b85b11ba7639d20b4ea4d262bdb699f18af166c;p=test%2Ftct%2Fweb%2Fapi.git [Messaging] SMS : resend failed message Change-Id: Idb3d6b2bd6988a7483283a87f7e8f7d7ac09d739 --- diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationArraySuccessCallback_onsuccess_exist.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationArraySuccessCallback_onsuccess_exist.html index e54ef4b9e..4e19546e2 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationArraySuccessCallback_onsuccess_exist.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationArraySuccessCallback_onsuccess_exist.html @@ -94,7 +94,7 @@ t.step(function () { to: [ TEST_SMS_RECIPIENT ] }); - service.sendMessage(message, sendSuccess, sendError); + sendMessage(t, service, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversation_sendFindRemove.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversation_sendFindRemove.html index 4000d20c7..5a6ac0c4c 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversation_sendFindRemove.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversation_sendFindRemove.html @@ -54,7 +54,7 @@ var t = async_test(document.title, {timeout: 90000}), service, msg, messageStorage, filterConversation, filterMessage, removeConversationsSuccess, removeConversationsError, findMessageError, findConversationsSuccess, findConversationsError, findMessageSuccess, - sendSuccess, sendError, resendError, serviceSuccess, serviceError, + sendSuccess, sendError, serviceSuccess, serviceError, returnedValue = null; t.step(function () { @@ -92,15 +92,8 @@ t.step(function () { messageStorage.findMessages(filterMessage, findMessageSuccess, findMessageError); }); - resendError = t.step_func(function (error) { - assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); - }); - sendError = t.step_func(function (error) { - setTimeout( - t.step_func(function () { - service.sendMessage(msg, sendSuccess, resendError); - }, 10000)); + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); }); serviceSuccess = t.step_func(function (services) { @@ -108,7 +101,7 @@ t.step(function () { service = services[0]; messageStorage = service.messageStorage; msg = new tizen.Message("messaging.sms", { plainBody: "test1.", to: [ TEST_SMS_RECIPIENT ]}); - service.sendMessage(msg, sendSuccess, sendError); + sendMessage(t, service, msg, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html index c069f54c7..f092d3bd9 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html @@ -85,7 +85,7 @@ t.step(function () { listenerId = service.messageStorage.addConversationsChangeListener(listener, filter); message = new tizen.Message("messaging.sms", smsMessageInitDict); - service.sendMessage(message, null, sendError); + sendMessage(t, service, message, null, sendError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html index f28cce92d..0335e7389 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html @@ -82,7 +82,7 @@ t.step(function () { listenerId = service.messageStorage.addConversationsChangeListener(listener); message = new tizen.Message("messaging.sms", smsMessageInitDict); - service.sendMessage(message, null, sendError); + sendMessage(t, service, message, null, sendError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html index 95c2f4720..f2a970db3 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html @@ -82,7 +82,7 @@ t.step(function () { watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB); message = new tizen.Message("messaging.sms", smsMessageInitDict); - service.sendMessage(message, null, sendError); + sendMessage(t, service, message, null, sendError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html index 2553e4944..fe8cba201 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html @@ -90,7 +90,7 @@ t.step(function () { plainBody: generatePlainBody() }); - service.sendMessage(message2, null, sendError); + sendMessage(t, service, message2, null, sendError); }); removeAllSuccess = t.step_func(function () { @@ -99,7 +99,7 @@ t.step(function () { plainBody: generatePlainBody() }); - service.sendMessage(message1, sendSuccess, sendError); + sendMessage(t, service, message1, sendSuccess, sendError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html index f63a0490f..1e0a5a996 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html @@ -89,7 +89,7 @@ t.step(function () { plainBody: generatePlainBody() }); - service.sendMessage(message2, null, sendError); + sendMessage(t, service, message2, null, sendError); }); removeAllSuccess = t.step_func(function () { @@ -100,7 +100,7 @@ t.step(function () { plainBody: generatePlainBody() }); - service.sendMessage(message1, sendSuccess, sendError); + sendMessage(t, service, message1, sendSuccess, sendError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageService_loadBodySMS.html b/tct-messaging-sms-tizen-tests/messaging/MessageService_loadBodySMS.html index c38d65996..84334e2d1 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageService_loadBodySMS.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageService_loadBodySMS.html @@ -82,7 +82,7 @@ t.step(function () { to: [ TEST_SMS_RECIPIENT ] }); - service.sendMessage(message, sendSuccess, sendError); + sendMessage(t, service, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageService_sendMessage_valid_argument.html b/tct-messaging-sms-tizen-tests/messaging/MessageService_sendMessage_valid_argument.html index 00ef25634..5245d2722 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageService_sendMessage_valid_argument.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageService_sendMessage_valid_argument.html @@ -60,7 +60,7 @@ t.step(function () { plainBody: "Sms Message Test", to: [TEST_SMS_RECIPIENT] }); - service.sendMessage(smsMessage, sendSuccess, sendError); + sendMessage(t, service, smsMessage, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageService_sms_sendMessage.html b/tct-messaging-sms-tizen-tests/messaging/MessageService_sms_sendMessage.html index f435e3176..72718843e 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageService_sms_sendMessage.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageService_sms_sendMessage.html @@ -77,7 +77,7 @@ t.step(function () { to: [ TEST_SMS_RECIPIENT ] }); - service.sendMessage(message, sendSuccess, sendError); + sendMessage(t, service, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageService_sms_sendMessage_without_errorCallback.html b/tct-messaging-sms-tizen-tests/messaging/MessageService_sms_sendMessage_without_errorCallback.html index de1d19cbe..1507455ef 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageService_sms_sendMessage_without_errorCallback.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageService_sms_sendMessage_without_errorCallback.html @@ -39,12 +39,14 @@ setup({timeout: 90000}); var t = async_test(document.title, {timeout: 90000}), message, datetime, - sendSuccess, returnedValue = null, + sendSuccess, returnedValue = null, messageSent = false, resendMessage, service, serviceListSuccess, serviceListError; t.step(function () { sendSuccess = t.step_func(function (recipients) { + messageSent = true; + assert_type(recipients, "array", "recipients type is not array"); assert_equals(recipients.length, 1, "recipients.length should be 1"); assert_greater_than_equal(recipients[0].indexOf(TEST_SMS_RECIPIENT), 0, "recipient in sent message is not the same as" + @@ -55,6 +57,17 @@ t.step(function () { t.done(); }); + + resendMessage = t.step_func(function () { + returnedValue = service.sendMessage(message, sendSuccess); + + setTimeout(t.step_func(function(){ + if (messageSent === false) { + resendMessage(); + } + }), 10000); + }); + serviceListSuccess = t.step_func(function (services) { assert_true(services.length > 0, "No sms MessageService found."); service = services[0]; @@ -65,7 +78,7 @@ t.step(function () { to: [ TEST_SMS_RECIPIENT ] }); - returnedValue = service.sendMessage(message, sendSuccess); + resendMessage(); }); serviceListError = t.step_func(function (error) { 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 f1f395f95..0e7142a73 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html @@ -84,7 +84,7 @@ t.step(function () { listenerId = service.messageStorage.addConversationsChangeListener(listener); message = new tizen.Message("messaging.sms", smsMessageInitDict); - service.sendMessage(message, null, sendError); + sendMessage(t, service, message, null, sendError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMCLaddM.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMCLaddM.html index 74f6f410a..d7b2e2de3 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMCLaddM.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMCLaddM.html @@ -92,7 +92,7 @@ t.step(function () { plainBody: "test.", to: [TEST_SMS_RECIPIENT] }); - service.sendMessage(msg, null, sendError); + sendMessage(t, service, msg, null, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html index bc18cca1d..2ae468da7 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html @@ -89,7 +89,7 @@ t.step(function () { listenerId = messageStorage.addMessagesChangeListener(listener); assert_type(listenerId, "long" , "Incorrect returned value from addMessagesChangeListener method."); message = new tizen.Message("messaging.sms", {plainBody: "test.", to: [ TEST_SMS_RECIPIENT ]}); - service.sendMessage(message, null, sendError); + sendMessage(t, service, message, null, sendError); }); serviceError = t.step_func(function (error) { 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 1f216cc53..093e51cec 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_sms.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_sms.html @@ -85,7 +85,7 @@ t.step(function () { 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, sendSuccess, sendError); + sendMessage(t, service, msg, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_number.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_number.html index a00ca063b..7fc26c40b 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_number.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_number.html @@ -88,7 +88,7 @@ t.step(function () { plainBody: "[Test][findConversations] " + (new Date()).toString() }); - service.sendMessage(newMessage, sendSuccess, sendError); + sendMessage(t, service, newMessage, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withfilter.html index 95e7fc03a..1fabd6cf2 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withfilter.html @@ -89,7 +89,7 @@ t.step(function () { msg = new tizen.Message("messaging.sms", {plainBody: "test.", to: [ TEST_SMS_RECIPIENT_2 ] }); - service.sendMessage(msg, null, sendError); + sendMessage(t, service, msg, null, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html index 398bfe444..cd4e3e673 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html @@ -87,7 +87,7 @@ t.step(function () { listenerId = service.messageStorage.addMessagesChangeListener(listener); message = new tizen.Message("messaging.sms", {plainBody: "test.", to: [ TEST_SMS_RECIPIENT_2 ]}); - service.sendMessage(message, null, sendError); + sendMessage(t, service, message, null, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withfilter.html index 236380b7c..a04fd3bd2 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withfilter.html @@ -109,7 +109,7 @@ t.step(function () { msg = new tizen.Message("messaging.sms", { plainBody: "test.", to: [ TEST_SMS_RECIPIENT_2 ] }); - service.sendMessage(msg, sendSuccess, sendError); + sendMessage(t, service, msg, 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 index fbea28c8f..301c5cf9d 100644 --- a/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html +++ b/tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html @@ -108,7 +108,7 @@ t.step(function () { msg = new tizen.Message("messaging.sms", { plainBody: "test.", to: [ TEST_SMS_RECIPIENT_2] }); - service.sendMessage(msg, sendSuccess, sendError); + sendMessage(t, service, msg, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js old mode 100755 new mode 100644 index 0393f0624..5b45ab6e4 --- a/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js +++ b/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js @@ -33,6 +33,8 @@ var IO_ERR = 'IOError'; var UNKNOWN_ERR = 'UnknownError'; var EXCEPTION_TYPE = "name"; +var SMS_RESEND_LIMIT = 60; + var generatePlainBody = function () { var datetime = new Date().getTime(); var count = 0; @@ -106,6 +108,27 @@ function removeAllMessages(t, service, onSuccess) { }); } + +function sendMessage(t, service, msg, onSuccess, onError) { + var sendError, requestSending, resend=0; + + sendError = t.step_func(function (error) { + if (resend <= SMS_RESEND_LIMIT) { + setTimeout(requestSending, 1000); + } else { + onError(error); + } + }); + + requestSending = t.step_func(function () { + resend++; + service.sendMessage(msg, onSuccess, sendError); + }); + + requestSending(); +} + + // change TEST_SMS_RECIPIENT and TEST_SMS_RECIPIENT_2 document.write(''); document.write('');