[Messaging] adjust resync condition

Change-Id: Ic6d502c51535a303b61120f3c124c0ce588d4a01

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html
index 7cd42eb63c4fe6b52a326b7e424bf906659018e4..72c7af40b54ba5cabaa4d0648d5114cc3df798f2 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html
@@ -82,14 +82,17 @@ t.step(function () {
     });
 
     findSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
-
-        foundMessage = messages[0];
-
-        if (foundMessage.attachments.length === 0) {
-            service.loadMessageBody(foundMessage, loadBodySuccess, loadBodyError);
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
+            foundMessage = messages[0];
+
+            if (foundMessage.attachments.length === 0) {
+                service.loadMessageBody(foundMessage, loadBodySuccess, loadBodyError);
+            } else {
+                returnedValue = service.loadMessageAttachment(foundMessage.attachments[0], loadAttachmentSuccess, loadAttachmentError);
+            }
         } else {
-            returnedValue = service.loadMessageAttachment(foundMessage.attachments[0], loadAttachmentSuccess, loadAttachmentError);
+            setTimeout(sendSuccess, 1000);
         }
     });
 

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_filePath_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_filePath_attribute.html
index 97eed8ef42a84e6ae3508e12f8ce6576435391b7..4a7d93f5d5b8514358598d6b18f2cb59d8d09df9 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_filePath_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_filePath_attribute.html
@@ -63,11 +63,15 @@ t.step(function () {
     });
 
     findMessageSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
 
-        foundMessage = messages[0];
+            foundMessage = messages[0];
 
-        service.loadMessageBody(foundMessage, loadBodySuccess, loadBodyError);
+            service.loadMessageBody(foundMessage, loadBodySuccess, loadBodyError);
+        } else {
+            setTimeout(sendSuccess, 1000);
+        }
     });
 
     findMessageError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_email_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_email_onsuccess.html
index adaf803b5dd0116dfa77c810e1e16ba779f9a95f..e2748fda11986a4a0e38d86029af08d8ecdf999d 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_email_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_email_onsuccess.html
@@ -63,8 +63,12 @@ t.step(function () {
     });
 
     findSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
-        service.loadMessageBody(messages[0], bodySuccess, bodyError);
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
+            service.loadMessageBody(messages[0], bodySuccess, bodyError);
+        } else {
+            setTimeout(sendSuccess, 1000);
+        }
     });
 
     findError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_onsuccess.html
index a2c84f38208f412a85203bc17e2e91adb1e14ba7..b26a2d8f660f1f6c42b950255a101a68ab793e42 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_onsuccess.html
@@ -71,8 +71,12 @@ t.step(function () {
     });
 
     findSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
-        service.loadMessageBody(messages[0], bodySuccess, bodyError);
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
+            service.loadMessageBody(messages[0], bodySuccess, bodyError);
+        } else {
+            setTimeout(sendSuccess, 1000);
+        }
     });
 
     findError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_from_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_from_attribute.html
