[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 8a673695b27b39538737106b611a145df63d70de..71f461c4ceed8604cdef4a13f2823b7d0060e7f9 100644 (file)
--- 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 fa630a17961b08304000a291b646e9aba8260235..4f7434ed2ccb2cd3e0b0303ac93858cea4a7ef72 100644 (file)
--- 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 01b581acbb3f40f89ac81bf3dd1926c65fc45bf7..5a253d3f11c384ca00facde61db28e4ab548dd56 100644 (file)
--- 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 f30e7b4703aa9f1f8d0195d303c7c2266bdd9651..f3239df20dfa501fa541af8aa74c417446549fe9 100644 (file)
--- 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 (executable)
new mode 100644 (file)

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 10fd4deae2b2951dbefe752913482113f5c864cf..8fd22e741497b656df9717a2fe06f24df5674ec5 100644 (file)
--- 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 d0b22741338a4c9ad289220d02749174b9fc15fe..84ffaea12afa373a7128fe60a3edb9bf799dada8 100644 (file)
--- 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 fc1402fb4d01c4850c70e4c4e5a6c73fd480ea9a..be6484ee32fe6ccb56366a29c0db2059f1d51097 100644 (file)
--- 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 beb833b3178251a9868d127ec97f6deb612130a6..0f9da8d1734ef8d3920c39849e0d09874ae91468 100644 (file)
--- 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 7bf07c80abf1385aa8a2e2f2c56b9b6b90c3720e..09a0812097da75c8d2b09e8f4186a1d2a453ea8b 100644 (file)
--- 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 f965cd49fe3790ed1edad3c388b74c19a5ced028..17c2f469c83cfb854401be1c6258fc2a832e78ef 100644 (file)
--- 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 8d6e60a2592c589451a74bc8bf60e35a5fcfc23d..d596b9e9fc9d7b0e378b142dd54fba2d70953f7b 100644 (file)
--- 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 cc904c46048f8d0d3b1c65bc9357833da9edcd8e..2cba848bf563b93993519ab5ad7a64bd007b6057 100644 (file)
--- 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 a67a9889b0f01c9602fbba1bcb88938d4edb920b..a79e1459e198708320c77a15d41211294a5e5159 100644 (file)
--- 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 (executable)
new mode 100644 (file)
index 7e6a1b5..f11a7e7
--- 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('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
 document.write('<script src="support/getJsonConf.js"></script>');