[Messaging] Fix timing issues

Change-Id: Ie8efec3d936fb5f966567ea92291d0e300be43ad

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_without_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_without_filter.html
old mode 100644 (file)
new mode 100755 (executable)
index 93f6f84..e1dc312
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_without_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_without_filter.html
@@ -47,7 +47,9 @@ t.step(function () {
 
     add_result_callback(function (res) {
         try {
-            messageStorage.removeChangeListener(subscriptionIdentifier);
+            if (subscriptionIdentifier) {
+                messageStorage.removeChangeListener(subscriptionIdentifier);
+            }
         } catch (err) {
             // do nothing in case removeChangeListener throw an exception
         }
@@ -66,15 +68,16 @@ t.step(function () {
     changeCallback = {
         messagesadded: t.step_func(function (addedMessages) {
             assert_type(addedMessages, "array", "Not an array.");
-            assert_equals(addedMessages.length, 1, "Received incorrect number of messages: " + addedMessages.length);
-            assert_true(addedMessages[0] instanceof tizen.Message, "Not a message.");
-            messageService.loadMessageBody(addedMessages[0], loadSuccess, loadError);
-        }),
-        messagesupdated: t.step_func(function (updatedMessages) {
-            assert_unreached("memssagesupdated callback invoked.");
-        }),
-        messagesremoved: t.step_func(function (removedMessages) {
-            assert_unreached("messagesremoved callback invoked.");
+            assert_greater_than(addedMessages.length, 0, "Received empty messages array");
+
+            for (var i in addedMessages) {
+                assert_true(addedMessages[i] instanceof tizen.Message, "Not a message.");
+                if (addedMessages[i].id === message.id) {
+                    messageStorage.removeChangeListener(subscriptionIdentifier);
+                    messageService.loadMessageBody(addedMessages[i], loadSuccess, loadError);
+                    break;
+                }
+            }
         })
     };
 

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_without_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_without_filter.html
old mode 100644 (file)
new mode 100755 (executable)
index 7d21963..ed8d4aa
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_without_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_without_filter.html
@@ -46,7 +46,9 @@ t.step(function () {
 
     add_result_callback(function () {
         try {
-            messageStorage.removeChangeListener(subscriptionIdentifier);
+            if (subscriptionIdentifier) {
+                messageStorage.removeChangeListener(subscriptionIdentifier);
+            }
         } catch (err) {
             // do nothing in case removeChangeListener throw an exception
         }
@@ -69,18 +71,17 @@ t.step(function () {
     changeCallback = {
         messagesadded: t.step_func(function (addedMessages) {
             assert_type(addedMessages, "array", "Not an array.");
-            assert_equals(addedMessages.length, 1, "Received incorrect number of messages: " + addedMessages.length);
-            assert_true(addedMessages[0] instanceof tizen.Message, "Not a message.");
-            messageStorage.removeChangeListener(subscriptionIdentifier);
-            setTimeout(t.step_func(function () {
-                messageService.loadMessageBody(addedMessages[0], loadSuccess, loadError);
-            }, 3000));
-        }),
-        messagesupdated: t.step_func(function (updatedMessages) {
-            assert_unreached("memssagesupdated callback invoked.");
-        }),
-        messagesremoved: t.step_func(function (removedMessages) {
-            assert_unreached("messagesremoved callback invoked.");
+            assert_greater_than(addedMessages.length, 0, "Received empty messages array");
+
+            for (var i in addedMessages) {
+                assert_true(addedMessages[i] instanceof tizen.Message, "Not a message.");
+                if (addedMessages[i].id === message.id) {
+                    messageStorage.removeChangeListener(subscriptionIdentifier);
+                    subscriptionIdentifier = null;
+                    messageService.loadMessageBody(addedMessages[i], loadSuccess, loadError);
+                    break;
+                }
+            }
         })
     };
 

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_without_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_without_filter.html
old mode 100644 (file)
new mode 100755 (executable)
index e26f4b5..f9fd1ab
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_without_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_without_filter.html
@@ -46,25 +46,27 @@ t.step(function () {
 
     add_result_callback(function () {
         try {
-            messageStorage.removeChangeListener(subscriptionIdentifier);
+            if (subscriptionIdentifier) {
+                messageStorage.removeChangeListener(subscriptionIdentifier);
+            }
         } catch (err) {
             // do nothing in case removeChangeListener throw an exception
         }
     });
 
     changeCallback = {
-        messagesadded: t.step_func(function (addedMessages) {
-            assert_unreached("messagesadded callback invoked.");
-        }),
-        messagesupdated: t.step_func(function (updatedMessages) {
-            assert_unreached("messagesupdated callback invoked.");
-        }),
         messagesremoved: t.step_func(function (removedMessages) {
             assert_type(removedMessages, "array", "Not an array.");
-            assert_equals(removedMessages.length, 1, "Received incorrect number of messages: " + removedMessages.length);
-            assert_true(removedMessages[0] instanceof tizen.Message, "Not a message.");
-            assert_equals(removedMessages[0].id, message.id, "Invalid message given to callback");
-            t.done();
+            assert_greater_than(removedMessages.length, 0, "Received empty messages array");
+
+            for (var i in removedMessages) {
+                assert_true(removedMessages[i] instanceof tizen.Message, "Not a message.");
+                if (removedMessages[i].id === message.id) {
+                    messageStorage.removeChangeListener(subscriptionIdentifier);
+                    t.done();
+                    break;
+                }
+            }            
         })
     };
 

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_without_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_without_filter.html
old mode 100644 (file)
new mode 100755 (executable)
index d86ef09..289be91
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_without_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_without_filter.html
@@ -63,17 +63,18 @@ t.step(function () {
     });
 
     changeCallback = {
-        messagesadded: t.step_func(function (addedMessages) {
-            assert_unreached("messagesadded callback invoked.");
-        }),
         messagesupdated: t.step_func(function (updatedMessages) {
             assert_type(updatedMessages, "array", "Not an array.");
-            assert_equals(updatedMessages.length, 1, "Received incorrect number of messages: " + updatedMessages.length);
-            assert_true(updatedMessages[0] instanceof tizen.Message, "Not a message.");
-            messageService.loadMessageBody(updatedMessages[0], loadSuccess, loadError);
-        }),
-        messagesremoved: t.step_func(function (removedMessages) {
-            assert_unreached("messagesremoved callback invoked.");
+            assert_greater_than(updatedMessages.length, 0, "Received empty messages array");
+
+            for (var i in updatedMessages) {
+                assert_true(updatedMessages[i] instanceof tizen.Message, "Not a message.");
+                if (updatedMessages[i].id === message.id) {
+                    messageStorage.removeChangeListener(subscriptionIdentifier);
+                    messageService.loadMessageBody(updatedMessages[i], loadSuccess, loadError);
+                    break;
+                }
+            }
         })
     };