[Messaging] provide a unique message subject and body

Change-Id: I69b350b58f8f6fd4d8e80bbc1ca12941914cb3ba

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html
index 06667ac9844c221631d118ec8021e3016b88caaa..daea03c04e89cffdf9a141f12166f4cc9dc25af6 100755 (executable)
--- a/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageConversationsChangeCallback_mms_conversationsupdated.html
@@ -70,12 +70,22 @@ t.step(function () {
     sendSuccess = t.step_func(function () {
         watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
 
-        message2 = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message2 = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         service.sendMessage(message2, null, sendError);
     });
 
     removeAllSuccess = t.step_func(function () {
-        message1 = new tizen.Message("messaging.mms", mmsMessageInitDict);
+        message1 = new tizen.Message("messaging.mms", {
+            subject: generateSubject(),
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: "sample plainBody"
+        });
+
         service.sendMessage(message1, sendSuccess, sendError);
     });
 

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_removeConversations_formms.html
old mode 100644 (file)
new mode 100755 (executable)
index 9130ea8..503578b
--- 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,7 @@ t.step(function () {
     });
 
     removeAllSuccess = t.step_func(function () {
-        message = new tizen.Message("messaging.mms", {plainBody: "test.", to: [TEST_SMS_RECIPIENT]});
+        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
         service.sendMessage(message, messageSentSuccess, messageSentError);
     });
 

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 100644 (file)
new mode 100755 (executable)
index b179ee0..2e251bf
--- a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
+++ b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
@@ -39,8 +39,23 @@ var IO_ERR             = 'IOError';
 var UNKNOWN_ERR        = 'UnknownError';
 var EXCEPTION_TYPE = "name";
 
+
+var generateSubject = function () {
+    var datetime = new Date().getTime();
+    var count = 0;
+    var subject = function(datetime, count) {
+        return "sample subject: "+datetime+"-"+count;
+    }
+
+    generateSubject = function () {
+        count++;
+        return subject(datetime, count);
+    }
+    return subject(datetime, count);
+};
+
 var mmsMessageInitDict = {
-    subject: "sample subject",
+    subject: generateSubject(),
     to: [TEST_SMS_RECIPIENT],
     plainBody: "sample plainBody"
 };

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html
index c2e8706e5c2681c5a5cd984b19547992682a562f..d94ff56ca08a67a56fbaa75a3ce2e535bb965749 100755 (executable)
--- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html
+++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withfilter.html
@@ -86,12 +86,20 @@ t.step(function () {
         filter = new tizen.AttributeFilter("to", "CONTAINS", smsMessageInitDict.to[0]);
         watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB, filter);
 
-        message2 = new tizen.Message("messaging.sms", smsMessageInitDict);
+        message2 = new tizen.Message("messaging.sms", {
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: generatePlainBody()
+        });
+
         service.sendMessage(message2, null, sendError);
     });
 
     removeAllSuccess = t.step_func(function () {
-        message1 = new tizen.Message("messaging.sms", smsMessageInitDict);
+        message1 = new tizen.Message("messaging.sms", {
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: generatePlainBody()
+        });
+
         service.sendMessage(message1, sendSuccess, sendError);
     });
 

diff --git a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html
index 283106e6cc3148c3ecd06087aacfc1895829c2eb..f0b829e72639e761ed7b42dce148a7be82f9c532 100755 (executable)
--- a/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html
+++ b/tct-messaging-sms-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsupdated_withoutfilter.html
@@ -85,12 +85,22 @@ t.step(function () {
     sendSuccess = t.step_func(function () {
         watcherId = service.messageStorage.addConversationsChangeListener(conversationChangeCB);
 
-        message2 = new tizen.Message("messaging.sms", smsMessageInitDict);
+        message2 = new tizen.Message("messaging.sms", {
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: generatePlainBody()
+        });
+
         service.sendMessage(message2, null, sendError);
     });
 
     removeAllSuccess = t.step_func(function () {
         message1 = new tizen.Message("messaging.sms", smsMessageInitDict);
+
+        message1 = new tizen.Message("messaging.sms", {
+            to: [TEST_SMS_RECIPIENT],
+            plainBody: generatePlainBody()
+        });
+
         service.sendMessage(message1, sendSuccess, sendError);
     });
 

diff --git a/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js
old mode 100644 (file)
new mode 100755 (executable)
index 6226d30..6279e6d
--- a/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js
+++ b/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js
@@ -33,9 +33,23 @@ var IO_ERR             = 'IOError';
 var UNKNOWN_ERR        = 'UnknownError';
 var EXCEPTION_TYPE = "name";
 
+var generatePlainBody = function () {
+    var datetime = new Date().getTime();
+    var count = 0;
+    var plainBody = function(datetime, count) {
+        return "sample plainBody: "+datetime+"-"+count;
+    }
+
+    generatePlainBody = function () {
+        count++;
+        return plainBody(datetime, count);
+    }
+    return plainBody(datetime, count);
+};
+
 var smsMessageInitDict = {
     to: [TEST_SMS_RECIPIENT],
-    plainBody: "sample plainBody"
+    plainBody: generatePlainBody()
 };