From: Junghyuk Park Date: Mon, 21 Oct 2013 05:26:37 +0000 (+0900) Subject: [Messaging] adjust resync condition X-Git-Tag: 2.2.1_release~40 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e07bcc2838ce7637de7d0d8f09cd773db163dff;p=test%2Ftct%2Fweb%2Fapi.git [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 7cd42eb63..72c7af40b 100644 --- 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 97eed8ef4..4a7d93f5d 100644 --- 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 adaf803b5..e2748fda1 100644 --- 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 a2c84f382..b26a2d8f6 100644 --- 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 d099c8737..5bcee2d33 100644 --- 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 82196fff8..4dfbe6759 100644 --- 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 5b629d41c..06b148d84 100644 --- 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 0ffddd4c1..3253de3f2 100644 --- 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 8310eed83..4c7bad659 100644 --- 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 c4b337abe..4e7aa5bdf 100644 --- 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 01e88c371..52061ab37 100644 --- 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 dcf5ff7d8..879ddd76f 100644 --- 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 944a3d9fa..c6a74533d 100644 --- 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 71e7bf2f9..d7d4fdb10 100644 --- 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 new mode 100644 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 new mode 100644 index 83b6842d0..c701fbe18 --- 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(''); document.write(''); 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); }