index d099c87379f450ddf99222e05dcc45d0fe4e19a0..5bcee2d339225d4a0c3f49daeb1873c5cc672de1 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_from_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_from_attribute.html
@@ -45,16 +45,19 @@ var t = async_test(document.title, {timeout: 300000}),
 
 t.step(function () {
     findSuccess = t.step_func(function (conversations) {
-        assert_type(conversations, "array", "Not an array");
-        assert_greater_than(conversations.length, 0, "Received empty messages array");
-
-        for (i = 0; i < conversations.length; i++) {
-            assert_own_property(conversations[i], "from", "MessageConversation does not own from property.");
-            assert_equals(conversations[i].from, TEST_EMAIL_RECIPIENT_1, "returned from is not equal");
-            check_readonly(conversations[i], "from", conversations[i].from, "string", "dummyValue");
+        if (conversations.length > 0) {
+            assert_type(conversations, "array", "Not an array");
+
+            for (i = 0; i < conversations.length; i++) {
+                assert_own_property(conversations[i], "from", "MessageConversation does not own from property.");
+                assert_equals(conversations[i].from, TEST_EMAIL_RECIPIENT_1, "returned from is not equal");
+                check_readonly(conversations[i], "from", conversations[i].from, "string", "dummyValue");
+            }
+
+            t.done();
+        } else {
+            setTimeout(sendSuccess, 1000);
         }
-
-        t.done();
     });
 
     findError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html
index 82196fff8f97c0af3784161cf1b48463eb55d5dc..4dfbe67594d5f856e4e11b9199e3597fcc5a6b7f 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html
@@ -78,13 +78,17 @@ t.step(function () {
     });
 
     findSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
-
-        foundMessage = messages[0];
-        if (foundMessage.attachments.length === 0) {
-            service.loadMessageBody(foundMessage, loadBodySuccess, loadBodyError);
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
+
+            foundMessage = messages[0];
+            if (foundMessage.attachments.length === 0) {
+                service.loadMessageBody(foundMessage, loadBodySuccess, loadBodyError);
+            } else {
+                returnedValue = service.loadMessageAttachment(foundMessage.attachments[0], loadAttachmentSuccess, loadAttachmentError);
+            }
         } else {
-            returnedValue = service.loadMessageAttachment(foundMessage.attachments[0], loadAttachmentSuccess, loadAttachmentError);
+            setTimeout(sendSuccess, 1000);
         }
     });
 

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html
index 5b629d41ce9f91a4ad6f15ca74933c922a4a0d75..06b148d849ca65c762fae3e1eee2e3a9d8b51b87 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html
@@ -73,14 +73,18 @@ t.step(function () {
     });
 
     findSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
 
-        foundMessage = messages[0];
+            foundMessage = messages[0];
 
-        if (foundMessage.attachments.length === 0) {
-            service.loadMessageBody(foundMessage, loadBodySuccess, loadBodyError);
+            if (foundMessage.attachments.length === 0) {
+                service.loadMessageBody(foundMessage, loadBodySuccess, loadBodyError);
+            } else {
+                returnedValue = service.loadMessageAttachment(foundMessage.attachments[0], loadAttachmentSuccess);
+            }
         } else {
-            returnedValue = service.loadMessageAttachment(foundMessage.attachments[0], loadAttachmentSuccess);
+            setTimeout(sendSuccess, 1000);
         }
     });
 

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage.html
index 0ffddd4c1289d8c5c16dd7b24f73e3c5e876a3ad..3253de3f24eb0686f6e0926e43a48e5eb32d45e8 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage.html
@@ -95,9 +95,12 @@ t.step(function () {
     });
 
     findSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
