From: junghyuk <junghyuk@alaska.(none)>
Date: Tue, 22 Oct 2013 07:01:35 +0000 (+0900)
Subject: [Messaging] Fix TTS-2069 : MMS
X-Git-Tag: 2.2.1_release~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=437734834657593186c525c2d8093d9122b3f16f;p=test%2Ftct%2Fweb%2Fapi.git

[Messaging] Fix TTS-2069 : MMS

Change-Id: I972f8a86e5d9955cf82969838b5b658b0c086e9c
---

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageBody_mms_messageId_attribute.html b/tct-messaging-mms-tizen-tests/messaging/MessageBody_mms_messageId_attribute.html
index 942b802cb..ce7c587b2 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageBody_mms_messageId_attribute.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageBody_mms_messageId_attribute.html
@@ -42,7 +42,12 @@ var t = async_test(document.title, {timeout: 90000}), message, messageBody,
     serviceError, serviceSuccess, messageService, messageStorage, addDraftError, addDraftSuccess;
 t.step(function () {
 
-    message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+    message = new tizen.Message("messaging.mms", {
+        subject: generateSubject(),
+        to: [TEST_SMS_RECIPIENT],
+        plainBody: "sample plainBody"
+    });
+
     messageBody = message.body;
 
     assert_own_property(messageBody, "messageId", "MessageBody does not own messageId property.");
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 71f461c4c..3bfc0242e 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsremoved.html
@@ -81,7 +81,12 @@ t.step(function () {
     removeAllSuccess = t.step_func(function () {
         listenerId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         sendMessage(t, service, message, null, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_body_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_body_valid.html
index 94ea3ef16..37395a1f8 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_body_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_body_valid.html
@@ -42,9 +42,10 @@ Authors:
 //==== TEST_CRITERIA MOA
 setup({timeout: 90000});
 
-var t = async_test(document.title, {timeout: 90000}), bodyFilter = new tizen.AttributeFilter("body.plainBody",
-    "CONTAINS", "mms text"), mmsService, initDict = mmsMessageInitDict, findSuccess, findError, addSuccess, serviceSuccess,
-    serviceError, i;
+var t = async_test(document.title, {timeout: 90000}),
+    bodyFilter = new tizen.AttributeFilter("body.plainBody", "CONTAINS", "mms text"),
+    mmsService, findSuccess, findError, addSuccess, serviceSuccess,
+    serviceError, i, initDict;
 t.step(function () {
 
     findSuccess = t.step_func(function (messages) {
@@ -66,7 +67,13 @@ t.step(function () {
     serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
         mmsService = services[0];
-        initDict.plainBody = "This is a mms text.";
+
+        initDict = {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "This is a mms text."
+        };
+
         addMMSDraft(t, mmsService, initDict, addSuccess);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_folderId_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_folderId_valid.html
index a9f4ad3df..4d9c8b037 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_folderId_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_folderId_valid.html
@@ -66,7 +66,11 @@ t.step(function () {
         assert_equals(services[0].type, "messaging.mms", "Service type is incorrect");
 
         mmsService = services[0];
-        addMMSDraft(t, mmsService, mmsMessageInitDict, addSuccess);
+        addMMSDraft(t, mmsService, {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        }, addSuccess);
     });
 
     serviceError = t.step_func(function (error) {
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_from_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_from_valid.html
index 5a253d3f1..c0683169e 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_from_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_from_valid.html
@@ -70,7 +70,11 @@ t.step(function () {
 
         filter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT);
 
-        msg = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        msg = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         sendMessage(t, mmsService, msg, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_hasAttachment_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_hasAttachment_valid.html
index 1805d94d6..a89e1aea9 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_hasAttachment_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_hasAttachment_valid.html
@@ -65,7 +65,11 @@ t.step(function () {
     serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
         mmsService = services[0];
-        addMMSDraft(t, mmsService, mmsMessageInitDict, addSuccess);
+        addMMSDraft(t, mmsService, {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        }, addSuccess);
     });
 
     serviceError = t.step_func(function (error) {
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_isRead_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_isRead_valid.html
index 7efd3d2d1..d0b1e6a3a 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_isRead_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_isRead_valid.html
@@ -66,7 +66,11 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         mmsService = services[0];
 
-        msg = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        msg = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         msg.isRead = true;
 
         mmsService.messageStorage.addDraftMessage(msg, addSuccess, addError);
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_mms_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_mms_valid.html
index a04d85c5e..995ab7ce8 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_mms_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_mms_valid.html
@@ -63,7 +63,11 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
 
-        addMMSDraft(t, service, mmsMessageInitDict, addSuccess);
+        addMMSDraft(t, service, {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        }, addSuccess);
     });
 
     serviceError = t.step_func(function (error) {
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_subject_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_subject_valid.html
index f22191d2f..6a91b66ac 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_subject_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_subject_valid.html
@@ -41,15 +41,16 @@ Authors:
 //==== TEST_CRITERIA MOA MR
 setup({timeout: 90000});
 
-var t = async_test(document.title, {timeout: 90000}), mmsService, subjectToSet = new Date().getTime().toString(),
-    subjectFilter, addedMessage, findSuccess, findError, serviceSuccess, serviceError, returnedValue = null, addSuccess,
-    dict;
+var t = async_test(document.title, {timeout: 90000}), mmsService,
+    subject, subjectFilter, addedMessage, findSuccess, findError,
+    serviceSuccess, serviceError, returnedValue = null, addSuccess;
+
 t.step(function () {
 
     findSuccess = t.step_func(function (messages) {
         assert_equals(messages.length, 1, "Incorrect number of messages");
         assert_equals(messages[0].id, addedMessage.id, "Incorrect message.id");
-        assert_equals(messages[0].subject, subjectToSet, "Incorrect message.subject");
+        assert_equals(messages[0].subject, subject, "Incorrect message.subject");
 
         assert_equals(returnedValue, undefined, "Incorrect returned value");
         t.done();
@@ -61,16 +62,21 @@ t.step(function () {
 
     addSuccess = t.step_func(function (message) {
         addedMessage = message;
-        subjectFilter = new tizen.AttributeFilter("subject", "EXACTLY", subjectToSet);
+        subjectFilter = new tizen.AttributeFilter("subject", "EXACTLY", subject);
         returnedValue = mmsService.messageStorage.findMessages(subjectFilter, findSuccess, findError);
     });
 
     serviceSuccess = t.step_func(function (services) {
         assert_true(services.length > 0, "Received empty services array");
         mmsService = services[0];
-        dict = mmsMessageInitDict;
-        dict.subject = subjectToSet;
-        addMMSDraft(t, mmsService, dict, addSuccess);
+
+        subject = generateSubject();
+
+        addMMSDraft(t, mmsService, {
+            subject: subject,
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        }, addSuccess);
     });
 
     serviceError = t.step_func(function (error) {
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_timestamp_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_timestamp_valid.html
index f3239df20..0eec18cf1 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_timestamp_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_timestamp_valid.html
@@ -80,7 +80,11 @@ t.step(function () {
 
         mmsService = services[0];
 
-        msg = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        msg = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         sendMessage(t, mmsService, msg, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_to_valid.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_to_valid.html
index 432d03e22..0bc0bd96b 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_to_valid.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_findMessages_filter_to_valid.html
@@ -73,7 +73,11 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         mmsService = services[0];
 
-        addMMSDraft(t, mmsService, mmsMessageInitDict, addSuccess);
+        addMMSDraft(t, mmsService, {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        }, addSuccess);
     });
 
     serviceError = t.step_func(function (error) {
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_with_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_with_filter.html
index 9b665df2b..c751098a3 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_with_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_with_filter.html
@@ -41,7 +41,9 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
     subscriptionIdentifier, filter, endText = "ending", currentDate = new Date(),
     matchPlainBodyToSet = currentDate.getTime().toString() + endText.toUpperCase(),
-    mismatchPlainBodyToSet = currentDate.getTime().toString(), matchInitDict = mmsMessageInitDict, mismatchInitDict = mmsMessageInitDict,
+    mismatchPlainBodyToSet = currentDate.getTime().toString(),
+    initDict = { subject: generateSubject(), to: [TEST_SMS_RECIPIENT], plainBody: "sample plainBody" },
+    matchInitDict = initDict, mismatchInitDict = initDict,
     matchMessage, mismatchMessage, changeCallback, addDraftError, loadSuccess, loadError;
 t.step(function () {
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_without_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_without_filter.html
index 914f0709d..c68b7d048 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_without_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_addMessagesChangeListener_without_filter.html
@@ -39,8 +39,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
-    subscriptionIdentifier, currentDate = new Date(), plainBodyToSet = currentDate.getTime().toString(), message,
-    changeCallback, initDict = mmsMessageInitDict, addDraftError, loadSuccess, loadError, i;
+    subscriptionIdentifier, message, changeCallback, addDraftError, loadSuccess, loadError, i, plainBody = "sample plainBody";
 t.step(function () {
 
     add_result_callback(function (res) {
@@ -54,7 +53,7 @@ t.step(function () {
     });
 
     loadSuccess = t.step_func(function (loadedMessage) {
-        assert_equals(loadedMessage.body.plainBody, plainBodyToSet, "Incorrect plainBody.");
+        assert_equals(loadedMessage.body.plainBody, plainBody, "Incorrect plainBody.");
         assert_equals(loadedMessage.id, message.id, "Incorrect id.");
         t.done();
     });
@@ -90,8 +89,13 @@ t.step(function () {
 
         subscriptionIdentifier = messageStorage.addMessagesChangeListener(changeCallback);
         assert_type(subscriptionIdentifier, "long", "Incorrect returned value.");
-        initDict.plainBody = plainBodyToSet;
-        message = new tizen.Message("messaging.mms", initDict);
+
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: plainBody
+        });
+
         messageStorage.addDraftMessage(message, null, addDraftError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_id.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_id.html
index 462a5af47..69649c00f 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_id.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_id.html
@@ -77,7 +77,12 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         service.messageStorage.addDraftMessage(message, addSuccess, addError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html
index 8fd22e741..9cedc4a35 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html
@@ -74,7 +74,11 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         sendMessage(t, service, message, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html
index 84ffaea12..2f16961c5 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html
@@ -74,7 +74,11 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         sendMessage(t, service, message, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html
index 65e5f2ff8..ea87700b9 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html
@@ -81,7 +81,11 @@ t.step(function () {
         endDate = new Date();
         endDate.setHours(endDate.getHours() + 1);
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         sendMessage(t, service, message, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html
index 3da10af4e..7f862d069 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html
@@ -51,8 +51,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}),
-    findSuccess, findError, serviceSuccess, messageService,
-    initDict = mmsMessageInitDict, sendSuccess, sendError, newMessage,
+    findSuccess, findError, serviceSuccess, messageService, sendSuccess, sendError, newMessage,
     filter, serviceError, i, j, found = false;
 
 t.step(function () {
@@ -85,9 +84,14 @@ t.step(function () {
 
     serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
-
         messageService = services[0];
-        newMessage = new tizen.Message(messageService.type, initDict);
+
+        newMessage = new tizen.Message(messageService.type, {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         sendMessage(t, messageService, newMessage, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_type.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_type.html
index 285c186ec..23e921d33 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_type.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_type.html
@@ -72,7 +72,11 @@ t.step(function () {
     serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
 
         service = services[0];
         messageStorage = service.messageStorage;
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages.html
index 2e693331b..952e699c3 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages.html
@@ -68,7 +68,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_folderId_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_folderId_with_errorCallback.html
index 5d2a2f4fe..a508077d6 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_folderId_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_folderId_with_errorCallback.html
@@ -67,7 +67,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_true(services.length > 0, "No services was return");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html
index ac4764d08..af96d9580 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html
@@ -67,7 +67,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_true(services.length > 0, "No services was return");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_id_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_id_with_errorCallback.html
index 037730750..3cf14e704 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_id_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_id_with_errorCallback.html
@@ -64,7 +64,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_true(services.length > 0, "No services was return");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_isRead_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_isRead_with_errorCallback.html
index f5427018e..dd416fbea 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_isRead_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_isRead_with_errorCallback.html
@@ -67,7 +67,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_true(services.length > 0, "No services was return");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_plainBody_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_plainBody_with_errorCallback.html
index 6758fb4c0..ef5677c7c 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_plainBody_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_plainBody_with_errorCallback.html
@@ -78,7 +78,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_timestamp_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_timestamp_with_errorCallback.html
index 3d3314ba6..3a4389975 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_timestamp_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_timestamp_with_errorCallback.html
@@ -72,7 +72,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_to_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_to_with_errorCallback.html
index 38431a0bb..a79d9312b 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_to_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_to_with_errorCallback.html
@@ -53,7 +53,7 @@ t.step(function () {
             assert_own_property(msg[i], "to", "Name to doesn't exist in provided object.");
             assert_greater_than(msg[i].to.length, 0, "Recipient empty array");
             for(j = 0; j < msg[i].to.length; j++) {
-                if (msg[i].to[j].indexOf(mmsMessageInitDict.to[0]) >= 0) {
+                if (msg[i].to[j].indexOf(TEST_SMS_RECIPIENT) >= 0) {
                     foundRecipient = true;
                 }
             }
@@ -78,7 +78,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_true(services.length > 0, "No services was return");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_type_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_type_with_errorCallback.html
index 5b5577b0e..047d2ecdf 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_type_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_type_with_errorCallback.html
@@ -74,7 +74,11 @@ t.step(function () {
     getMessageServicesSuccessCB = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         message.attachments = [new tizen.MessageAttachment(imagePathToSet, "image/jpeg")];
 
         messageService = services[0];
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages.html
index f66ebcb68..ba8d2c1e6 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages.html
@@ -42,7 +42,8 @@ var t = async_test(document.title, {timeout: 90000}),
     serviceSuccess, serviceError, messageService, messageStorage,
     currentDate = new Date(), plainBodyToSet = currentDate.getTime().toString(),
     mutableMessage, constMessage,
-    initDictForMutableMessage = mmsMessageInitDict, initDictForConstMessage = mmsMessageInitDict,
+    initDict = { subject: generateSubject(), to: [TEST_SMS_RECIPIENT], plainBody: "sample plainBody" },
+    initDictForMutableMessage = initDict, initDictForConstMessage = initDict,
     plainBodyToSetForMutableMessage = plainBodyToSet + "_mutable", plainBodyToSetForConstMessage = plainBodyToSet + "_const",
     addDraftSuccess, addDraftError, addDraftSuccessCounter = 0, returnedValue = null,
     updateSuccess, updateError, mutableMessagefilter, constMessagefilter,
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_errorCallback_TypeMismatch.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_errorCallback_TypeMismatch.html
index 5e0eb353d..ddfc8d947 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_errorCallback_TypeMismatch.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_errorCallback_TypeMismatch.html
@@ -70,7 +70,11 @@ t.step(function () {
         messageService = services[0];
         messageStorage = messageService.messageStorage;
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_errorCallback_invalid_cb.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_errorCallback_invalid_cb.html
index 125ecd8ee..43a22b5af 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_errorCallback_invalid_cb.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_errorCallback_invalid_cb.html
@@ -70,7 +70,12 @@ t.step(function () {
         messageService = services[0];
         messageStorage = messageService.messageStorage;
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_successCallback_TypeMismatch.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_successCallback_TypeMismatch.html
index 68d0de93e..72d6d73db 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_successCallback_TypeMismatch.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_successCallback_TypeMismatch.html
@@ -71,7 +71,11 @@ t.step(function () {
         messageService = services[0];
         messageStorage = messageService.messageStorage;
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_successCallback_invalid_cb.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_successCallback_invalid_cb.html
index 63c3e6431..b161733de 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_successCallback_invalid_cb.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_successCallback_invalid_cb.html
@@ -70,7 +70,12 @@ t.step(function () {
         messageService = services[0];
         messageStorage = messageService.messageStorage;
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_errorCallback.html
index 92dcbabaa..d2ca6c23b 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_errorCallback.html
@@ -42,7 +42,8 @@ var t = async_test(document.title, {timeout: 90000}),
     serviceSuccess, serviceError, messageService, messageStorage,
     currentDate = new Date(), plainBodyToSet = currentDate.getTime().toString(),
     mutableMessage, constMessage,
-    initDictForMutableMessage = mmsMessageInitDict, initDictForConstMessage = mmsMessageInitDict,
+    initDict = { subject: generateSubject(), to: [TEST_SMS_RECIPIENT], plainBody: "sample plainBody" },
+    initDictForMutableMessage = initDict, initDictForConstMessage = initDict,
     plainBodyToSetForMutableMessage = plainBodyToSet + "_mutable", plainBodyToSetForConstMessage = plainBodyToSet + "_const",
     addDraftSuccess, addDraftError, addDraftSuccessCounter = 0, returnedValue = null,
     updateSuccess, mutableMessagefilter, constMessagefilter,
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_successCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_successCallback.html
index 339b38ca9..bdeb6377a 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_successCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_updateMessages_without_successCallback.html
@@ -40,7 +40,8 @@ setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
     currentDate = new Date(), plainBodyToSet = currentDate.getTime().toString(), mutableMessage, constMessage,
-    initDictForMutableMessage = mmsMessageInitDict, initDictForConstMessage = mmsMessageInitDict,
+    initDict = { subject: generateSubject(), to: [TEST_SMS_RECIPIENT], plainBody: "sample plainBody" },
+    initDictForMutableMessage = initDict, initDictForConstMessage = initDict,
     plainBodyToSetForMutableMessage = plainBodyToSet + "_mutable",
     plainBodyToSetForConstMessage = plainBodyToSet + "_const",
     addDraftSuccess, addDraftError, addDraftSuccessCounter = 0,
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html
index 09a081209..4d4b1b1bc 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html
@@ -82,7 +82,11 @@ t.step(function () {
     });
 
     removeAllSuccess = t.step_func(function () {
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         sendMessage(t, service, message, messageSentSuccess, messageSentError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_constructor.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_constructor.html
index c03e6e29f..66dacb223 100644
--- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_constructor.html
+++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_constructor.html
@@ -37,14 +37,23 @@ Authors:
 //==== TEST_CRITERIA CONSTRA CONSTRM
 
 test(function () {
-    var message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+    var message, subject, plainBody;
+
+    subject = generateSubject();
+    plainBody = "sample plainBody";
+
+    message = new tizen.Message("messaging.mms", {
+        subject: subject,
+        to: [TEST_SMS_RECIPIENT],
+        plainBody: plainBody
+    });
 
     assert_true(message instanceof tizen.Message, "InstanceOf.");
 
     assert_array_equals(message.attachments, [], "'attachments' should be []");
     assert_equals(message.body.messageId, message.id, "body.messageId should be equal to message.id");
     assert_equals(message.body.loaded, false, "'body.loaded' should be false");
-    assert_equals(message.body.plainBody, mmsMessageInitDict.plainBody, "'body.plainBody' should be \""+mmsMessageInitDict.plainBody+"\"");
+    assert_equals(message.body.plainBody, plainBody, "'body.plainBody' should be \""+plainBody+"\"");
     assert_equals(message.conversationId, null, "message.conversationId value should be null");
     assert_equals(message.folderId, null, "message.folderId value should be null");
     assert_equals(message.from, null, "'from' should be null");
@@ -53,7 +62,7 @@ test(function () {
     assert_equals(message.inResponseTo, null, "'inResponseTo' should be null");
     assert_equals(message.isRead, false, "'isRead' value should be false");
     assert_equals(message.messageStatus, "", "value should be \"sample subject\"");
-    assert_equals(message.subject, mmsMessageInitDict.subject, "'subject' value should be \""+mmsMessageInitDict.subject+"\"");
+    assert_equals(message.subject, subject, "'subject' value should be \""+subject+"\"");
     assert_equals(message.timestamp, null, "Timestamp should be null for messages not sent nor received");
     assert_array_equals(message.to, [TEST_SMS_RECIPIENT], "'to' should be ["+TEST_SMS_RECIPIENT+"]");
     assert_equals(message.type, "messaging.mms", "'type' should be 'messaging.mms'");
diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_conversationId_attribute.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_conversationId_attribute.html
index 17c2f469c..9671424ee 100644
--- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_conversationId_attribute.html
+++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_conversationId_attribute.html
@@ -79,7 +79,11 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         service = services[0];
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         sendMessage(t, service, message, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_folderId_attribute.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_folderId_attribute.html
index d596b9e9f..0fcdcc3b5 100644
--- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_folderId_attribute.html
+++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_folderId_attribute.html
@@ -65,7 +65,11 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         messageService = services[0];
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         sendMessage(t, messageService, message, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_id_attribute.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_id_attribute.html
index 2cba848bf..c9284fc0e 100644
--- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_id_attribute.html
+++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_id_attribute.html
@@ -66,7 +66,12 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         messageService = services[0];
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         sendMessage(t, messageService, message, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/Message_mms_timestamp_attribute.html b/tct-messaging-mms-tizen-tests/messaging/Message_mms_timestamp_attribute.html
index a79e1459e..5357731ef 100644
--- a/tct-messaging-mms-tizen-tests/messaging/Message_mms_timestamp_attribute.html
+++ b/tct-messaging-mms-tizen-tests/messaging/Message_mms_timestamp_attribute.html
@@ -66,7 +66,12 @@ t.step(function () {
         assert_greater_than(services.length, 0, "Received empty services array");
         messageService = services[0];
 
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         sendMessage(t, messageService, message, sendSuccess, sendError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_with_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_with_filter.html
index 823df4639..7feb1943a 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_with_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_with_filter.html
@@ -40,7 +40,9 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
     subscriptionIdentifier, filter, endText = "ending", currentDate = new Date(),
     matchPlainBodyToSet = currentDate.getTime().toString() + endText.toUpperCase(),
-    mismatchPlainBodyToSet = currentDate.getTime().toString(), matchInitDict = mmsMessageInitDict, mismatchInitDict = mmsMessageInitDict,
+    mismatchPlainBodyToSet = currentDate.getTime().toString(),
+    initDict = { subject: generateSubject(), to: [TEST_SMS_RECIPIENT], plainBody: "sample plainBody" },
+    matchInitDict = initDict, mismatchInitDict = initDict,
     matchMessage, mismatchMessage, changeCallback, addDraftError, loadSuccess, loadError;
 t.step(function () {
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_without_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_without_filter.html
index 8a1808a56..79f888bc4 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_without_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesadded_without_filter.html
@@ -39,7 +39,7 @@ Authors:
 setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
     subscriptionIdentifier, currentDate = new Date(), plainBodyToSet = currentDate.getTime().toString(), message,
-    changeCallback, initDict = mmsMessageInitDict, addDraftError, loadSuccess, loadError, removeAllSuccess, i;
+    changeCallback, addDraftError, loadSuccess, loadError, removeAllSuccess, i;
 t.step(function () {
 
     add_result_callback(function () {
@@ -93,8 +93,13 @@ t.step(function () {
         messageStorage = messageService.messageStorage;
 
         subscriptionIdentifier = messageStorage.addMessagesChangeListener(changeCallback);
-        initDict.plainBody = plainBodyToSet;
-        message = new tizen.Message("messaging.mms", initDict);
+
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: plainBodyToSet
+        });
+
         messageStorage.addDraftMessage(message, null, addDraftError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_with_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_with_filter.html
index 94fbdee52..d948f4020 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_with_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_with_filter.html
@@ -40,7 +40,9 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
     subscriptionIdentifier, filter, endText = "ending", currentDate = new Date(),
     matchPlainBodyToSet = currentDate.getTime().toString() + endText.toUpperCase(),
-    mismatchPlainBodyToSet = currentDate.getTime().toString(), matchInitDict = mmsMessageInitDict, mismatchInitDict = mmsMessageInitDict,
+    mismatchPlainBodyToSet = currentDate.getTime().toString(),
+    initDict = { subject: generateSubject(), to: [TEST_SMS_RECIPIENT], plainBody: "sample plainBody" },
+    matchInitDict = initDict, mismatchInitDict = initDict,
     matchMessage, mismatchMessage, changeCallback, addDraftError, addDraftSuccess, addDraftSuccessCounter = 0,
     updateError;
 t.step(function () {
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_without_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_without_filter.html
index 819d7a23f..ecd12c0e7 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_without_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesremoved_without_filter.html
@@ -38,8 +38,7 @@ Authors:
 //==== TEST_CRITERIA CBT CBOA
 setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
-    subscriptionIdentifier, currentDate = new Date(), plainBodyToSet = currentDate.getTime().toString(), message,
-    changeCallback, initDict = mmsMessageInitDict, addDraftSuccess, addDraftError, removeError, i;
+    subscriptionIdentifier, message, changeCallback, addDraftSuccess, addDraftError, removeError, i;
 t.step(function () {
 
     add_result_callback(function () {
@@ -87,8 +86,12 @@ t.step(function () {
         messageService = services[0];
         messageStorage = messageService.messageStorage;
 
-        initDict.plainBody = plainBodyToSet;
-        message = new tizen.Message("messaging.mms", initDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_with_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_with_filter.html
index 9e015ea3a..876d8510e 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_with_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_with_filter.html
@@ -40,7 +40,9 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
     subscriptionIdentifier, filter, endText = "ending", currentDate = new Date(),
     matchPlainBodyToSet = currentDate.getTime().toString() + endText.toUpperCase(),
-    mismatchPlainBodyToSet = currentDate.getTime().toString(), matchInitDict = mmsMessageInitDict, mismatchInitDict = mmsMessageInitDict,
+    mismatchPlainBodyToSet = currentDate.getTime().toString(),
+    initDict = { subject: generateSubject(), to: [TEST_SMS_RECIPIENT], plainBody: "sample plainBody" },
+    matchInitDict = initDict, mismatchInitDict = initDict,
     matchMessage, mismatchMessage, changeCallback, addDraftError, addDraftSuccess, addDraftSuccessCounter = 0,
     updateError, loadSuccess, loadError;
 t.step(function () {
@@ -109,7 +111,6 @@ t.step(function () {
 
         matchMessage = new tizen.Message("messaging.mms", matchInitDict);
         messageStorage.addDraftMessage(matchMessage, addDraftSuccess, addDraftError);
-
     });
 
     serviceError = t.step_func(function (error) {
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_without_filter.html b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_without_filter.html
index 243c15dbc..5f727d6a3 100644
--- a/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_without_filter.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessagesChangeCallback_mms_messagesupdated_without_filter.html
@@ -39,7 +39,7 @@ Authors:
 setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), serviceSuccess, serviceError, messageService, messageStorage,
     subscriptionIdentifier, currentDate = new Date(), plainBodyToSet = currentDate.getTime().toString(), message,
-    changeCallback, initDict = mmsMessageInitDict, addDraftSuccess, addDraftError, updateError, loadSuccess, loadError,
+    changeCallback, addDraftSuccess, addDraftError, updateError, loadSuccess, loadError,
     i;
 t.step(function () {
 
@@ -97,7 +97,11 @@ t.step(function () {
         messageService = services[0];
         messageStorage = messageService.messageStorage;
 
-        message = new tizen.Message("messaging.mms", initDict);
+        message = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
         messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
diff --git a/tct-messaging-mms-tizen-tests/messaging/support/getJsonConf.js b/tct-messaging-mms-tizen-tests/messaging/support/getJsonConf.js
old mode 100755
new mode 100644
diff --git a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
old mode 100755
new mode 100644
index 537f4a224..9f55f40d0
--- a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
+++ b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
@@ -24,15 +24,9 @@ Authors:
 var TEST_SMS_RECIPIENT = ""; // this variable MUST be set before executing tests
 var TEST_SMS_RECIPIENT_2 = ""; // this variable MUST be set before executing tests
 
-// change TEST_SMS_RECIPIENT and TEST_SMS_RECIPIENT_2
-document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
-document.write('<script src="support/getJsonConf.js"></script>');
-
 var imagePathToSet = "images/webapi-tizen-messaging-test_image.jpg";
 var soundPathToSet = "music/webapi-tizen-messaging-test_noise.mp3";
 
-var mmsService;
-
 var MMStypeFilter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.mms");
 var fromFilter = new tizen.AttributeFilter("from", "CONTAINS", TEST_SMS_RECIPIENT);
 
@@ -60,12 +54,6 @@ var generateSubject = function () {
     return subject(datetime, count);
 };
 
-var mmsMessageInitDict = {
-    subject: generateSubject(),
-    to: [TEST_SMS_RECIPIENT],
-    plainBody: "sample plainBody"
-};
-
 function addDraft(t, service, initDict, onSuccess) {
     var msg, addSuccess, addError, serviceListSuccess, serviceListError;
 
@@ -134,3 +122,7 @@ function sendMessage(t, service, msg, onSuccess, onError) {
 
     requestSending();
 }
+
+// change TEST_SMS_RECIPIENT and TEST_SMS_RECIPIENT_2
+document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
+document.write('<script src="support/getJsonConf.js"></script>');