From: Andrzej Krolikowski <a.krolikowsk@samsung.com>
Date: Wed, 21 Aug 2013 12:16:26 +0000 (+0200)
Subject: [Messaging-email][Messaging-mms][Messaging-sms] corrected error messages.
X-Git-Tag: 2.2.1_release~114^2~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ddf05d3c339be5ceb5e0106a3db22f870f8748a;p=test%2Ftct%2Fweb%2Fapi.git

[Messaging-email][Messaging-mms][Messaging-sms] corrected error messages.

Also removed residues traces of sending messages.

Change-Id: Ifb742384776134e0a4d053e233302abdd89b9731
---

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 11a260214..808a21b3c 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html
@@ -39,16 +39,15 @@ Authors:
 //==== TEST_CRITERIA CBT CBOA
 
 setup({timeout: 90000});
-var t = async_test("MessageAttachmentSuccessCallback_email_onsuccess", {timeout:90000});
+var t = async_test("MessageAttachmentSuccessCallback_email_onsuccess", {timeout:90000}),
+    messageService, messageStorage, currentDate = new Date(),
+    subjectToSet = currentDate.getTime().toString(), inboxFolder,
+    message, attachment, syncSuccess, filterFolder,
+    findSuccess, findError, foundMessage, returnedValue = null,
+    loadAttachmentSuccess, loadAttachmentError, inboxFolderId,
+    loadBodySuccess, loadBodyError, loadMessage,
+    folderSuccess, folderError, filterSubject, filterFolderId, compositefilter;
 t.step(function () {
-    var messageService, messageStorage,
-        currentDate = new Date(),
-        subjectToSet = currentDate.getTime().toString(),
-        message, attachment, syncSuccess, filterFolder,
-        findSuccess, findError, foundMessage, returnedValue,
-        loadAttachmentSuccess, loadAttachmentError, inboxFolderId,
-        loadBodySuccess, loadBodyError, loadMessage,
-        folderSuccess, folderError, j, filterSubject, filterFolderId, compositefilter;
 
     loadAttachmentSuccess = t.step_func(function (fattachment) {
         assert_equals(returnedValue, undefined, "Incorrect returned value from loadMessageAttachment");
@@ -92,16 +91,12 @@ t.step(function () {
     });
 
     findError = t.step_func(function (error) {
-        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
+        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     folderSuccess = t.step_func(function (folders) {
-        for(j = 0; j < folders.length; j++) {
-            if (folders[j].type === EMAIL_INBOX_FOLDER_TYPE) {
-                inboxFolderId = folders[j].id;
-                break;
-            }
-        }
+        inboxFolder = findInboxFolder(t, folders);
+        inboxFolderId = inboxFolder.id;
 
         filterSubject = new tizen.AttributeFilter("subject", "EXACTLY", subjectToSet);
         filterFolderId = new tizen.AttributeFilter("folderId", "EXACTLY", inboxFolderId);
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 8b07b75d7..692989e45 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html
@@ -30,7 +30,7 @@ Authors:
 <div id="log"></div>
 <script>
 //==== TEST: MessageService_email_loadMessageAttachment
-//==== LABEL Check with non-optional arguments loadMessageAttachment - email
+//==== LABEL Check MessageService.loadMessageAttachment method with optional arguments (email)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
 //==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 90
@@ -38,13 +38,13 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test("MessageService_email_loadMessageAttachment", {timeout:90000}),
-    messageService, messageStorage,
+    messageService, messageStorage, inboxFolder,
     currentDate = new Date(), subjectToSet = currentDate.getTime().toString(),
     message, attachment, syncSuccess, filterFolder, returnedValue,
     findSuccess, findError, foundMessage,
     loadAttachmentSuccess, loadAttachmentError, inboxFolderId,
     loadBodySuccess, loadBodyError, loadMessage,
-    folderSuccess, folderError, j, filterSubject, filterFolderId, compositefilter;
+    folderSuccess, folderError, filterSubject, filterFolderId, compositefilter;
 
 t.step(function () {
 
@@ -90,16 +90,12 @@ t.step(function () {
     });
 
     findError = t.step_func(function (error) {
-        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
+        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     folderSuccess = t.step_func(function (folders) {
-        for(j = 0; j < folders.length; j++) {
-            if (folders[j].type === EMAIL_INBOX_FOLDER_TYPE) {
-                inboxFolderId = folders[j].id;
-                break;
-            }
-        }
+        inboxFolder = findInboxFolder(t, folders);
+        inboxFolderId = inboxFolder.id;
 
         filterSubject = new tizen.AttributeFilter("subject", "EXACTLY", subjectToSet);
         filterFolderId = new tizen.AttributeFilter("folderId", "EXACTLY", inboxFolderId);
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 c489f6918..03a86c905 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
@@ -31,7 +31,7 @@ Authors:
 <div id="log"></div>
 <script>
 //==== TEST: MessageService_email_loadMessageAttachment_without_errorCallback
-//==== LABEL Check with non-optional arguments loadMessageAttachment - email, without errorCallback
+//==== LABEL Check MessageService.loadMessageAttachment method with non-optional arguments (email)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
 //==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 90
@@ -39,13 +39,13 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test("MessageService_email_loadMessageAttachment_without_errorCallback", {timeout: 90000}),
-    messageService, messageStorage,
+    messageService, messageStorage, inboxFolder,
     currentDate = new Date(), subjectToSet = currentDate.getTime().toString(),
     message, attachment, syncSuccess, returnedValue, filterFolder,
     findSuccess, findError, foundMessage,
     loadAttachmentSuccess, inboxFolderId,
     loadBodySuccess, loadBodyError, loadMessage,
-    folderSuccess, folderError, j, filterSubject, filterFolderId, compositefilter;
+    folderSuccess, folderError, filterSubject, filterFolderId, compositefilter;
 
 t.step(function () {
     loadAttachmentSuccess = t.step_func(function (f_attachment) {
@@ -86,16 +86,12 @@ t.step(function () {
     });
 
     findError = t.step_func(function (error) {
-        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
+        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     folderSuccess = t.step_func(function (folders) {
-        for(j = 0; j < folders.length; j++) {
-            if (folders[j].type === EMAIL_INBOX_FOLDER_TYPE) {
-                inboxFolderId = folders[j].id;
-                break;
-            }
-        }
+        inboxFolder = findInboxFolder(t, folders);
+        inboxFolderId = inboxFolder.id;
 
         filterSubject = new tizen.AttributeFilter("subject", "EXACTLY", subjectToSet);
         filterFolderId = new tizen.AttributeFilter("folderId", "EXACTLY", inboxFolderId);
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncLoadMsgSendMsg.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncLoadMsgSendMsg.html
index e7f4c3aa2..000259fb8 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncLoadMsgSendMsg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncLoadMsgSendMsg.html
@@ -34,7 +34,7 @@ Authors:
 
 <html>
 <head>
-<title>Sync all folders and load message (body) and send it.</title>
+<title>MessageService_syncLoadMsgSendMsg</title>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
 </head>
@@ -42,29 +42,23 @@ Authors:
 <div id="log"></div>
 <script type="text/javascript">
 //==== TEST: MessageService_syncLoadMsgSendMsg
-//==== LABEL Sync all folders and load message (body) and send it
+//==== LABEL Add message to draft folder, sync all folders, load message body and send it
 //==== PRIORITY P3
-//==== STEP Sync all folders and load message (body) and send it
-//==== EXPECT The function runs normally
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:MessageService U
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 120
 //==== TEST_CRITERIA
 setup({timeout: 120000});
-var t = async_test("MessageService_syncLoadMsgSendMsg", {timeout: 120000});
+var t = async_test("MessageService_syncLoadMsgSendMsg", {timeout: 120000}),
+    serviceSuccess, successSync, failedSync, service, findSuccess, findError, i,
+    loadMessageSuccess, loadMessageError, messageSentSuccess, serviceError,
+    messageStorage, addDraftSuccess, addDraftError, message;
 t.step(function () {
-    var serviceListCB, successSync, failedSync, service, findSuccess, findError, i,
-        loadMessageSuccess, loadMessageError, messageSentSuccess, messageSendFailed,
-        messageStorage, addDraftSuccess, addDraftError, message;
 
     messageSentSuccess = t.step_func(function () {
         t.done();
     });
 
-    messageSendFailed = t.step_func(function (error) {
-        assert_unreached("fail to send message - error: " + error.message);
-    });
-
     loadMessageSuccess = t.step_func(function (msg) {
         assert_own_property(msg, "id", "Name id doesn't exist in provided object.");
         assert_equals(msg.id, message.id, "Id is not equal");
@@ -128,16 +122,16 @@ t.step(function () {
     });
 
     loadMessageError = t.step_func(function (error) {
-        assert_unreached("fail to load message body - error: " + error.message);
+        assert_unreached("loadMessageBody() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     findSuccess = t.step_func(function (messages) {
-        assert_true(messages.length === 1, "Received incorrect number of messages: " + messages.length);
+        assert_equals(messages.length, 1, "Received incorrect number of messages.");
         service.loadMessageBody(messages[0], loadMessageSuccess, loadMessageError);
     });
 
     findError = t.step_func(function (error) {
-        assert_unreached("fail to find message with filter - error: " + error.message);
+        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     successSync = t.step_func(function () {
@@ -145,7 +139,7 @@ t.step(function () {
     });
 
     failedSync = t.step_func(function (error) {
-        assert_unreached("fail to sync with server - error: " + error.message);
+        assert_unreached("sync() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     addDraftSuccess = t.step_func(function () {
@@ -153,11 +147,11 @@ t.step(function () {
     });
 
     addDraftError = t.step_func(function (error) {
-        assert_unreached("fail to addDraft - error: " + error.message);
+        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    serviceListCB = t.step_func(function (services) {
-        assert_true(services.length > 0, "No Messageservice found.");
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
         messageStorage = service.messageStorage;
 
@@ -168,8 +162,13 @@ t.step(function () {
         messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
-    tizen.messaging.getMessageServices("messaging.email", serviceListCB);
-}, "MessageService_syncLoadMsgSendMsg");
-    </script>
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
+});
+
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html
index aedda07a6..03435d73c 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html
@@ -31,49 +31,50 @@ Authors:
 <div id="log"></div>
 <script>
 //==== TEST: MessageStorage_email_findMessages
-//==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback) id for email
+//==== LABEL Check MessageStorage.findMessages method with non-optional arguments (filter by Message.id) for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
 //==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 90
 //==== TEST_CRITERIA MMINA
-setup({timeout:90000});
+setup({timeout: 90000});
 
-var t = async_test("MessageStorage_email_findMessages", {timeout:90000});
+var t = async_test("MessageStorage_email_findMessages", {timeout: 90000}),
+    serviceError, serviceSuccess, messageService, messageStorage,
+    message, addDraftSuccess, addDraftError, filter, findSuccess;
 t.step(function () {
-    var getMessageServicesErrorCB, getMessageServicesSuccessCB, messageService, messageStorage,
-        message, addDraftSuccessCB, addDraftErrorCB, filter, findSuccessCB, i;
 
-    findSuccessCB = t.step_func(function (msg) {
-        assert_true(msg.length === 1, "Received incorrect number of messages: " + msg.length);
+    findSuccess = t.step_func(function (msg) {
+        assert_equals(msg.length, 1, "Received incorrect number of messages.");
+        assert_equals(msg[0].id, message.id, "Incorrect message id.");
 
         t.done();
     });
 
-    addDraftSuccessCB = t.step_func(function () {
+    addDraftSuccess = t.step_func(function () {
         filter = new tizen.AttributeFilter("id", "EXACTLY", message.id);
-        messageStorage.findMessages(filter, findSuccessCB);
+        messageStorage.findMessages(filter, findSuccess);
     });
 
-    addDraftErrorCB = t.step_func(function (error) {
-        assert_unreached("addDraftErrorCB() error callback: name:" + error.name + ", msg:" + error.message);
+    addDraftError = t.step_func(function (error) {
+        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getMessageServicesSuccessCB = t.step_func(function (services) {
-        assert_true(services.length > 0, "No services was return");
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
 
         message = new tizen.Message("messaging.email", emailMessageInitDict);
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
         messageStorage = messageService.messageStorage;
-        messageStorage.addDraftMessage(message, addDraftSuccessCB, addDraftErrorCB);
+        messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
-    getMessageServicesErrorCB = t.step_func(function (error) {
+    serviceError = t.step_func(function (error) {
         assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    tizen.messaging.getMessageServices("messaging.email", getMessageServicesSuccessCB, getMessageServicesErrorCB);
+    tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
 
 </script>
diff --git a/tct-messaging-email-tizen-tests/tests.xml b/tct-messaging-email-tizen-tests/tests.xml
index e7451a2e8..7ed1186de 100644
--- a/tct-messaging-email-tizen-tests/tests.xml
+++ b/tct-messaging-email-tizen-tests/tests.xml
@@ -843,7 +843,7 @@
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check with non-optional arguments loadMessageAttachment - email" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageService_email_loadMessageAttachment">
+      <testcase purpose="Check MessageService.loadMessageAttachment method with optional arguments (email)" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageService_email_loadMessageAttachment">
         <description>
           <test_script_entry>/opt/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html</test_script_entry>
         </description>
@@ -939,7 +939,7 @@
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check with non-optional arguments loadMessageAttachment - email, without errorCallback" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageService_email_loadMessageAttachment_without_errorCallback">
+      <testcase purpose="Check MessageService.loadMessageAttachment method with non-optional arguments (email)" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageService_email_loadMessageAttachment_without_errorCallback">
         <description>
           <test_script_entry>/opt/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html</test_script_entry>
         </description>
@@ -1521,14 +1521,8 @@
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Sync all folders and load message (body) and send it" type="compliance" onload_delay="120" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P3" id="MessageService_syncLoadMsgSendMsg">
+      <testcase purpose="Add message to draft folder, sync all folders, load message body and send it" type="compliance" onload_delay="120" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P3" id="MessageService_syncLoadMsgSendMsg">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>Sync all folders and load message (body) and send it</step_desc>
-              <expected>The function runs normally</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-messaging-email-tizen-tests/messaging/MessageService_syncLoadMsgSendMsg.html</test_script_entry>
         </description>
         <specs>
@@ -2241,7 +2235,7 @@
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check with optional arguments findMessages(valid_filter, valid_successCallback) id for email" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageStorage_email_findMessages">
+      <testcase purpose="Check MessageStorage.findMessages method with non-optional arguments (filter by Message.id) for email" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageStorage_email_findMessages">
         <description>
           <test_script_entry>/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html</test_script_entry>
         </description>
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html
index 733a8b1f2..9f467cd51 100755
--- a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html
@@ -40,7 +40,7 @@ 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, sendMessage,
+    initDict = mmsMessageInitDict, message,
     addSuccess, addError, messageFilter,
     findMessageSuccess, findMessageError, foundMessage, conversationFilter,
     findConversationSuccess, findConversationError, foundConversation, listenerId,
@@ -48,7 +48,7 @@ var t = async_test("MessageConversationsChangeCallback_mms_conversationsremoved"
 
 t.step(function () {
     //cleanup after TC
-    add_result_callback(function() {
+    add_result_callback(function () {
         try {
             messageStorage.removeChangeListener(listenerId);
         } catch (err) {
@@ -63,7 +63,7 @@ t.step(function () {
         conversationsupdated: t.step_func(function (updatedConversations) {
             assert_unreached("conversationsupdated invoked");
         }),
-        conversationsremoved: t.step_func(function(removedConversations) {
+        conversationsremoved: t.step_func(function (removedConversations) {
             assert_type(removedConversations, "array", "Not an array.");
             assert_equals(removedConversations.length, 1, "Incorrect length of conversations.");
             t.done();
@@ -96,11 +96,11 @@ t.step(function () {
     });
 
     findMessageError = t.step_func(function (error) {
-        assert_unreached("findFolders() error callback: name:" + error.name + ", msg:" + error.message);
+        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    addSuccess = t.step_func(function (recipients) {
-        messageFilter = new tizen.AttributeFilter("id", "EXACTLY", sendMessage.id);
+    addSuccess = t.step_func(function () {
+        messageFilter = new tizen.AttributeFilter("id", "EXACTLY", message.id);
         messageStorage.findMessages(messageFilter, findMessageSuccess, findMessageError);
     });
 
@@ -114,14 +114,15 @@ t.step(function () {
         messageStorage = messageService.messageStorage;
 
         initDict.subject = subjectToSet;
-        sendMessage = new tizen.Message("messaging.mms", initDict);
-        messageService.messageStorage.addDraftMessage(sendMessage, addSuccess, addError);
+        message = new tizen.Message("messaging.mms", 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.mms", serviceSuccess, serviceError);
 });
 
diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html
index 6ec460300..c96c5802a 100755
--- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html
+++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsremoved.html
@@ -39,7 +39,7 @@ Authors:
 setup({ timeout: 90000 });
 var t = async_test("MessageConversationsChangeCallback_sms_conversationsremoved", {timeout: 90000}), changeCallback,
     serviceSuccess, serviceError, messageService, messageStorage,
-    initDict = smsMessageInitDict, sendMessage,
+    initDict = smsMessageInitDict, message,
     addSuccess, addError, messageFilter,
     findMessageSuccess, findMessageError, foundMessage, conversationFilter,
     findConversationSuccess, findConversationError, foundConversation, listenerId,
@@ -47,7 +47,7 @@ var t = async_test("MessageConversationsChangeCallback_sms_conversationsremoved"
 
 t.step(function () {
     //cleanup after TC
-    add_result_callback(function() {
+    add_result_callback(function () {
         try {
             messageStorage.removeChangeListener(listenerId);
         } catch (err) {
@@ -62,7 +62,7 @@ t.step(function () {
         conversationsupdated: t.step_func(function (updatedConversations) {
             assert_unreached("conversationsupdated invoked");
         }),
-        conversationsremoved: t.step_func(function(removedConversations) {
+        conversationsremoved: t.step_func(function (removedConversations) {
             assert_type(removedConversations, "array", "Not an array");
             assert_equals(removedConversations.length, 1, "Incorrect length of conversations.");
             t.done();
@@ -95,11 +95,11 @@ t.step(function () {
     });
 
     findMessageError = t.step_func(function (error) {
-        assert_unreached("findFolders() error callback: name:" + error.name + ", msg:" + error.message);
+        assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    addSuccess = t.step_func(function (recipients) {
-        messageFilter = new tizen.AttributeFilter("id", "EXACTLY", sendMessage.id);
+    addSuccess = t.step_func(function () {
+        messageFilter = new tizen.AttributeFilter("id", "EXACTLY", message.id);
         messageStorage.findMessages(messageFilter, findMessageSuccess, findMessageError);
     });
 
@@ -112,8 +112,8 @@ t.step(function () {
         messageService = services[0];
         messageStorage = messageService.messageStorage;
 
-        sendMessage = new tizen.Message("messaging.sms", initDict);
-        messageService.messageStorage.addDraftMessage(sendMessage, addSuccess, addError);
+        message = new tizen.Message("messaging.sms", initDict);
+        messageService.messageStorage.addDraftMessage(message, addSuccess, addError);
     });
 
     serviceError = t.step_func(function (error) {
diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html
index 650b8e7f0..12087f564 100755
--- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html
+++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_sms_conversationsupdated.html
@@ -39,16 +39,24 @@ Authors:
 setup({ timeout: 90000 });
 var t = async_test("MessageConversationsChangeCallback_sms_conversationsupdated", {timeout: 90000}), changeCallback,
     serviceSuccess, serviceError, messageService, messageStorage, listenerId,
-    initDict = smsMessageInitDict, sendMessage1st, sendMessage2nd,
-    sendSuccess1st, sendError1st, sendError2nd, timestampBeforeChange;
+    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) {
+        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");
@@ -68,28 +76,28 @@ t.step(function () {
         })
     };
 
-    sendError2nd = t.step_func(function (error) {
-        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    addError2nd = t.step_func(function (error) {
+        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    sendSuccess1st = t.step_func(function (recipients) {
+    addSuccess1st = t.step_func(function () {
         listenerId = messageStorage.addConversationsChangeListener(changeCallback);
 
-        sendMessage2nd = new tizen.Message("messaging.sms", initDict);
-        messageService.messageStorage.addDraftMessage(sendMessage2nd, function(){}, sendError2nd);
+        addDraftMessage2nd = new tizen.Message("messaging.sms", initDict);
+        messageService.messageStorage.addDraftMessage(addDraftMessage2nd, function (){}, addError2nd);
     });
 
-    sendError1st = t.step_func(function (error) {
-        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    addError1st = t.step_func(function (error) {
+        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     serviceSuccess = t.step_func(function (services) {
-        assert_true(services.length > 0, "Received empty services array");
+        assert_greater_than(services.length, 0, "Received empty services array");
         messageService = services[0];
         messageStorage = messageService.messageStorage;
 
-        sendMessage1st = new tizen.Message("messaging.sms", initDict);
-        messageService.messageStorage.addDraftMessage(sendMessage1st, sendSuccess1st, sendError1st);
+        addDraftMessage1st = new tizen.Message("messaging.sms", initDict);
+        messageService.messageStorage.addDraftMessage(addDraftMessage1st, addSuccess1st, addError1st);
     });
 
     serviceError = t.step_func(function (error) {
@@ -99,15 +107,6 @@ t.step(function () {
     tizen.messaging.getMessageServices("messaging.sms", 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>
diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations.html
index 4350bdf35..0c64e3497 100644
--- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations.html
+++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations.html
@@ -36,8 +36,6 @@ Authors:
 
 //==== TEST: MessageStorage_sms_findConversations
 //==== LABEL Check if method MessageStorage::findConversations() can be successfully called for sms message
-//==== STEP 1. Send new sms message 2. Find any conversation
-//==== EXPECT Pass
 //==== PRIORITY P1
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#findConversationsid2466491
@@ -45,12 +43,12 @@ Authors:
 //==== TEST_CRITERIA MOA MR
 setup({timeout: 90000});
 
-var t = async_test("MessageStorage_sms_findConversations", {timeout:90000});
+var t = async_test("MessageStorage_sms_findConversations", {timeout: 90000}),
+    serviceSuccess, serviceError,
+    addSuccess, addError,
+    conversationSuccess, conversationError,
+    service, newMessage, filter, returnedValue, removeAllSuccess;
 t.step(function () {
-    var serviceSuccess, serviceError,
-        sendSuccess, sendError,
-        conversationSuccess, conversationError,
-        service, newMessage, filter, returnedValue, removeAllSuccess;
 
     conversationSuccess = t.step_func(function (conversations) {
         assert_type(conversations, "array", "conversations");
@@ -62,14 +60,14 @@ t.step(function () {
         assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    sendSuccess = t.step_func(function (recipients) {
+    addSuccess = t.step_func(function () {
         filter = new tizen.AttributeFilter("id", "EXACTLY", newMessage.conversationId);
 
         returnedValue = service.messageStorage.findConversations(filter, conversationSuccess, conversationError);
         assert_equals(returnedValue, undefined, "findConversations should return undefined");
     });
 
-    sendError = t.step_func(function (error) {
+    addError = t.step_func(function (error) {
         assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
@@ -79,7 +77,7 @@ t.step(function () {
             plainBody: "[Test][findConversations] " + (new Date()).toString()
         });
 
-        service.messageStorage.addDraftMessage(newMessage, sendSuccess, sendError);
+        service.messageStorage.addDraftMessage(newMessage, addSuccess, addError);
     });
 
     serviceSuccess = t.step_func(function (services) {
diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations_filter_id.html b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations_filter_id.html
index 9596e941f..8abb9f61d 100644
--- a/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations_filter_id.html
+++ b/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations_filter_id.html
@@ -36,8 +36,6 @@ Authors:
 
 //==== TEST: MessageStorage_sms_findConversations_filter_id
 //==== LABEL Check if method MessageStorage::findConversations() can be successfully called for sms message (with conversationId)
-//==== STEP 1. Send new sms message 2. Find this message in storage 3. Check which conversation it's in 4. Find this conversation by id
-//==== EXPECT Pass
 //==== PRIORITY P1
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#findConversationsid2466491
@@ -45,14 +43,14 @@ Authors:
 //==== TEST_CRITERIA MR MOA
 setup({timeout: 90000});
 
-var t = async_test("MessageStorage_sms_findConversations_filter_id", {timeout:90000});
+var t = async_test("MessageStorage_sms_findConversations_filter_id", {timeout:90000}),
+    serviceSuccess, serviceError, returnedValue,
+    addDraftSuccess, addDraftError,
+    findMessageSuccess, findMessageError,
+    conversationSuccess, conversationError,
+    service, newMessage, convId, filter,
+    recipient = TEST_SMS_RECIPIENT;
 t.step(function () {
-    var serviceSuccess, serviceError, returnedValue,
-        addDraftSuccess, addDraftError,
-        findMessageSuccess, findMessageError,
-        conversationSuccess, conversationError,
-        service, newMessage, convId, filter,
-        recipient = TEST_SMS_RECIPIENT;
 
     conversationSuccess = t.step_func(function (conversations) {
         assert_type(conversations, "array", "conversations is not an array");
@@ -63,7 +61,7 @@ t.step(function () {
     });
 
     conversationError = t.step_func(function (error) {
-        assert_unreached("find conversation error: " + error.message);
+        assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     findMessageSuccess = t.step_func(function (messages) {
@@ -80,7 +78,7 @@ t.step(function () {
         assert_unreached("findMessages() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    addDraftSuccess = t.step_func(function (recipients) {
+    addDraftSuccess = t.step_func(function () {
         service.messageStorage.findMessages(
             new tizen.AttributeFilter("id", "EXACTLY", newMessage.id),
             findMessageSuccess,
diff --git a/tct-messaging-sms-tizen-tests/tests.xml b/tct-messaging-sms-tizen-tests/tests.xml
index b28586466..0e060c91d 100644
--- a/tct-messaging-sms-tizen-tests/tests.xml
+++ b/tct-messaging-sms-tizen-tests/tests.xml
@@ -1340,12 +1340,6 @@
       </testcase>
       <testcase purpose="Check if method MessageStorage::findConversations() can be successfully called for sms message" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageStorage_sms_findConversations">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>1. Send new sms message 2. Find any conversation</step_desc>
-              <expected>Pass</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations.html</test_script_entry>
         </description>
         <specs>
@@ -1424,12 +1418,6 @@
       </testcase>
       <testcase purpose="Check if method MessageStorage::findConversations() can be successfully called for sms message (with conversationId)" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P1" id="MessageStorage_sms_findConversations_filter_id">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>1. Send new sms message 2. Find this message in storage 3. Check which conversation it's in 4. Find this conversation by id</step_desc>
-              <expected>Pass</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations_filter_id.html</test_script_entry>
         </description>
         <specs>