[Messaging] Improved stability of mms and sms tests
authorJunghyuk Park <junghyuk.park@samsung.com>
Fri, 27 Sep 2013 06:39:50 +0000 (15:39 +0900)
committerJunghyuk Park <junghyuk.park@samsung.com>
Fri, 27 Sep 2013 06:39:50 +0000 (15:39 +0900)
Change-Id: I860e6debb7ab69e2bc086a4791109b0a83c6dfb6

20 files changed:
tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html [changed mode: 0644->0755]
tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded_withoutfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html [new file with mode: 0755]
tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html [new file with mode: 0755]
tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html [deleted file]
tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html [deleted file]
tct-messaging-sms-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessageStorage_addMessagesChangeListener_withoutfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesadded_withoutfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_messagesupdated_withoutfilter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesadded_without_filter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesremoved_without_filter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/messaging/MessagesChangeCallback_sms_messagesupdated_without_filter.html [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/tests.full.xml [changed mode: 0644->0755]
tct-messaging-sms-tizen-tests/tests.xml [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 889e09c..2407b2b
@@ -37,86 +37,58 @@ Authors:
 //==== ONLOAD_DELAY 90
 //==== TEST_CRITERIA CBOA
 setup({ timeout: 90000 });
-var t = async_test("MessageConversationsChangeCallback_mms_conversationsremoved", {timeout: 90000}), changeCallback,
-    serviceSuccess, serviceError, messageService, messageStorage,
-    currentDate = new Date(), subjectToSet = currentDate.getTime().toString(),
-    initDict = mmsMessageInitDict, message,
-    addSuccess, addError, messageFilter,
-    findMessageSuccess, findMessageError, foundMessage, conversationFilter,
-    findConversationSuccess, findConversationError, foundConversation, listenerId,
-    removeConversationError, returnedValue;
+var t = async_test("MessageConversationsChangeCallback_mms_conversationsremoved", {timeout: 90000}),
+    serviceSuccess, serviceError, service, message,
+    removeAllSuccess, sendSuccess, sendError, conversationChangeCB,
+    removeConversationError, removedConversationId;
 
 t.step(function () {
-    //cleanup after TC
-    add_result_callback(function () {
+    add_result_callback(function (res) {
         try {
-            messageStorage.removeChangeListener(listenerId);
+            service.messageStorage.removeChangeListener(watcherId);
         } catch (err) {
             // do nothing in case removeChangeListener throw an exception
         }
     });
 
-    changeCallback = {
-        conversationsadded: t.step_func(function (addedConversations) {
-            assert_unreached("conversationsadded invoked");
-        }),
-        conversationsupdated: t.step_func(function (updatedConversations) {
-            assert_unreached("conversationsupdated invoked");
-        }),
-        conversationsremoved: t.step_func(function (removedConversations) {
-            assert_type(removedConversations, "array", "Not an array.");
-            assert_equals(removedConversations.length, 1, "Incorrect length of conversations.");
-            t.done();
-        })
-    };
-
     removeConversationError = t.step_func(function (error) {
         assert_unreached("removeConversations() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    findConversationSuccess = t.step_func(function (conversations) {
-        assert_equals(conversations.length, 1, "Incorrect number of found conversations");
-        foundConversation = conversations[0];
-
-        listenerId = messageStorage.addConversationsChangeListener(changeCallback);
-        returnedValue = messageStorage.removeConversations([foundConversation], null, removeConversationError);
-        assert_equals(returnedValue, undefined, "Incorrect returned value");
-    });
-
-    findConversationError = t.step_func(function (error) {
-        assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    findMessageSuccess = t.step_func(function (messages) {
-        assert_equals(messages.length, 1, "Incorrect number of found messages");
-        foundMessage = messages[0];
-
-        conversationFilter = new tizen.AttributeFilter("id", "EXACTLY", foundMessage.conversationId);
-        messageStorage.findConversations(conversationFilter, findConversationSuccess, findConversationError);
-    });
+    conversationChangeCB = {
+        conversationsadded : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message.conversationId) {
+                    removedConversationId = conversations[i].id;
+                    service.messageStorage.removeConversations([conversations[i]], null, removeConversationError);
+                    break;
+                }
+            }
+        }),
+        conversationsremoved : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            t.done();
+        })
+    };
 
-    findMessageError = t.step_func(function (error) {
-        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    addSuccess = t.step_func(function () {
-        messageFilter = new tizen.AttributeFilter("id", "EXACTLY", message.id);
-        messageStorage.findMessages(messageFilter, findMessageSuccess, findMessageError);
-    });
+    removeAllSuccess = t.step_func(function () {
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
 
-    addError = t.step_func(function (error) {
-        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
+        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        service.sendMessage(message, null, sendError);
     });
 
     serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
-        messageService = services[0];
-        messageStorage = messageService.messageStorage;
-
-        initDict.subject = subjectToSet;
-        message = new tizen.Message("messaging.mms", initDict);
-        messageService.messageStorage.addDraftMessage(message, addSuccess, addError);
-
+        service = services[0];
+        removeAllMessages(t, service, removeAllSuccess);
     });
 
     serviceError = t.step_func(function (error) {
@@ -125,7 +97,6 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.mms", serviceSuccess, serviceError);
 });
-
 </script>
 </body>
 </html>
old mode 100644 (file)
new mode 100755 (executable)
index 77da8e9..06667ac
@@ -37,62 +37,52 @@ Authors:
 //==== ONLOAD_DELAY 90
 //==== TEST_CRITERIA CBT CBOA
 setup({ timeout: 90000 });
-var t = async_test("MessageConversationsChangeCallback_mms_conversationsupdated", {timeout: 90000}), changeCallback,
-    serviceSuccess, serviceError, messageService, messageStorage, listenerId,
-    currentDate = new Date(), subjectToSet = currentDate.getTime().toString(),
-    initDict = mmsMessageInitDict, sendMessage1st, sendMessage2nd, timestampBeforeChange,
-    sendSuccess1st, sendError1st, sendError2nd;
-initDict.subject = subjectToSet;
+var t = async_test("MessageConversationsChangeCallback_mms_conversationsupdated", {timeout: 90000}),
+    serviceSuccess, serviceError, service, message1, message2,
+    removeAllSuccess, sendSuccess, sendError, conversationChangeCB;
 
 t.step(function () {
+    add_result_callback(function (res) {
+        try {
+            service.messageStorage.removeChangeListener(watcherId);
+        } catch (err) {
+            // do nothing in case removeChangeListener throw an exception
+        }
+    });
 
-    changeCallback = {
-        conversationsadded: t.step_func(function (addedConversations) {
-            assert_unreached("conversationsadded invoked");
-        }),
-        conversationsupdated: t.step_func(function (updatedConversations) {
-            assert_equals(updatedConversations.length, 1, "Incorrect length of conversations.");
-            check_readonly(updatedConversations[0], "id", updatedConversations[0].id, "string", "dummyValue");
-            check_readonly(updatedConversations[0], "type", "messaging.mms", "string", "dummyValue");
-            assert_true(updatedConversations[0].timestamp instanceof Date, "Not a data");
-            timestampBeforeChange = updatedConversations[0].timestamp.getTime();
-            updatedConversations[0].timestamp = new Date();
-            assert_equals(updatedConversations[0].timestamp.getTime(), timestampBeforeChange, "timestamp modified");
-            check_readonly(updatedConversations[0], "messageCount", updatedConversations[0].messageCount, "number", 123);
-            check_readonly(updatedConversations[0], "unreadMessages", updatedConversations[0].unreadMessages, "number", 123);
-            check_readonly(updatedConversations[0], "preview", updatedConversations[0].preview, "string", "dummyValue");
-            check_readonly(updatedConversations[0], "subject", subjectToSet, "string", "dummyValue");
-            check_readonly(updatedConversations[0], "isRead", updatedConversations[0].isRead, "boolean", "dummyValue");
-            check_readonly(updatedConversations[0], "lastMessageId", updatedConversations[0].lastMessageId, "string", "dummyValue");
-            t.done();
-        }),
-        conversationsremoved: t.step_func(function (removedConversations) {
-            assert_unreached("conversationsremoved invoked");
+    conversationChangeCB = {
+        conversationsupdated : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message2.conversationId) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
-    sendError2nd = t.step_func(function (error) {
+    sendError = t.step_func(function (error) {
         assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    sendSuccess1st = t.step_func(function (recipients) {
-        listenerId = messageStorage.addConversationsChangeListener(changeCallback);
+    sendSuccess = t.step_func(function () {
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
 
-        sendMessage2nd = new tizen.Message("messaging.mms", initDict);
-        messageService.sendMessage(sendMessage2nd, function (){}, sendError2nd);
+        message2 = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        service.sendMessage(message2, null, sendError);
     });
 
-    sendError1st = t.step_func(function (error) {
-        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    removeAllSuccess = t.step_func(function () {
+        message1 = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        service.sendMessage(message1, sendSuccess, sendError);
     });
 
     serviceSuccess = t.step_func(function (services) {
-        assert_true(services.length > 0, "Received empty services array");
-        messageService = services[0];
-        messageStorage = messageService.messageStorage;
-
-        sendMessage1st = new tizen.Message("messaging.mms", initDict);
-        messageService.sendMessage(sendMessage1st, sendSuccess1st, sendError1st);
+        assert_greater_than(services.length, 0, "Received empty services array");
+        service = services[0];
+        removeAllMessages(t, service, removeAllSuccess);
     });
 
     serviceError = t.step_func(function (error) {
@@ -101,16 +91,6 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.mms", serviceSuccess, serviceError);
 });
-
-//cleanup after TC
-add_result_callback(function () {
-    try {
-        messageStorage.removeChangeListener(listenerId);
-    } catch (err) {
-        // do nothing in case removeChangeListener throw an exception
-    }
-});
-
 </script>
 </body>
 </html>
old mode 100644 (file)
new mode 100755 (executable)
index 5740e35..e4a2de8
@@ -50,62 +50,55 @@ Authors:
 //==== TEST_CRITERIA CBOA
 setup({timeout: 90000});
 var t = async_test("MessageConversationsChangeCallback_conversationsadded_withfilter", {timeout:90000}),
-conversationChangeCB, removeSuccessCB, removeErrorCB, conversationsArrayCB, findErrorCB,
-serviceListCB, serviceError, listenerFilter, msg, service, filter;
+    serviceSuccess, serviceError, service, message, filter,
+    removeAllSuccess, sendError, conversationChangeCB;
 
 t.step(function () {
+
+    add_result_callback(function (res) {
+        try {
+            service.messageStorage.removeChangeListener(watcherId);
+        } catch (err) {
+            // do nothing in case removeChangeListener throw an exception
+        }
+    });
+
     conversationChangeCB = {
-        conversationsupdated : t.step_func(function (conversations) {
-            assert_unreached("should not in conversationsupdated: " + conversations.length);
-        }),
         conversationsadded : t.step_func(function (conversations) {
-            assert_true(conversations.length > 0, "No conversation added");
-            t.done();
-        }),
-        conversationsremoved : t.step_func(function (conversations) {
-            assert_unreached("should not in conversationsremoved: " + conversations.length);
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message.conversationId) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
-    removeSuccessCB = t.step_func(function () {
-        //conversation deleted so add listener and send new message to trigger conversationsadded
-        listenerFilter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT_2);
-        service.messageStorage.addConversationsChangeListener(conversationChangeCB, filter);
-        msg = new tizen.Message("messaging.sms", {plainBody : "MessageConversationsChangeCallback test.",to : [ TEST_SMS_RECIPIENT_2 ]});
-        // Send request
-        service.sendMessage(msg);
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    removeErrorCB = t.step_func(function (error) {
-        assert_unreached("removeConversations() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    conversationsArrayCB = t.step_func(function (conversations) {
-        if (conversations.length === 0) {
-            removeSuccessCB();
-        } else {
-            //conversation exists so delete it first
-            service.messageStorage.removeConversations(conversations, removeSuccessCB, removeErrorCB);
-        }
-    });
+    removeAllSuccess = t.step_func(function () {
+        filter = new tizen.AttributeFilter("to", "CONTAINS", smsMessageInitDict.to[0]);
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB, filter);
 
-    findErrorCB = t.step_func(function (error) {
-        assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message);
+        message = new tizen.Message("messaging.sms", smsMessageInitDict);
+        service.sendMessage(message, null, sendError);
     });
 
-    serviceListCB = t.step_func(function (services) {
-        assert_true(services.length > 0, "No message service found");
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
-        // precondition - find and remove conversation if already exists
-        filter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT_2);
-        service.messageStorage.findConversations(filter, conversationsArrayCB, findErrorCB);
+        removeAllMessages(t, service, removeAllSuccess);
     });
 
     serviceError = t.step_func(function (error) {
         assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    tizen.messaging.getMessageServices("messaging.sms", serviceListCB, serviceError);
+    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
 });
 
 </script>
old mode 100644 (file)
new mode 100755 (executable)
index 7a733a4..daa9b61
@@ -50,62 +50,52 @@ Authors:
 //==== TEST_CRITERIA CBOA
 setup({timeout: 90000});
 var t = async_test("MessageConversationsChangeCallback_conversationsadded_withoutfilter", {timeout:90000}),
-conversationChangeCB, messagesRemoved, messageRemovalFailure, findSuccessCB, findErrorCB,
-serviceListCB, serviceError, service, filter;
+    serviceSuccess, serviceError, service, message, removeAllSuccess, sendError, conversationChangeCB;
 
 t.step(function () {
+    add_result_callback(function (res) {
+        try {
+            service.messageStorage.removeChangeListener(watcherId);
+        } catch (err) {
+            // do nothing in case removeChangeListener throw an exception
+        }
+    });
+
     conversationChangeCB = {
-        conversationsupdated : t.step_func(function (conversations) {
-            assert_unreached("should not in conversationsupdated: " + conversations.length);
-        }),
         conversationsadded : t.step_func(function (conversations) {
-            assert_true(conversations.length > 0, "No conversation added");
-            t.done();
-        }),
-        conversationsremoved : t.step_func(function (conversations) {
-            assert_unreached("should not in conversationsremoved: " + conversations.length);
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message.conversationId) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
-    messagesRemoved = t.step_func(function () {
-        service.messageStorage.addConversationsChangeListener(conversationChangeCB);
-        var msg = new tizen.Message("messaging.sms", { plainBody : "MessageConversationsChangeCallback test.", to : [ TEST_SMS_RECIPIENT_2 ] });
-        // Send request
-        service.sendMessage(msg);
-    });
-
-    messageRemovalFailure = t.step_func(function (error) {
-        assert_unreached("removeMessages() error callback: name:" + error.name + ", msg:" + error.message);
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    findSuccessCB = t.step_func(function (messages) {
-        // Remove all found message to be sure that newly sent message
-        // will create new conversation
-        if(messages.length > 0) {
-            service.messageStorage.removeMessages(messages, messagesRemoved, messageRemovalFailure);
-        }
-        else {
-            messagesRemoved();
-        }
-    });
+    removeAllSuccess = t.step_func(function () {
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
 
-    findErrorCB = t.step_func(function (error) {
-        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
+        message = new tizen.Message("messaging.sms", smsMessageInitDict);
+        service.sendMessage(message, null, sendError);
     });
 
-    serviceListCB = t.step_func(function (services) {
-        assert_true(services.length > 0, "No message service found");
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
-        // precondition - find and remove conversation if already exists
-        filter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT_2);
-        service.messageStorage.findMessages(filter, findSuccessCB, findErrorCB);
+        removeAllMessages(t, service, removeAllSuccess);
     });
 
     serviceError = t.step_func(function (error) {
         assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    tizen.messaging.getMessageServices("messaging.sms", serviceListCB, serviceError);
+    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
 });
 
 </script>
diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html
new file mode 100755 (executable)
index 0000000..5a545fb
--- /dev/null
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<!--
+Copyright (c) 2013 Samsung Electronics Co., Ltd.
+
+Licensed under the Apache License, Version 2.0 (the License);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+Authors:
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+
+-->
+<html>
+<head>
+<title>MessageConversationsChangeCallback_conversationsremoved_withfilter</title>
+<meta charset="utf-8"/>
+<script type="text/javascript" src="../resources/unitcommon.js"></script>
+<script type="text/javascript" src="support/messaging_common.js"></script>
+</head>
+
+<body>
+<div id="log"></div>
+<script>
+//==== TEST: MessageConversationsChangeCallback_conversationsremoved_withfilter
+//==== LABEL Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsremoved, sms
+//==== SPEC Tizen Web API:Communication:Messaging:MessageConversationsChangeCallback:conversationsremoved M
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== ONLOAD_DELAY 90
+//==== TEST_CRITERIA CBOA
+setup({ timeout: 90000 });
+var t = async_test("MessageConversationsChangeCallback_conversationsremoved_withfilter", {timeout: 90000}), changeCallback,
+    serviceSuccess, serviceError, service, message,
+    removeAllSuccess, sendSuccess, sendError, conversationChangeCB,
+    removeConversationError, removedConversationId;
+
+t.step(function () {
+    add_result_callback(function (res) {
+        try {
+            service.messageStorage.removeChangeListener(watcherId);
+        } catch (err) {
+            // do nothing in case removeChangeListener throw an exception
+        }
+    });
+
+    removeConversationError = t.step_func(function (error) {
+        assert_unreached("removeConversations() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    conversationChangeCB = {
+        conversationsadded : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message.conversationId) {
+                    removedConversationId = conversations[i].id;
+                    service.messageStorage.removeConversations([conversations[i]], null, removeConversationError);
+                    break;
+                }
+            }
+        }),
+        conversationsremoved : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            t.done();
+        })
+    };
+
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    removeAllSuccess = t.step_func(function () {
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
+
+        message = new tizen.Message("messaging.sms", smsMessageInitDict);
+        service.sendMessage(message, null, sendError);
+    });
+
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
+        service = services[0];
+        removeAllMessages(t, service, removeAllSuccess);
+    });
+
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
+});
+</script>
+</body>
+</html>
diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html
new file mode 100755 (executable)
index 0000000..3b06a77
--- /dev/null
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<!--
+Copyright (c) 2013 Samsung Electronics Co., Ltd.
+
+Licensed under the Apache License, Version 2.0 (the License);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+Authors:
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+
+-->
+<html>
+<head>
+<title>MessageConversationsChangeCallback_conversationsremoved_withoutfilter</title>
+<meta charset="utf-8"/>
+<script type="text/javascript" src="../resources/unitcommon.js"></script>
+<script type="text/javascript" src="support/messaging_common.js"></script>
+</head>
+
+<body>
+<div id="log"></div>
+<script>
+//==== TEST: MessageConversationsChangeCallback_conversationsremoved_withoutfilter
+//==== LABEL Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsremoved, sms
+//==== SPEC Tizen Web API:Communication:Messaging:MessageConversationsChangeCallback:conversationsremoved M
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== ONLOAD_DELAY 90
+//==== TEST_CRITERIA CBOA
+setup({ timeout: 90000 });
+var t = async_test("MessageConversationsChangeCallback_conversationsremoved_withoutfilter", {timeout: 90000}), changeCallback,
+    serviceSuccess, serviceError, service, message,
+    removeAllSuccess, sendSuccess, sendError, conversationChangeCB,
+    removeConversationError, removedConversationId;
+
+t.step(function () {
+    add_result_callback(function (res) {
+        try {
+            service.messageStorage.removeChangeListener(watcherId);
+        } catch (err) {
+            // do nothing in case removeChangeListener throw an exception
+        }
+    });
+
+    removeConversationError = t.step_func(function (error) {
+        assert_unreached("removeConversations() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    conversationChangeCB = {
+        conversationsadded : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message.conversationId) {
+                    removedConversationId = conversations[i].id;
+                    service.messageStorage.removeConversations([conversations[i]], null, removeConversationError);
+                    break;
+                }
+            }
+        }),
+        conversationsremoved : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            t.done();
+        })
+    };
+
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    removeAllSuccess = t.step_func(function () {
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
+
+        message = new tizen.Message("messaging.sms", mmsMessageInitDict);
+        service.sendMessage(message, null, sendError);
+    });
+
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
+        service = services[0];
+        removeAllMessages(t, service, removeAllSuccess);
+    });
+
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
+});
+</script>
+</body>
+</html>
old mode 100644 (file)
new mode 100755 (executable)
index 3e5246b..c2e8706
@@ -52,50 +52,61 @@ Authors:
 //  Check the conversationupdated method when some message updated with argument filter
 setup({timeout:90000});
 var t = async_test("MessageConversationsChangeCallback_conversationsupdated_withfilter", {timeout: 90000}),
-    service, messageStorage, conversationChangeCB, filter, addSuccess, add2Success, serviceListCB, watchId;
+    serviceSuccess, serviceError, service, message1, message2, removeAllSuccess,
+    filter, sendSuccess, sendError, conversationChangeCB;
 
-t.step(function () {    //cleanup after TC
-    add_result_callback(function () {
+t.step(function () {
+
+    add_result_callback(function (res) {
         try {
-            messageStorage.removeChangeListener(watchId);
+            service.messageStorage.removeChangeListener(watcherId);
         } catch (err) {
             // do nothing in case removeChangeListener throw an exception
         }
     });
 
     conversationChangeCB = {
-        conversationsupdated: t.step_func(function (conversations) {
-            assert_true(conversations.length > 0, "conversations updated!");
-            t.done();
-        }),
-        conversationsadded: t.step_func(function (conversations) {
-            assert_unreached("should not in conversationsadded: " + conversations.length);
-        }),
-        conversationsremoved: t.step_func(function (conversations) {
-            assert_unreached("should not in conversationsremoved: " + conversations.length);
+        conversationsupdated : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message2.conversationId) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
-    add2Success = t.step_func(function () {
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    sendSuccess = t.step_func(function () {
+        filter = new tizen.AttributeFilter("to", "CONTAINS", smsMessageInitDict.to[0]);
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB, filter);
+
+        message2 = new tizen.Message("messaging.sms", smsMessageInitDict);
+        service.sendMessage(message2, null, sendError);
     });
 
-    addSuccess = t.step_func(function () {
-        filter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.sms");
-        watchId = messageStorage.addConversationsChangeListener(conversationChangeCB, filter);
-        //add next draft message to conversation and trigger conversationsupdated
-        addSMSDraft(t, service, smsMessageInitDict, add2Success);
+    removeAllSuccess = t.step_func(function () {
+        message1 = new tizen.Message("messaging.sms", smsMessageInitDict);
+        service.sendMessage(message1, sendSuccess, sendError);
     });
 
-    serviceListCB = t.step_func(function (services) {
-        assert_true(services.length > 0, "Received empty services array");
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
-        messageStorage = service.messageStorage;
-        addSMSDraft(t, service, smsMessageInitDict, addSuccess);
+        removeAllMessages(t, service, removeAllSuccess);
     });
 
-    tizen.messaging.getMessageServices("messaging.sms", serviceListCB);
-});
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
+    });
 
+    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
+});
 </script>
 </body>
 </html>
old mode 100644 (file)
new mode 100755 (executable)
index 700bbd8..283106e
@@ -52,50 +52,60 @@ Authors:
 //  Check the conversationupdated method when no message updated
 setup({timeout:90000});
 var t = async_test("MessageConversationsChangeCallback_conversationsupdated_withoutfilter", {timeout: 90000}),
-    service, messageStorage, conversationChangeCB, addSuccess, add2Success, serviceListCB, watchId;
+    serviceSuccess, serviceError, service, message1, message2,
+    removeAllSuccess, sendSuccess, sendError, conversationChangeCB;
 
 t.step(function () {
-    //cleanup after TC
-    add_result_callback(function () {
+
+    add_result_callback(function (res) {
         try {
-            messageStorage.removeChangeListener(watchId);
+            service.messageStorage.removeChangeListener(watcherId);
         } catch (err) {
             // do nothing in case removeChangeListener throw an exception
         }
     });
 
     conversationChangeCB = {
-        conversationsupdated: t.step_func(function (conversations) {
-            assert_true(conversations.length > 0, "conversations updated!");
-            t.done();
-        }),
-        conversationsadded: t.step_func(function (conversations) {
-            assert_unreached("should not in conversationsadded: " + conversations.length);
-        }),
-        conversationsremoved: t.step_func(function (conversations) {
-            assert_unreached("should not in conversationsremoved: " + conversations.length);
+        conversationsupdated : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message2.conversationId) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
-    add2Success = t.step_func(function () {
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    sendSuccess = t.step_func(function () {
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
+
+        message2 = new tizen.Message("messaging.sms", smsMessageInitDict);
+        service.sendMessage(message2, null, sendError);
     });
 
-    addSuccess = t.step_func(function () {
-        watchId = messageStorage.addConversationsChangeListener(conversationChangeCB);
-        //add next draft message to conversation and trigger conversationsupdated
-        addSMSDraft(t, service, smsMessageInitDict, add2Success);
+    removeAllSuccess = t.step_func(function () {
+        message1 = new tizen.Message("messaging.sms", smsMessageInitDict);
+        service.sendMessage(message1, sendSuccess, sendError);
     });
 
-    serviceListCB = t.step_func(function (services) {
-        assert_true(services.length > 0, "Received empty services array");
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
-        messageStorage = service.messageStorage;
-        addSMSDraft(t, service, smsMessageInitDict, addSuccess);
+        removeAllMessages(t, service, removeAllSuccess);
     });
 
-    tizen.messaging.getMessageServices("messaging.sms", serviceListCB);
-});
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
+    });
 
+    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
+});
 </script>
 </body>
 </html>
diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html
deleted file mode 100644 (file)
index 706bf17..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2013 Samsung Electronics Co., Ltd.
-
-Licensed under the Apache License, Version 2.0 (the License);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-Authors:
-        Andrzej Krolikowski <a.krolikowsk@samsung.com>
-
--->
-<html>
-<head>
-<title>MessageConversationsChangeCallback_sms_conversationsremoved</title>
-<meta charset="utf-8"/>
-<script type="text/javascript" src="../resources/unitcommon.js"></script>
-<script type="text/javascript" src="support/messaging_common.js"></script>
-</head>
-
-<body>
-<div id="log"></div>
-<script>
-//==== TEST: MessageConversationsChangeCallback_sms_conversationsremoved
-//==== LABEL Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsremoved, sms
-//==== SPEC Tizen Web API:Communication:Messaging:MessageConversationsChangeCallback:conversationsremoved M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
-//==== ONLOAD_DELAY 90
-//==== TEST_CRITERIA CBOA
-setup({ timeout: 90000 });
-var t = async_test("MessageConversationsChangeCallback_sms_conversationsremoved", {timeout: 90000}), changeCallback,
-    serviceSuccess, serviceError, messageService, messageStorage,
-    initDict = smsMessageInitDict, message,
-    addSuccess, addError, messageFilter,
-    findMessageSuccess, findMessageError, foundMessage, conversationFilter,
-    findConversationSuccess, findConversationError, foundConversation, listenerId,
-    removeConversationError, returnedValue;
-
-t.step(function () {
-    //cleanup after TC
-    add_result_callback(function () {
-        try {
-            messageStorage.removeChangeListener(listenerId);
-        } catch (err) {
-            // do nothing in case removeChangeListener throw an exception
-        }
-    });
-
-    changeCallback = {
-        conversationsadded: t.step_func(function (addedConversations) {
-            assert_unreached("conversationsadded invoked");
-        }),
-        conversationsupdated: t.step_func(function (updatedConversations) {
-            assert_unreached("conversationsupdated invoked");
-        }),
-        conversationsremoved: t.step_func(function (removedConversations) {
-            assert_type(removedConversations, "array", "Not an array");
-            assert_equals(removedConversations.length, 1, "Incorrect length of conversations.");
-            t.done();
-        })
-    };
-
-    removeConversationError = t.step_func(function (error) {
-        assert_unreached("removeConversations() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    findConversationSuccess = t.step_func(function (conversations) {
-        assert_equals(conversations.length, 1, "Incorrect number of found conversations");
-        foundConversation = conversations[0];
-
-        listenerId = messageStorage.addConversationsChangeListener(changeCallback);
-        returnedValue = messageStorage.removeConversations([foundConversation], null, removeConversationError);
-        assert_equals(returnedValue, undefined, "Incorrect returned value");
-    });
-
-    findConversationError = t.step_func(function (error) {
-        assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    findMessageSuccess = t.step_func(function (messages) {
-        assert_equals(messages.length, 1, "Incorrect number of found messages");
-        foundMessage = messages[0];
-
-        conversationFilter = new tizen.AttributeFilter("id", "EXACTLY", foundMessage.conversationId);
-        messageStorage.findConversations(conversationFilter, findConversationSuccess, findConversationError);
-    });
-
-    findMessageError = t.step_func(function (error) {
-        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    addSuccess = t.step_func(function () {
-        messageFilter = new tizen.AttributeFilter("id", "EXACTLY", message.id);
-        messageStorage.findMessages(messageFilter, findMessageSuccess, findMessageError);
-    });
-
-    addError = t.step_func(function (error) {
-        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    serviceSuccess = t.step_func(function (services) {
-        assert_greater_than(services.length, 0, "Received empty services array");
-        messageService = services[0];
-        messageStorage = messageService.messageStorage;
-
-        message = new tizen.Message("messaging.sms", initDict);
-        messageService.messageStorage.addDraftMessage(message, addSuccess, addError);
-    });
-
-    serviceError = t.step_func(function (error) {
-        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
-});
-
-</script>
-</body>
-</html>
diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html
deleted file mode 100644 (file)
index 7f83fb3..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2013 Samsung Electronics Co., Ltd.
-
-Licensed under the Apache License, Version 2.0 (the License);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-Authors:
-        Andrzej Krolikowski <a.krolikowsk@samsung.com>
-
--->
-<html>
-<head>
-<title>MessageConversationsChangeCallback_sms_conversationsupdated</title>
-<meta charset="utf-8"/>
-<script type="text/javascript" src="../resources/unitcommon.js"></script>
-<script type="text/javascript" src="support/messaging_common.js"></script>
-</head>
-
-<body>
-<div id="log"></div>
-<script>
-//==== TEST: MessageConversationsChangeCallback_sms_conversationsupdated
-//==== LABEL Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsupdated, sms
-//==== SPEC Tizen Web API:Communication:Messaging:MessageConversationsChangeCallback:conversationsupdated M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
-//==== ONLOAD_DELAY 90
-//==== TEST_CRITERIA CBOA
-setup({ timeout: 90000 });
-var t = async_test("MessageConversationsChangeCallback_sms_conversationsupdated", {timeout: 90000}), changeCallback,
-    serviceSuccess, serviceError, messageService, messageStorage, listenerId,
-    initDict = smsMessageInitDict, addDraftMessage1st, addDraftMessage2nd,
-    addSuccess1st, addError1st, addError2nd, timestampBeforeChange;
-
-t.step(function () {
-    //cleanup after TC
-    add_result_callback(function () {
-        try {
-            messageStorage.removeChangeListener(listenerId);
-        } catch (err) {
-            // do nothing in case removeChangeListener throw an exception
-        }
-    });
-
-    changeCallback = {
-        conversationsadded: t.step_func(function (addedConversations) {
-            assert_unreached("conversationsadded invoked");
-        }),
-        conversationsupdated: t.step_func(function (updatedConversations) {
-            assert_equals(updatedConversations.length, 1, "Incorrect length of conversations.");
-            check_readonly(updatedConversations[0], "id", updatedConversations[0].id, "string", "dummyValue");
-            check_readonly(updatedConversations[0], "type", "messaging.sms", "string", "dummyValue");
-            assert_true(updatedConversations[0].timestamp instanceof Date, "Not a date");
-            timestampBeforeChange = updatedConversations[0].timestamp.getTime();
-            updatedConversations[0].timestamp = new Date();
-            assert_equals(updatedConversations[0].timestamp.getTime(), timestampBeforeChange, "timestamp modified");
-            check_readonly(updatedConversations[0], "messageCount", updatedConversations[0].messageCount, "number", 123);
-            check_readonly(updatedConversations[0], "unreadMessages", updatedConversations[0].unreadMessages, "number", 123);
-            check_readonly(updatedConversations[0], "preview", updatedConversations[0].preview, "string", "dummyValue");
-            check_readonly(updatedConversations[0], "isRead", updatedConversations[0].isRead, "boolean", "dummyValue");
-            check_readonly(updatedConversations[0], "lastMessageId", updatedConversations[0].lastMessageId, "string", "dummyValue");
-            t.done();
-        }),
-        conversationsremoved: t.step_func(function (removedConversations) {
-            assert_unreached("conversationsremoved invoked");
-        })
-    };
-
-    addError2nd = t.step_func(function (error) {
-        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    addSuccess1st = t.step_func(function () {
-        listenerId = messageStorage.addConversationsChangeListener(changeCallback);
-
-        addDraftMessage2nd = new tizen.Message("messaging.sms", initDict);
-        messageService.messageStorage.addDraftMessage(addDraftMessage2nd, function (){}, addError2nd);
-    });
-
-    addError1st = t.step_func(function (error) {
-        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    serviceSuccess = t.step_func(function (services) {
-        assert_greater_than(services.length, 0, "Received empty services array");
-        messageService = services[0];
-        messageStorage = messageService.messageStorage;
-
-        addDraftMessage1st = new tizen.Message("messaging.sms", initDict);
-        messageService.messageStorage.addDraftMessage(addDraftMessage1st, addSuccess1st, addError1st);
-    });
-
-    serviceError = t.step_func(function (error) {
-        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
-});
-
-</script>
-</body>
-</html>
old mode 100644 (file)
new mode 100755 (executable)
index 85465bf..e602a02
@@ -52,47 +52,53 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test("MessageStorage_addConversationsChangeListener_withoutfilter", {timeout: 90000}),
-    service, msg, conversationChangeCB, serviceListCB, watchId, messageStorage;
+    serviceSuccess, serviceError, service, message, removeAllSuccess, sendError, conversationChangeCB;
 
 t.step(function () {
+    add_result_callback(function (res) {
+        try {
+            service.messageStorage.removeChangeListener(watcherId);
+        } catch (err) {
+            // do nothing in case removeChangeListener throw an exception
+        }
+    });
+
     conversationChangeCB = {
-        conversationsadded: t.step_func(function (conversations) {
-            assert_greater_than(conversations.length, 0, "Received empty add conversations array");
-            t.done();
-        }),
-        conversationsupdated: t.step_func(function (conversations) {
-            assert_greater_than(conversations.length, 0, "Received empty update conversations array");
-            t.done();
-        }),
-        conversationsremoved: t.step_func(function (conversations) {
-            assert_unreached("conversations removed: " + conversations.length);
+        conversationsadded : t.step_func(function (conversations) {
+            assert_type(conversations, "array", "conversations");
+            assert_greater_than(conversations.length, 0, "Received empty conversations array");
+            for (var i in conversations) {
+                if (conversations[i].id === message.conversationId) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
-    serviceListCB = t.step_func(function (services) {
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    removeAllSuccess = t.step_func(function () {
+        watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
+
+        message = new tizen.Message("messaging.sms", smsMessageInitDict);
+        service.sendMessage(message, null, sendError);
+    });
+
+    serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
-        messageStorage = service.messageStorage;
-        watchId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
-        msg = new tizen.Message("messaging.sms", {
-            plainBody: "test.",
-            to: [TEST_SMS_RECIPIENT]
-        });
-        service.messageStorage.addDraftMessage(msg);
+        removeAllMessages(t, service, removeAllSuccess);
     });
 
-    tizen.messaging.getMessageServices("messaging.sms", serviceListCB);
-});
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
+    });
 
-//cleanup after TC
-add_result_callback(function () {
-    try {
-        messageStorage.removeChangeListener(watchId);
-    } catch (err) {
-        // do nothing in case removeChangeListener throw an exception
-    }
+    tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
 });
-
 </script>
 </body>
 </html>
old mode 100644 (file)
new mode 100755 (executable)
index f24b7e4..c7d040f
@@ -58,16 +58,16 @@ var t = async_test("MessageStorage_addMessagesChangeListener_withfilter", {timeo
 
 t.step(function (){
     messageChangeCallback = {
-        messagesupdated : t.step_func(function (messages) {
-            assert_unreached("messages updated invoked.");
-        }),
         messagesadded : t.step_func(function (messages) {
-            assert_type(messages, "array", "Not an array");
-            assert_equals(messages.length, 1, "Incorrect number of messages.");
-            t.done();
-        }),
-        messagesremoved : t.step_func(function (messages) {
-            assert_unreached("messages removed invoked.");
+            assert_type(messages, "array", "Not an array.");
+            assert_greater_than(messages.length, 0, "Received empty messages array");
+            for (var i in messages) {
+                assert_true(messages[i] instanceof tizen.Message, "Not a message.");
+                if (messages[i].id === message.id) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
old mode 100644 (file)
new mode 100755 (executable)
index 0114d5a..fdf4ee3
@@ -55,21 +55,26 @@ var t = async_test("MessageStorage_addMessagesChangeListener_withoutfilter", {ti
     service, listenerId, serviceListCB, message, messageStorage, messageChangeCallback,
     serviceError;
 t.step(function () {
+    //cleanup after TC
+    add_result_callback(function () {
+        try {
+            messageStorage.removeChangeListener(listenerId);
+        } catch (err) {
+            // do nothing in case removeChangeListener throw an exception
+        }
+    });
+
     messageChangeCallback = {
-        messagesupdated : t.step_func(function (messages) {
-            assert_unreached("messages updated invoked.");
-        }),
         messagesadded : t.step_func(function (messages) {
-            try {
-                assert_type(messages, "array", "Not an array");
-                assert_equals(messages.length, 1, "Incorrect number of messages.");
-            } finally {
-                messageStorage.removeChangeListener(listenerId);
+            assert_type(messages, "array", "Not an array.");
+            assert_greater_than(messages.length, 0, "Received empty messages array");
+            for (var i in messages) {
+                assert_true(messages[i] instanceof tizen.Message, "Not a message.");
+                if (messages[i].id === message.id) {
+                    t.done();
+                    break;
+                }
             }
-            t.done();
-        }),
-        messagesremoved : t.step_func(function (messages) {
-            assert_unreached("messages removed invoked.");
         })
     };
 
old mode 100644 (file)
new mode 100755 (executable)
index 922d69f..18e5d5b
@@ -51,7 +51,7 @@ Authors:
 setup({timeout:90000});
 
 var t = async_test("MessagesChangeCallback_messagesadded_withoutfilter", {timeout:90000}),
-    serviceError, serviceSuccess, sendSuccess, sendError, msg, messageChangeCB, service, watcherId;
+    serviceError, serviceSuccess, sendSuccess, sendError, message, messageChangeCB, service, watcherId;
 
 t.step(function () {
 
@@ -64,15 +64,16 @@ t.step(function () {
     });
 
     messageChangeCB = {
-        messagesadded: t.step_func(function (msgs) {
-            assert_true(msgs.length > 0, "messages added!");
-            t.done();
-        }),
-        messagesupdated: t.step_func(function (msgs) {
-            assert_unreached("should not in messagesupdated");
-        }),
-        messagesremoved: t.step_func(function (msgs) {
-            assert_unreached("should not in messagesremoved");
+        messagesadded: t.step_func(function (addedMessages) {
+            assert_type(addedMessages, "array", "Not an array.");
+            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) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
@@ -86,9 +87,9 @@ t.step(function () {
         // registers to be notified when the storage changes
         service = services[0];
         watcherId = service.messageStorage.addMessagesChangeListener(messageChangeCB);
-        msg = new tizen.Message("messaging.sms",
+        message = new tizen.Message("messaging.sms",
                 {plainBody : "test.",to : [ TEST_SMS_RECIPIENT_2 ]});
-        service.sendMessage(msg, sendSuccess, sendError);
+        service.sendMessage(message, sendSuccess, sendError);
     });
 
     serviceError = t.step_func(function (error) {
old mode 100644 (file)
new mode 100755 (executable)
index c98f9f4..3b8cf25
@@ -65,9 +65,16 @@ t.step(function () {
     });
 
     messageChangeCB = {
-        messagesupdated: t.step_func(function (messages) {
-            assert_greater_than(messages.length, 0, "No messages updated!");
-            t.done();
+        messagesupdated: t.step_func(function (updatedMessages) {
+            assert_type(updatedMessages, "array", "Not an array.");
+            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 === msg.id) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
old mode 100644 (file)
new mode 100755 (executable)
index 2ee5025..ca2379b
@@ -65,15 +65,14 @@ 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) {
+                    messageService.loadMessageBody(addedMessages[i], loadSuccess, loadError);
+                    break;
+                }
+            }
         })
     };
 
old mode 100644 (file)
new mode 100755 (executable)
index 625c93d..26a4140
@@ -53,18 +53,17 @@ t.step(function () {
     });
 
     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) {
+                    t.done();
+                    break;
+                }
+            }
         })
     };
 
old mode 100644 (file)
new mode 100755 (executable)
index 8407286..176e1b9
@@ -63,17 +63,17 @@ 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) {
+                    messageService.loadMessageBody(updatedMessages[i], loadSuccess, loadError);
+                    break;
+                }
+            }
         })
     };
 
old mode 100644 (file)
new mode 100755 (executable)
index d1f1795..dbf66e6
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsremoved, sms" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageConversationsChangeCallback_sms_conversationsremoved">
+      <testcase purpose="check the function of conversationsremoved in MessageConversationsChangeCallback by withoutfilter" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageConversationsChangeCallback_conversationsremoved_withoutfilter">
         <description>
-          <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html</test_script_entry>
+          <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html</test_script_entry>
         </description>
         <specs>
           <spec>
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsupdated, sms" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageConversationsChangeCallback_sms_conversationsupdated">
+      <testcase purpose="check the function of conversationsremoved in MessageConversationsChangeCallback by withfilter" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageConversationsChangeCallback_conversationsremoved_withfilter">
         <description>
-          <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html</test_script_entry>
+          <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html</test_script_entry>
         </description>
         <specs>
           <spec>
old mode 100644 (file)
new mode 100755 (executable)
index 07507dd..99c3a41
           <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsremoved, sms" onload_delay="90" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageConversationsChangeCallback_sms_conversationsremoved">
+      <testcase purpose="check the function of conversationsremoved in MessageConversationsChangeCallback by withoutfilter" onload_delay="90" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageConversationsChangeCallback_conversationsremoved_withoutfilter">
         <description>
-          <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html</test_script_entry>
+          <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withoutfilter.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsupdated, sms" onload_delay="90" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageConversationsChangeCallback_sms_conversationsupdated">
+      <testcase purpose="check the function of conversationsremoved in MessageConversationsChangeCallback by withfilter" onload_delay="90" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageConversationsChangeCallback_conversationsremoved_withfilter">
         <description>
-          <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html</test_script_entry>
+          <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsremoved_withfilter.html</test_script_entry>
         </description>
       </testcase>
       <testcase purpose="Check if MessageServiceArraySuccessCallback is called and if its arguments have proper type for sms" onload_delay="90" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageServiceArraySuccessCallback_sms_onsuccess">