From: Junghyuk Park Date: Wed, 9 Oct 2013 08:47:46 +0000 (+0900) Subject: [Messaging] MMS : resend failed message X-Git-Tag: 2.2.1_release~97 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9259df2e62b81a2955e3895af7c59b84c93a2820;p=test%2Ftct%2Fweb%2Fapi.git [Messaging] MMS : resend failed message Change-Id: I9095de6de75b6220901a8d18427506b5851112f8 --- diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html index 8a673695b..71f461c4c 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html @@ -82,7 +82,7 @@ t.step(function () { listenerId = service.messageStorage.addConversationsChangeListener(conversationChangeCB); message = new tizen.Message("messaging.mms", mmsMessageInitDict); - service.sendMessage(message, null, sendError); + sendMessage(t, service, message, null, sendError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html index fa630a179..4f7434ed2 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html @@ -76,7 +76,7 @@ t.step(function () { plainBody: "sample plainBody" }); - service.sendMessage(message2, null, sendError); + sendMessage(t, service, message2, null, sendError); }); removeAllSuccess = t.step_func(function () { @@ -86,7 +86,7 @@ t.step(function () { plainBody: "sample plainBody" }); - service.sendMessage(message1, sendSuccess, sendError); + sendMessage(t, service, message1, sendSuccess, sendError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_from_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_from_valid.html index 01b581acb..5a253d3f1 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_from_valid.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_from_valid.html @@ -71,7 +71,7 @@ t.step(function () { filter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT); msg = new tizen.Message("messaging.mms", mmsMessageInitDict); - mmsService.sendMessage(msg, sendSuccess, sendError); + sendMessage(t, mmsService, msg, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { 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 f30e7b470..f3239df20 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 @@ -81,7 +81,7 @@ t.step(function () { mmsService = services[0]; msg = new tizen.Message("messaging.mms", mmsMessageInitDict); - mmsService.sendMessage(msg, sendSuccess, sendError); + sendMessage(t, mmsService, msg, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addConversationsChangeListener_conversationsChangeCallback_TypeMismatch.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addConversationsChangeListener_conversationsChangeCallback_TypeMismatch.html old mode 100755 new mode 100644 diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html index 10fd4deae..8fd22e741 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html @@ -75,7 +75,7 @@ t.step(function () { service = services[0]; message = new tizen.Message("messaging.mms", mmsMessageInitDict); - service.sendMessage(message, sendSuccess, sendError); + sendMessage(t, service, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html index d0b227413..84ffaea12 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html @@ -75,7 +75,7 @@ t.step(function () { service = services[0]; message = new tizen.Message("messaging.mms", mmsMessageInitDict); - service.sendMessage(message, sendSuccess, sendError); + sendMessage(t, service, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html index fc1402fb4..be6484ee3 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html @@ -82,7 +82,7 @@ t.step(function () { endDate.setHours(endDate.getHours() + 1); message = new tizen.Message("messaging.mms", mmsMessageInitDict); - service.sendMessage(message, sendSuccess, sendError); + sendMessage(t, service, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html index beb833b31..0f9da8d17 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html @@ -88,7 +88,7 @@ t.step(function () { messageService = services[0]; newMessage = new tizen.Message(messageService.type, initDict); - messageService.sendMessage(newMessage, sendSuccess, sendError); + sendMessage(t, messageService, newMessage, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html index 7bf07c80a..09a081209 100644 --- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html +++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html @@ -83,7 +83,7 @@ t.step(function () { removeAllSuccess = t.step_func(function () { message = new tizen.Message("messaging.mms", mmsMessageInitDict); - service.sendMessage(message, messageSentSuccess, messageSentError); + sendMessage(t, service, message, messageSentSuccess, messageSentError); }); serviceSuccess = t.step_func(function (services) { diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_conversationId_attribute.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_conversationId_attribute.html index f965cd49f..17c2f469c 100644 --- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_conversationId_attribute.html +++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_conversationId_attribute.html @@ -80,7 +80,7 @@ t.step(function () { service = services[0]; message = new tizen.Message("messaging.mms", mmsMessageInitDict); - service.sendMessage(message, sendSuccess, sendError); + sendMessage(t, service, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_folderId_attribute.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_folderId_attribute.html index 8d6e60a25..d596b9e9f 100644 --- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_folderId_attribute.html +++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_folderId_attribute.html @@ -66,7 +66,7 @@ t.step(function () { messageService = services[0]; message = new tizen.Message("messaging.mms", mmsMessageInitDict); - messageService.sendMessage(message, sendSuccess, sendError); + sendMessage(t, messageService, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_id_attribute.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_id_attribute.html index cc904c460..2cba848bf 100644 --- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_id_attribute.html +++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_id_attribute.html @@ -67,7 +67,7 @@ t.step(function () { messageService = services[0]; message = new tizen.Message("messaging.mms", mmsMessageInitDict); - messageService.sendMessage(message, sendSuccess, sendError); + sendMessage(t, messageService, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_timestamp_attribute.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_timestamp_attribute.html index a67a9889b..a79e1459e 100644 --- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_timestamp_attribute.html +++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_timestamp_attribute.html @@ -67,7 +67,7 @@ t.step(function () { messageService = services[0]; message = new tizen.Message("messaging.mms", mmsMessageInitDict); - messageService.sendMessage(message, sendSuccess, sendError); + sendMessage(t, messageService, message, sendSuccess, sendError); }); serviceError = t.step_func(function (error) { diff --git a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js old mode 100755 new mode 100644 index 7e6a1b5e4..f11a7e78c --- a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js +++ b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js @@ -39,6 +39,7 @@ var IO_ERR = 'IOError'; var UNKNOWN_ERR = 'UnknownError'; var EXCEPTION_TYPE = "name"; +var MMS_RESEND_LIMIT = 60; var generateSubject = function () { var datetime = new Date().getTime(); @@ -109,6 +110,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 <= MMS_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('');