[Messaging] Fixed to resend message on network error
authorJunghyuk Park <junghyuk.park@samsung.com>
Fri, 23 Aug 2013 06:50:52 +0000 (15:50 +0900)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Fri, 23 Aug 2013 08:38:54 +0000 (08:38 +0000)
Change-Id: Ie42dc710b4a6ea51961891f0f33a3a824a2a1de9

18 files changed:
tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html
tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_to.html
tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html
tct-messaging-email-tizen-tests/messaging/MessageStorage_findMessage_emailFilterWithFrom.html
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeChangeListener.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_TypeMismatch.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_invalid_cb.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_foremail.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_TypeMismatch.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_invalid_cb.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_errorCallback.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_successCallback.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_errorCallback.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/Message_email_conversationId_attribute.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/Message_email_folderId_attribute.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/Message_email_timestamp_attribute.html [changed mode: 0644->0755]
tct-messaging-email-tizen-tests/messaging/support/messaging_common.js

index 41195f7c232d5c286c4de353da9971f87f131f9a..15e852753cba70a7978ba4491317a90551ba0abe 100755 (executable)
@@ -77,8 +77,7 @@ t.step(function () {
 
     syncSuccess = t.step_func(function () {
         assert_type(returnedValue, "long", "Incorrect returned value");
-        service.stopSync(returnedValue);
-
+       
         filterForServiceId = new tizen.AttributeFilter("serviceId", "EXACTLY", service.id);
         service.messageStorage.findFolders(filterForServiceId, findFoldersSuccess, findFoldersError);
     });
index 4ebbd92fe5fdbee7c16569136726da167bbd5d20..5593adbc0033674ee402d4cd12fd854de8bc4be9 100755 (executable)
@@ -56,7 +56,7 @@ t.step(function() {
     var conversationsArrayCB, conversationIterator, errorCallback, serviceListCB,
         messageService, messageStorage, message, currentDate = new Date(),
         subjectToSet = currentDate.getTime().toString(), plainBodyToSet = "plainBody",
-        toToSet = TEST_EMAIL_RECIPIENT_1 , sendSuccess;
+        toToSet = TEST_EMAIL_RECIPIENT_1 , sendSuccess, sendError;
 
     conversationsArrayCB = t.step_func(function (conversations) {
         assert_true(conversations.length > 0, " conversation found!");
@@ -75,6 +75,10 @@ t.step(function() {
         messageStorage.findConversations(new tizen.AttributeFilter("to", "EXACTLY", toToSet),conversationsArrayCB, errorCallback);
     });
 
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
     serviceListCB = t.step_func(function (services) {
         assert_not_equals(services.length, 0, "Can't find MessageService");
         messageService = services[0];
@@ -86,7 +90,7 @@ t.step(function() {
             to : [toToSet]
         });
 
-        messageService.sendMessage(message, sendSuccess);
+        requestMessageSending(t, messageService, message, sendSuccess, sendError);
     });
     tizen.messaging.getMessageServices("messaging.email", serviceListCB);
 });
index 418c8afc7fd709e39a13b36ac4e78d51f3d29c22..1eb8ec58bb7f0f1adcdd6f4a24cc24ac44aba397 100755 (executable)
@@ -73,7 +73,7 @@ t.step(function () {
 
         messageService = services[0];
         messageStorage = messageService.messageStorage;
-        messageService.sendMessage(message, sendSuccessCB, sendErrorCB);
+        requestMessageSending(t, messageService, message, sendSuccessCB, sendErrorCB);
     });
 
     getMessageServicesErrorCB = t.step_func(function (error) {
index 4988bd5a49c65afeca46c9bc8251654c7b047b44..d7ba82623aa87694b05a661ec45b38d036f8c238 100755 (executable)
@@ -51,88 +51,46 @@ Authors:
 //==== TEST_CRITERIA MR MOA
 setup({ timeout: 180000 });
 
-var t = async_test("MessageStorage_findMessage_emailFilterWithFrom", {timeout: 180000}),
-    messageToSend, service, foundMessage = 0, findSuccess, findError, messageStorage,
-    sendSuccess, sendError, serviceSuccess, serviceError, currentDate = new Date(),
+var t = async_test("MessageStorage_findMessage_emailFilterWithFrom", {timeout: 90000}),
+    service, emailInitDict, filter, findSuccess, findError, addSuccess, currentDate = new Date(),
     subjectToSet = currentDate.getTime().toString(), recipient = TEST_EMAIL_RECIPIENT_1,
-    fromEmailFilter, i, listener, listenerId = null, returnedValue,
-    syncSuccess, syncError;
-t.step(function () {
+    serviceSuccess, serviceError, returnedValue, i, foundMessage = 0,
+    addedMessage;
 
-    //cleanup after TC
-    add_result_callback(function () {
-        try {
-            if (listenerId !== null) {
-                messageStorage.removeChangeListener(listenerId);
-            }
-        } catch (err) {
-            // do nothing in case removeChangeListener throw an exception
-        }
-    });
+t.step(function () {
 
     findSuccess = t.step_func(function (messages) {
         assert_greater_than(messages.length, 0, "Received empty messages array in find success callback");
         for(i = 0; i < messages.length; i++) {
             assert_equals(messages[i].from, recipient, "from is incorrect");
-            if (messages[i].subject === subjectToSet) {
+            if (messages[i].id === addedMessage.id) {
                 foundMessage++;
             }
         }
+        assert_equals(foundMessage, 1, "Incorect number of found messages");
+        t.done();
     });
 
     findError = t.step_func(function (error) {
         assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    listener = {
-        messagesupdated: t.step_func(function (messages) {
-            assert_unreached("messagesupdated invoked. Messages received: " + messages);
-        }),
-        messagesadded: t.step_func(function (messages) {
-            messageStorage.removeChangeListener(listenerId);
-            listenerId = null;
-            assert_greater_than(messages.length, 0, "Received empty messages array in listener - messagesadded.");
-
-            returnedValue = service.messageStorage.findMessages(fromEmailFilter, findSuccess, findError);
-            assert_equals(returnedValue, undefined, "Incorrect returned value");
-        }),
-        messagesremoved: t.step_func(function (messages) {
-            assert_unreached("messagesremoved invoked. Messages received: " + messages);
-        })
-    };
-
-    syncSuccess = t.step_func(function () {
-        assert_greater_than(foundMessage, 0, "Incorect number of found messages");
-        t.done();
-    });
-
-    syncError = t.step_func(function (error) {
-        assert_unreached("sync() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    sendSuccess = t.step_func(function () {
-        setTimeout(t.step_func(function () {
-            requestSync(t, service, syncSuccess, syncError);
-        }), EMAIL_SYNC_INTERVAL);
-    });
-
-    sendError = t.step_func(function (error) {
-        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    addSuccess = t.step_func(function (message) {
+        addedMessage = message;
+        filter = new tizen.AttributeFilter("from", "EXACTLY", recipient);
+        returnedValue = service.messageStorage.findMessages(filter, findSuccess, findError);
+        assert_equals(returnedValue, undefined, "findMessages should return undefined");
     });
 
     serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
-        messageStorage = service.messageStorage;
-
-        messageToSend = new tizen.Message("messaging.email", {
+        emailInitDict = {
             subject: subjectToSet,
-            to: [ recipient ]
-        });
-
-        fromEmailFilter = new tizen.AttributeFilter("from", "EXACTLY", recipient);
-        listenerId = messageStorage.addMessagesChangeListener(listener, fromEmailFilter);
-        requestMessageSending(t, service, messageToSend, sendSuccess, sendError);
+            to: [recipient],
+            plainBody: "this is a plainbody"
+        };
+        addEmailDraft(t, service, emailInitDict, addSuccess);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 14b60a6..d1b58c8
@@ -90,7 +90,7 @@ t.step(function () {
         msg2.subject = "second subject";
         msg2.to =  [TEST_EMAIL_RECIPIENT_2];
         msg2.bcc =  [TEST_EMAIL_RECIPIENT_2];
-        service.sendMessage(msg2, secondSendSuccess, secondSendError);
+        requestMessageSending(t, service, msg2, secondSendSuccess, secondSendError);
     });
 
     firstSendError = t.step_func(function (error) {
@@ -103,7 +103,7 @@ t.step(function () {
         msg = new tizen.Message("messaging.email", emailMessageInitDict);
         msg.to =  [TEST_EMAIL_RECIPIENT_2];
         msg.bcc =  [TEST_EMAIL_RECIPIENT_2];
-        service.sendMessage(msg, firstSendSuccess, firstSendError);
+        requestMessageSending(t, service, msg, firstSendSuccess, firstSendError);
     });
 
     getMessageServicesError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 2a12bcf..93bb52a
@@ -70,7 +70,7 @@ t.step(function () {
         service = services[0];
         msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
             subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg, sendSuccess, sendError);
+        requestMessageSending(t, service, msg, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 5192068..b328e80
@@ -81,7 +81,7 @@ t.step(function () {
 
         msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
             subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg, sendSuccess, sendError);
+        requestMessageSending(t, service, msg, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 7c50b02..beb1033
@@ -83,7 +83,7 @@ t.step(function () {
         service = services[0];
         msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
             subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg, sendSuccess, sendError);
+        requestMessageSending(t, service, msg, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 5141f3b..d897907
@@ -93,7 +93,7 @@ t.step(function () {
             isHighPriority: true
         };
         msg = new tizen.Message("messaging.email", emailInitDict);
-        service.sendMessage(msg, sendMessageSuccess, sendMessageError);
+        requestMessageSending(t, service, msg, sendMessageSuccess, sendMessageError);
     });
 
     getMessageServicesError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 9501af0..9d10902
@@ -77,7 +77,7 @@ t.step(function () {
         service = services[0];
         msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
             subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg, sendSuccess, sendError);
+        requestMessageSending(t, service, msg, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 2bb0a4b..749c220
@@ -77,7 +77,7 @@ t.step(function () {
 
         msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
             subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg, sendSuccess, sendError);
+        requestMessageSending(t, service, msg, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 29f4d14..361409e
@@ -85,7 +85,7 @@ t.step(function () {
         service = services[0];
         msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
             subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg, sendSuccess, sendError);
+        requestMessageSending(t, service, msg, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index 8d035b1..b53a3a0
@@ -70,7 +70,7 @@ t.step(function () {
         service = services[0];
         msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
             subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg, sendSuccess, sendError);
+        requestMessageSending(t, service, msg, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index ce0b008..5561a82
@@ -81,7 +81,7 @@ t.step(function () {
         service = services[0];
 
         message = new tizen.Message("messaging.email", emailMessageInitDict);
-        service.sendMessage(message, sendSuccess, sendError);
+        requestMessageSending(t, service, message, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index fd206b5..284e56e
@@ -68,7 +68,7 @@ t.step(function () {
         messageService = services[0];
 
         message = new tizen.Message("messaging.email", emailMessageInitDict);
-        messageService.sendMessage(message, sendSuccess, sendError);
+        requestMessageSending(t, messageService, message, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index fc6569a..ef38272
@@ -69,7 +69,7 @@ t.step(function () {
         messageService = services[0];
 
         message = new tizen.Message("messaging.email", emailMessageInitDict);
-        messageService.sendMessage(message, sendSuccess, sendError);
+        requestMessageSending(t, messageService, message, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
index c8080dae6a3d93707cb109911a174f5be3bcbfd3..55e7e5843c9bd560d511b3dc824326d5b9b8ad6b 100755 (executable)
@@ -26,8 +26,8 @@ var TEST_EMAIL_RECIPIENT_2 = ""; // this variable MUST be set before executing t
 var EMAIL_INBOX_FOLDER_TYPE = "INBOX";
 
 var EMAIL_SYNC_INTERVAL = 15000;
-var EMAIL_RESEND_LIMIT = 10;
-var EMAIL_RESYNC_LIMIT = 10;
+var EMAIL_RESEND_LIMIT = 60;
+var EMAIL_RESYNC_LIMIT = 60;
 
 var imagePathToSet = "images/webapi-tizen-messaging-test_image.jpg";
 var soundPathToSet = "music/webapi-tizen-messaging-test_noise.mp3";
@@ -114,7 +114,6 @@ function requestMessageSending(t, service, msg, onSuccess, onError) {
 
     sendMessage = t.step_func(function () {
         resend++;
-
         service.sendMessage(msg, onSuccess, sendError);
     });
 
@@ -158,32 +157,32 @@ function sendEmailAndSync(t, msg, onSuccess) {
     var service, syncSuccess, syncError, sendMessage, sendSuccess, sendError, serviceListSuccess, serviceListError;
 
     syncSuccess = t.step_func(function () {
-            onSuccess(service);
-        });
+        onSuccess(service);
+    });
 
     syncError = t.step_func(function (error) {
         assert_unreached("failed to sync: " + error.message);
-        });
+    });
 
     sendSuccess = t.step_func(function () {
-            setTimeout(t.step_func(function () {
+        setTimeout(t.step_func(function () {
             requestSync(t, service, syncSuccess, syncError);
         }), EMAIL_SYNC_INTERVAL);
-        });
+    });
 
     sendError = t.step_func(function (error) {
         assert_unreached("failed to send message: " + error.name);
-        });
+    });
 
     serviceListSuccess = t.step_func(function (services) {
-            assert_true(services.length > 0, "No email MessageService found.");
-            service = services[0];
+        assert_true(services.length > 0, "No email MessageService found.");
+        service = services[0];
         requestMessageSending(t, service, msg, sendSuccess, sendError);
-        });
+    });
 
     serviceListError = t.step_func(function (error) {
-            assert_unreached("failed to receive services" + error.message);
-        });
+        assert_unreached("failed to receive services" + error.message);
+    });
 
     t.step(function () {
         tizen.messaging.getMessageServices("messaging.email", serviceListSuccess, serviceListError);
@@ -284,7 +283,7 @@ var MessageConversationTest = function (t, testing) {
         assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
         message = new tizen.Message("messaging.email", emailMessageInitDict);
-        service.sendMessage(message, sendSuccess, sendError);
+        requestMessageSending(t, service, message, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {