[Messaging-sms][Messaging-mms] removed sending a message to device under test
authorAndrzej Krolikowski <a.krolikowsk@samsung.com>
Thu, 26 Sep 2013 14:48:41 +0000 (16:48 +0200)
committerAndrzej Krolikowski <a.krolikowsk@samsung.com>
Thu, 26 Sep 2013 14:48:41 +0000 (16:48 +0200)
Change-Id: I10dccdb2a18fd33031f81ac332c07e477a544478

tct-messaging-mms-tizen-tests/README
tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_from.html
tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_from_with_errorCallback.html
tct-messaging-mms-tizen-tests/messaging/Message_mms_from_attribute.html
tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
tct-messaging-sms-tizen-tests/README
tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_findConversations.html
tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js

index 11bf053bf0f72251b4bf7bba45ed077f0dfefeb5..91765e207b823b6edca4d5520335cfbeec0980d5 100644 (file)
@@ -54,10 +54,11 @@ Pre-condition
    messaging/support/messaging_common.js
    for message recipients. Here's the variables to modify:
 
-TEST_SMS_RECIPIENT          MUST be set to phone number of the device on which the tests will be run
-                            (without country calling code)
+TEST_SMS_RECIPIENT          MUST be set to phone number
+                            (different from the device under test and without country calling code)
 TEST_SMS_RECIPIENT_2        MUST be set to phone number
-                            (different from TEST_SMS_RECIPIENT and without country calling code)
+                            (different from the device under test,
+                             different from TEST_SMS_RECIPIENT and without country calling code)
 
 ----------------------------------------------
 Build and Run
index 0b2eb59d59f9040f22ebf7fdcda6d15b12307431..d9b5b6337d11aeb24b8b8c1a70d2b6635e99105a 100644 (file)
@@ -43,33 +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, 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");
+
         t.done();
     });
 