-
-        service.loadMessageBody(messages[0], bodySuccess, bodyError);
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
+            service.loadMessageBody(messages[0], bodySuccess, bodyError);
+        } else {
+            setTimeout(sendSuccess, 1000);
+        }
     });
 
     findError = t.step_func(function (error) {
@@ -128,7 +131,7 @@ t.step(function () {
 
     sendError = t.step_func(function (error) {
         if (resend <= EMAIL_RESEND_LIMIT) {
-            setTimeout(requestSending, 1000);
+            setTimeout(requestSending, 5000);
         } else {
             assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
         }

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_errorCallback.html
index 8310eed83d903c1acc742ccc049b51607664277d..4c7bad659e6f408bf987ae0e303b441045f8cd4f 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_errorCallback.html
@@ -46,8 +46,12 @@ var t = async_test(document.title, {timeout: 300000}),
 
 t.step(function () {
     findMessageSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
-        t.done();
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
+            t.done();
+        } else {
+            setTimeout(sendSuccess, 1000);
+        }
     });
 
     findMessageError = t.step_func(function (error) {
@@ -71,7 +75,7 @@ t.step(function () {
 
     syncError = t.step_func(function (error) {
         if (syncRetryCount <= EMAIL_RESYNC_LIMIT) {
-            setTimeout(syncRequest, 1000);
+            setTimeout(syncRequest, 5000);
         } else {
             assert_unreached("sync() error callback: name:" + error.name + ", msg:" + error.message);
         }

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html
index c4b337abeb26e181ada2d7bfba510bd8d7be12a5..4e7aa5bdfdd71b48c074112ed7ff7fa076c646b2 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html
@@ -46,11 +46,14 @@ var t = async_test(document.title, {timeout: 300000}),
 
 t.step(function () {
     findMessageSuccess = t.step_func(function (messages) {
-        assert_equals(messages.length, 1, "Found incorrect number of messages");
-        assert_equals(messages[0].subject, message.subject, "Incorrect subject.");
-        assert_equals(messages[0].folderId, inboxFolder.id, "Incorrect folderId.");
-
-        t.done();
+        if (messages.length > 0) {
+            assert_equals(messages.length, 1, "Found incorrect number of messages");
+            assert_equals(messages[0].subject, message.subject, "Incorrect subject.");
+            assert_equals(messages[0].folderId, inboxFolder.id, "Incorrect folderId.");
+            t.done();
+        } else {
+            setTimeout(sendSuccess, 1000);
+        }
     });
 
     findMessageError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_from.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_from.html
index 01e88c3712b59cae1a19ae0086af547fae72796d..52061ab3739841c688f08b7f88cde81427fb5589 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_from.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_from.html
@@ -56,13 +56,15 @@ var t = async_test(document.title, {timeout: 300000}),
 
 t.step(function () {
     findSuccess = t.step_func(function (conversations) {
-        assert_greater_than(conversations.length, 0, "Received empty conversations array");
-
-        for (i = 0; i < conversations.length; i++) {
-            assert_equals(conversations[i].from, TEST_EMAIL_RECIPIENT_1, "from should match");
+        if (conversations.length > 0) {
+            for (i = 0; i < conversations.length; i++) {
+                assert_equals(conversations[i].from, TEST_EMAIL_RECIPIENT_1, "from should match");
+            }
+
+            t.done();
+        } else {
+            setTimeout(sendSuccess, 1000);
         }
-
-        t.done();
     });
 
     findError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html
index dcf5ff7d8fb3122960b45613f645c88dcdc723e7..879ddd76f43a92d30dd064edb802c81148f6f4ec 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html
@@ -45,15 +45,18 @@ var t = async_test(document.title, {timeout: 300000}),
 
 t.step(function () {
     findSuccess = t.step_func(function (messages) {
-        assert_type(messages, "array", "Not an array");
-        assert_greater_than(messages.length, 0, "Received empty messages array");
-
-        for (i = 0; i < messages.length; i++) {
-            assert_true(messages[i] instanceof tizen.Message, "Not a Message");
-            assert_equals(messages[i].from, TEST_EMAIL_RECIPIENT_1, "returned from is not equal");
+        if (messages.length > 0) {
+            assert_type(messages, "array", "Not an array");
+        
+            for (i = 0; i < messages.length; i++) {
+                assert_true(messages[i] instanceof tizen.Message, "Not a Message");
+                assert_equals(messages[i].from, TEST_EMAIL_RECIPIENT_1, "returned from is not equal");
+            }
+
+            t.done();
+        } else {
+            setTimeout(sendSuccess, 1000);
         }
-
-        t.done();
     });
 
     findError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isRead_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isRead_with_errorCallback.html
index 944a3d9facc4d1bb7e42d6fcdedf1ce821691049..c6a74533d673456870f03600d59f077af9f1a23a 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isRead_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isRead_with_errorCallback.html
@@ -77,14 +77,18 @@ t.step(function () {
     });
 
     findInboxMessageSuccess = t.step_func(function (messages) {
-        assert_equals(messages.length, 1, "Found incorrect number of messages");
-        assert_equals(messages[0].subject, message.subject, "Incorrect subject.");
-        assert_equals(messages[0].folderId, inboxFolder.id, "Incorrect folderId.");
+        if (messages.length > 0) {
+            assert_equals(messages.length, 1, "Found incorrect number of messages");
+            assert_equals(messages[0].subject, message.subject, "Incorrect subject.");
+            assert_equals(messages[0].folderId, inboxFolder.id, "Incorrect folderId.");
 
-        messages[0].isRead = true;
-        inboxMessageId = messages[0].id;
+            messages[0].isRead = true;
+            inboxMessageId = messages[0].id;
 
-        service.messageStorage.updateMessages(messages, updateSuccess, updateError);
+            service.messageStorage.updateMessages(messages, updateSuccess, updateError);
+        } else {
+            setTimeout(sendSuccess, 1000);
+        }
     });
 
     findInboxMessageError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_from_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_from_attribute.html
index 71e7bf2f96c3d4e7f74ca11af502a2197f04a989..d7d4fdb10d1968b5374f0349a22654644d145c3a 100644 (file)
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_from_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_from_attribute.html
@@ -55,13 +55,17 @@ t.step(function () {
     check_readonly(message, "from", null, "object", message.from + "dummyValue");
 
     findMessageSuccess = t.step_func(function (messages) {
-        assert_inbox_message_equals(t, messages, message, inboxFolder);
+        if (messages.length > 0) {
+            assert_inbox_message_equals(t, messages, message, inboxFolder);
 
-        foundMessage = messages[0];
-        assert_type(foundMessage.from, "string", "from is not a string");
-        check_readonly(foundMessage, "from", TEST_EMAIL_RECIPIENT_1, "string", foundMessage.from + ".kr");
+            foundMessage = messages[0];
+            assert_type(foundMessage.from, "string", "from is not a string");
+            check_readonly(foundMessage, "from", TEST_EMAIL_RECIPIENT_1, "string", foundMessage.from + ".kr");
 
-        t.done();
+            t.done();
+        } else {
+            setTimeout(sendSuccess, 1000);
+        }
     });
 
     findMessageError = t.step_func(function (error) {

diff --git a/tct-messaging-email-tizen-tests/messaging/support/getJsonConf.js b/tct-messaging-email-tizen-tests/messaging/support/getJsonConf.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/tct-messaging-email-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-email-tizen-tests/messaging/support/messaging_common.js
old mode 100755 (executable)
new mode 100644 (file)
index 83b6842..c701fbe
--- a/tct-messaging-email-tizen-tests/messaging/support/messaging_common.js
+++ b/tct-messaging-email-tizen-tests/messaging/support/messaging_common.js
@@ -29,8 +29,8 @@ document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
 document.write('<script src="support/getJsonConf.js"></script>');
 
 var EMAIL_SYNC_INTERVAL = 30000;
-var EMAIL_RESEND_LIMIT = 60;
-var EMAIL_RESYNC_LIMIT = 60;
+var EMAIL_RESEND_LIMIT = 30;
+var EMAIL_RESYNC_LIMIT = 30;
 
 var TYPE_MISMATCH_ERR  = 'TypeMismatchError';
 
@@ -73,7 +73,7 @@ function sendMessage(t, service, msg, onSuccess, onError) {
 
     sendError = t.step_func(function (error) {
         if (resend <= EMAIL_RESEND_LIMIT) {
-            setTimeout(requestSending, 1000);
+            setTimeout(requestSending, 5000);
         } else {
             onError(error);
         }
@@ -93,7 +93,7 @@ function sync(t, service, onSuccess, onError, limit) {
 
     syncError = t.step_func(function (error) {
         if (resync <= EMAIL_RESYNC_LIMIT) {
-            setTimeout(requestSync, 1000);
+            setTimeout(requestSync, 5000);
         } else {
             onError(error);
         }