[Messaging-mms] conflict_fix

Change-Id: If6ea73856e21308592dd2192d2c6286d55b359d1

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html
index 6c263f5369fbcd05e2f1bd2c551d4b23aea074f1..d9b5b6337d11aeb24b8b8c1a70d2b6635e99105a 100644 (file)
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html
@@ -43,35 +43,18 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test("MessageStorage_mms_findConversations_filter_from", {timeout: 90000}),
-    messageReceived, foundConversationId = false, listenerId = null, listener, message,
-    findError, findSuccess, i, returnedValue = null, service,
-    serviceError, serviceSuccess, datetime, messageStorage, sendError, sendSuccess,
-    fromFound, plainBodyFilter, fromAndPlainBodyFilter;
+    returnedValue = null, findSuccess, fromFound, findError, addSuccess, addError,
+    serviceSuccess, service, datetime, message, messageStorage, serviceError, i;
 t.step(function () {
-    add_result_callback(function (res) {
-        try {
-            if (listenerId !== null) {
-                messageStorage.removeChangeListener(listenerId);
-            }
-        } catch (err) {
-            // do nothing in case removeChangeListener throw an exception
-        }
-    });
 
     findSuccess = t.step_func(function (conversations) {
-        assert_greater_than(conversations.length, 0, "Received empty conversation array");
+        assert_equals(returnedValue, undefined, "Incorrect returned value");
         for (i = 0; i < conversations.length; i++) {
             assert_not_equals(conversations[i].from, null, "from is null");
             fromFound = conversations[i].from.indexOf(TEST_SMS_RECIPIENT);
             assert_greater_than_equal(fromFound, 0, "Recipient not found");
-
-            if (conversations[i].id === messageReceived.conversationId) {
-                foundConversationId = true;
-            }
         }
-        assert_true(foundConversationId, "ConversationId from added message was not found");
 
-        assert_equals(returnedValue, undefined, "Incorrect returned value");
         t.done();
     });
 
@@ -79,26 +62,12 @@ t.step(function () {
         assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    listener = {
-        messagesadded: t.step_func(function (messages) {
-            assert_equals(messages.length, 1, "Incorrect number of messages.");
-            messageReceived = messages[0];
-            assert_equals(messageReceived.body.plainBody, datetime, "Incorrect plainBody found");
-            assert_not_equals(messageReceived.id, message.id, "Incorrect id found - id of sent message");
-
-            messageStorage.removeChangeListener(listenerId);
-            listenerId = null;
-
-            returnedValue = service.messageStorage.findConversations(fromFilter, findSuccess, findError);
-        })
-    };
-
-    sendSuccess = t.step_func(function () {
-        //just ignore this
+    addSuccess = t.step_func(function () {
+        returnedValue = service.messageStorage.findConversations(fromFilter, findSuccess, findError);
     });
 
-    sendError = t.step_func(function (error) {
-        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    addError = t.step_func(function (error) {
+        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     serviceSuccess = t.step_func(function (services) {
@@ -112,10 +81,7 @@ t.step(function () {
         });
 
         messageStorage = service.messageStorage;
-        plainBodyFilter = new tizen.AttributeFilter("body.plainBody", "EXACTLY", datetime);
-        fromAndPlainBodyFilter = new tizen.CompositeFilter("INTERSECTION", [fromFilter, plainBodyFilter]);
-        listenerId = messageStorage.addMessagesChangeListener(listener, fromAndPlainBodyFilter);
-        service.sendMessage(message, sendSuccess, sendError);
+        service.messageStorage.addDraftMessage(message, addSuccess, addError);
     });
 
     serviceError = t.step_func(function (error) {

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html
index 7190362b8da8034e8874593db08ee1b5060855a3..d79528583824577d1dd9b7da1f58ac99ab747aa3 100644 (file)
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html
@@ -39,76 +39,37 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test("MessageStorage_mms_findMessages_from_with_errorCallback", {timeout: 90000}),
-    getMessageServicesErrorCB, getMessageServicesSuccessCB, messageService, messageStorage,
-    message, messageReceived, findSuccessCB, findErrorCB, i, onMessagesAdded,
-    datetime, filterSuccess = 0, watchId = null, callbackListener,
-    sendSuccess, sendError, returnedValue = null, fromFound, plainBodyFilter, fromAndPlainBodyFilter;
-
+    returnedValue = null, findSuccess, findError, addSuccess, addError, serviceSuccess,
+    serviceError, datetime, message, i, fromFound, service, messageStorage;
 t.step(function () {
-    add_result_callback(function (res) {
-        try {
-            if (watchId !== null) {
-                messageStorage.removeChangeListener(watchId);
-            }
-        } catch (err) {
-            // do nothing in case removeChangeListener throw an exception
-        }
-    });
 
-    findSuccessCB = t.step_func(function (msg) {
-        assert_greater_than(msg.length, 0, "No messages found");
+    findSuccess = t.step_func(function (msg) {
+        assert_equals(returnedValue, undefined, "Incorrect returned value");
         for (i = 0; i < msg.length; i++) {
             assert_not_equals(msg[i].from, null, "from is null");
             fromFound = msg[i].from.indexOf(TEST_SMS_RECIPIENT);
             assert_greater_than_equal(fromFound, 0, "Recipient not found");
-
-            if (msg[i].id === messageReceived.id) {
-                filterSuccess++;
-            }
         }
 
-        assert_equals(filterSuccess, 1, "Incorrect number of found message");
-
-        assert_equals(returnedValue, undefined, "Incorrect returned value");
         t.done();
     });
 
-    findErrorCB = t.step_func(function (error) {
+    findError = t.step_func(function (error) {
         assert_unreached("findMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    onMessagesAdded = t.step_func(function (messages) {
-        assert_equals(messages.length, 1, "Incorrect number of messages.");
-        messageReceived = messages[0];
-        assert_equals(messageReceived.body.plainBody, datetime, "Incorrect plainBody found");
-        assert_not_equals(messageReceived.id, message.id, "Incorrect id found - id of sent message");
-
-        messageStorage.removeChangeListener(watchId);
-        watchId = null;
+    addSuccess = t.step_func(function () {
+        returnedValue = messageStorage.findMessages(fromFilter, findSuccess, findError);
 
-        returnedValue = messageStorage.findMessages(fromFilter, findSuccessCB, findErrorCB);
     });
 
-    callbackListener = {
-        messagesupdated: t.step_func(function (messages) {
-            assert_unreached("Should not enter messagesupdated: " + messages.length);
-        }),
-        messagesadded: onMessagesAdded,
-        messagesremoved: t.step_func(function (messages) {
-            assert_unreached("Should not enter messagesremoved: " + messages.length);
-        })
-    };
-
-    sendSuccess = t.step_func(function () {
-        //just ignore this
+    addError = t.step_func(function (error) {
+        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    sendError = t.step_func(function (error) {
-        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    getMessageServicesSuccessCB = t.step_func(function (services) {
+    serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
+        service = services[0];
 
         datetime = tizen.time.getCurrentDateTime().toString();
         message = new tizen.Message("messaging.mms", {
@@ -116,19 +77,16 @@ t.step(function () {
             to: [ TEST_SMS_RECIPIENT ]
         });
 
-        messageService = services[0];
-        messageStorage = messageService.messageStorage;
-        plainBodyFilter = new tizen.AttributeFilter("body.plainBody", "EXACTLY", datetime);
-        fromAndPlainBodyFilter = new tizen.CompositeFilter("INTERSECTION", [fromFilter, plainBodyFilter]);
-        watchId = messageStorage.addMessagesChangeListener(callbackListener, fromAndPlainBodyFilter);
-        messageService.sendMessage(message, sendSuccess, sendError);
+        messageStorage = service.messageStorage;
+        service.messageStorage.addDraftMessage(message, addSuccess, addError);
+
     });
 
-    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.mms", getMessageServicesSuccessCB, getMessageServicesErrorCB);
+    tizen.messaging.getMessageServices("messaging.mms", serviceSuccess, serviceError);
 });
 
 </script>