@@ -77,27 +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);
-            assert_equals(returnedValue, undefined, "Incorrect returned value");
-        })
-    };
-
-    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) {
@@ -111,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) {
index 7fb0151ee7f486890ce96d8144ae556204b5eae7..d79528583824577d1dd9b7da1f58ac99ab747aa3 100644 (file)
@@ -39,75 +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, 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");
         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");
+    addSuccess = t.step_func(function () {
+        returnedValue = messageStorage.findMessages(fromFilter, findSuccess, findError);
 
-        messageStorage.removeChangeListener(watchId);
-        watchId = null;
-
-        returnedValue = messageStorage.findMessages(fromFilter, findSuccessCB, findErrorCB);
-        assert_equals(returnedValue, undefined, "Incorrect returned value");
     });
 
-    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", {
@@ -115,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>
index 3f9d270f6b2b2560bf5eb8e88af6ef982d773579..ff5a998ac0eeb0092e130f9aa521ad4faf188fdf 100644 (file)
@@ -37,44 +37,14 @@ Authors:
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 90
 //==== TEST_CRITERIA AE ADV ARO AT
-setup({timeout: 90000});
 
-var t = async_test("Message_mms_from_attribute", {timeout: 90000}), message,
-    service, onSuccess, currentDate = new Date(), serviceError, serviceSuccess,
-    plainBodyToSet = currentDate.getTime().toString(), originalFrom;
-t.step(function () {
-    message = new tizen.Message("messaging.mms");
+test(function () {
+    var message = new tizen.Message("messaging.mms");
 
     assert_true("from" in message, "No 'from' attribute in message");
     assert_equals(message.from, null, "'from' should be null by default");
     check_readonly(message, "from", null, "object", message.from + "dummyValue");
-
-    onSuccess = t.step_func(function (receivedMessage) {
-        assert_type(receivedMessage.from, "string", "from is not a string");
-        assert_greater_than(receivedMessage.from.indexOf(TEST_SMS_RECIPIENT), -1, "Incorrect from attribute");
-
-        originalFrom = receivedMessage.from;
-        receivedMessage.from = TEST_SMS_RECIPIENT_2;
-        assert_equals(receivedMessage.from, originalFrom, "from can be modified");
-
-        t.done();
-    });
-
-    serviceSuccess = t.step_func(function (services) {
-        assert_greater_than(services.length, 0, "Received empty services array");
-        service = services[0];
-
-        message = new tizen.Message("messaging.mms", mmsMessageInitDict);
-        message.body.plainBody = plainBodyToSet;
-        sendAndReceiveMessage(t, service, message, plainBodyToSet, onSuccess);
-    });
-
-    serviceError = t.step_func(function (error) {
-        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    tizen.messaging.getMessageServices("messaging.mms", serviceSuccess, serviceError);
-});
+}, "Message_mms_from_attribute");
 
 </script>
 </body>
index 22eda01a9029a28ce0fa5bd3db07e5beda93d1be..b179ee08bf283827fe623139e5bc513a355db5f1 100644 (file)
@@ -26,7 +26,6 @@ var TEST_SMS_RECIPIENT_2 = ""; // this variable MUST be set before executing tes
 var imagePathToSet = "images/webapi-tizen-messaging-test_image.jpg";
 var soundPathToSet = "music/webapi-tizen-messaging-test_noise.mp3";
 
-var sendMessageReturnValue;
 var mmsService;
 
 var MMStypeFilter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.mms");
@@ -94,55 +93,3 @@ function removeAllMessages(t, service, onSuccess) {
         service.messageStorage.findMessages(MMStypeFilter, findSuccess, findError);
     });
 }
-
-/*
-- send message SMS or MMS (msg)
-- wait for a message with body.plainBody equal to expectedPlainBody
-- call given callback (onReceive)
-- remember to remove sendAndReceiveMessageListenerId (if !== null)
-*/
-function sendAndReceiveMessage(t, service, msg, expectedPlainBody, onReceive) {
-  var callback;
-
-  function onReceiveInternal(messages) {
-      t.step(function () {
-          var i, found = -1;
-
-          for (i = 0 ; i < messages.length ; i++) {
-              if (messages[i].body.plainBody === expectedPlainBody && msg.id !== messages[i].id && messages[i].from !== null && messages[i].from !== undefined) {
-                  found = i;
-                  break;
-              }
-          }
-
-          if (found > -1) {
-              service.messageStorage.removeChangeListener(sendAndReceiveMessageListenerId);
-              sendAndReceiveMessageListenerId = null;
-              onReceive(messages[found]);
-          }
-      });
-  }
-
-  callback = {
-      messagesupdated: function () {},
-      messagesadded: onReceiveInternal,
-      messagesremoved: function () {}
-  };
-
-  function sendSuccess() {
-  }
-
-  function sendError(error) {
-      t.step(function () {
-          service.messageStorage.removeChangeListener(sendAndReceiveMessageListenerId);
-          sendAndReceiveMessageListenerId = null;
-          assert_unreached("Failed to send message: " + error.message);
-      });
-  }
-
-  t.step(function () {
-      sendAndReceiveMessageListenerId = service.messageStorage.addMessagesChangeListener(callback);
-
-      service.sendMessage(msg, sendSuccess, sendError);
-  });
-}
index 9ec53014fa682ca370f99c445c02d7f2fec13a1a..8782389db3f71be92519e5d0cae0f84abcb56fcc 100644 (file)
@@ -50,10 +50,11 @@ Pre-condition
    Messaging/support/messaging_common.js 
    for message recipients. Here's the variables to modify:
 
-TEST-SMS_RECIPIENT          MUST be set to phone number of the device on which the tests will be run
-                            (without country calling code)
-TEST-SMS_RECIPIENT_2        MUST be set to phone number
-                            (different from TEST_SMS_RECIPIENT and without country calling code)
+TEST_SMS_RECIPIENT          MUST be set to phone number
+                            (different from the device under test and without country calling code)
+TEST_SMS_RECIPIENT_2        MUST be set to phone number
+                            (different from the device under test,
+                             different from TEST_SMS_RECIPIENT and without country calling code)
 
 ----------------------------------------------
 Build and Run
index 4b2d40ddb7865da9d657058a3fa66bd4f9cbee58..da4934c00cff0379554b556bb2444b8578a98541 100644 (file)
@@ -68,7 +68,7 @@ t.step(function () {
     });
 
     addError = t.step_func(function (error) {
-        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+        assert_unreached("addDraftMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     removeAllSuccess = t.step_func(function () {
index 2dc5aeded233aac30e9a4f36ffcf46c2a3b4d45e..6226d3050c717652031e4599774fd60da218c8de 100644 (file)
@@ -23,7 +23,6 @@ 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
 
-var sendMessageReturnValue;
 var smsService;
 
 var TYPE_MISMATCH_ERR  = 'TypeMismatchError';