From: Andrzej Krolikowski Date: Tue, 13 Aug 2013 15:09:17 +0000 (+0200) Subject: [Messaging-mms] various fixes - part 3 X-Git-Tag: 2.2.1_release~114^2~102 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77f2c9b1f07487a4eb84d48e0bd773a9dbe0fa2d;p=test%2Ftct%2Fweb%2Fapi.git [Messaging-mms] various fixes - part 3 Change-Id: If418f0b69b7e0a2ffbcd8b8383980845a55ce79f --- 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 548686575..a5023409a 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 @@ -23,7 +23,7 @@ Authors: -Messaging/UTC_messaging +MessageStorage_mms_findConversations_filter_messageCount @@ -35,43 +35,56 @@ Authors: //==== TEST: MessageStorage_mms_findConversations_filter_messageCount //==== LABEL check whether 'findConversations' method properly retrieves conversations matching the supplied 'messageCount' filter from MessageStorage -//==== STEP check whether 'findConversations' method properly retrieves conversations matching the supplied 'messageCount' filter from MessageStorage -//==== EXPECT Pass //==== PRIORITY P2 //==== ONLOAD_DELAY 90 //==== 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 -//==== TEST_CRITERIA MOA +//==== TEST_CRITERIA MOA MR setup({timeout: 90000}); -var this_test = async_test("MessageStorage_mms_findConversations_filter_messageCount", {timeout: 90000}); -this_test.step(function () { - var testName, self = this, findConversationsCallback, onError, getMessagingServicesCallback; +var t = async_test("MessageStorage_mms_findConversations_filter_messageCount", {timeout: 90000}), + serviceError, serviceSuccess, service, message, sendError, sendSuccess, messageCountFilter, + returnedValue = null, findError, findSuccess, i; +t.step(function () { + + findSuccess = t.step_func(function (conversations) { + assert_equals(returnedValue, undefined, "Incorrect returned value"); + assert_type(conversations, "array", "Not an array"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for(i = 0; i < conversations.length; i++) { + assert_type(conversations[i].messageCount, "unsigned long", "messageCount is not unsigned long"); + } + t.done(); + }); - testName = "findConversations test filter V04"; + findError = t.step_func(function (error) { + assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message); + }); - findConversationsCallback = self.step_func(function (conversations) { - return self.done(); + sendSuccess = t.step_func(function () { + messageCountFilter = new tizen.AttributeFilter("messageCount", "EXISTS"); + returnedValue = service.messageStorage.findConversations(messageCountFilter, findSuccess, findError); }); - onError = self.step_func(function (err) { - assert_unreached("Unexpected errorCallback arrived: " + err.message); + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); }); - getMessagingServicesCallback = self.step_func(function (services) { + serviceSuccess = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); + service = services[0]; - if (services.length === 1 && services[0].type === "messaging.mms") { - services[0].messageStorage.findConversations(messageCountFilter, findConversationsCallback, onError); - } else { - assert_unreached(testName + " getMessageServices wrong value arrived"); - } + message = new tizen.Message("messaging.mms", mmsMessageInitDict); + service.sendMessage(message, sendSuccess, sendError); }); - tizen.messaging.getMessageServices("messaging.mms", getMessagingServicesCallback, onError); + 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-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html index cddf68948..1df62fc59 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 @@ -23,7 +23,7 @@ Authors: -Messaging/UTC_messaging +MessageStorage_mms_findConversations_filter_preview @@ -35,43 +35,56 @@ Authors: //==== TEST: MessageStorage_mms_findConversations_filter_preview //==== LABEL check whether 'findConversations' method properly retrieves conversations matching the supplied 'preview' filter from MessageStorage -//==== STEP check whether 'findConversations' method properly retrieves conversations matching the supplied 'preview' filter from MessageStorage -//==== EXPECT Pass //==== PRIORITY P2 //==== ONLOAD_DELAY 90 //==== 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 -//==== TEST_CRITERIA MOA +//==== TEST_CRITERIA MOA MR setup({timeout: 90000}); -var this_test = async_test("MessageStorage_mms_findConversations_filter_preview", {timeout: 90000}); -this_test.step(function () { - var testName, self = this, findConversationsCallback, onError, getMessagingServicesCallback; +var t = async_test("MessageStorage_mms_findConversations_filter_preview", {timeout: 90000}), + serviceError, serviceSuccess, service, message, sendError, sendSuccess, previewFilter, + findError, findSuccess, i, returnedValue = null; +t.step(function () { + findSuccess = t.step_func(function (conversations) { + assert_equals(returnedValue, undefined, "Incorrect returned value"); + assert_type(conversations, "array", "Not an array"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for(i = 0; i < conversations.length; i++) { + assert_type(conversations[i].preview, "string", "preview is not a string"); + } - testName = "findConversations test filter V06"; + t.done(); + }); - findConversationsCallback = self.step_func(function (conversations) { - return self.done(); + findError = t.step_func(function (error) { + assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message); }); - onError = self.step_func(function (err) { - assert_unreached("Unexpected errorCallback arrived: " + err.message); + sendSuccess = t.step_func(function () { + previewFilter = new tizen.AttributeFilter("preview", "EXISTS"); + returnedValue = service.messageStorage.findConversations(previewFilter, findSuccess, findError); }); - getMessagingServicesCallback = self.step_func(function (services) { + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); + }); - if (services.length === 1 && services[0].type === "messaging.mms") { - services[0].messageStorage.findConversations(preview, findConversationsCallback, onError); - } else { - assert_unreached(testName + " getMessageServices wrong value arrived"); - } + 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); + service.sendMessage(message, sendSuccess, sendError); }); - tizen.messaging.getMessageServices("messaging.mms", getMessagingServicesCallback, onError); + 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-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html index 1eb5df906..7820c6226 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 @@ -23,7 +23,7 @@ Authors: -Messaging/UTC_messaging +MessageStorage_mms_findConversations_filter_timestamp @@ -35,43 +35,64 @@ Authors: //==== TEST: MessageStorage_mms_findConversations_filter_timestamp //==== LABEL check whether 'findConversations' method properly retrieves conversations matching the supplied 'timestamp' filter from MessageStorage -//==== STEP check whether 'findConversations' method properly retrieves conversations matching the supplied 'timestamp' filter from MessageStorage -//==== EXPECT Pass //==== PRIORITY P2 //==== ONLOAD_DELAY 90 //==== 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 -//==== TEST_CRITERIA MOA +//==== TEST_CRITERIA MOA MR setup({timeout: 90000}); -var this_test = async_test("MessageStorage_mms_findConversations_filter_timestamp", {timeout: 90000}); -this_test.step(function () { - var testName, self = this, findConversationsCallback, onError, getMessagingServicesCallback, foundConversation; +var t = async_test("MessageStorage_mms_findConversations_filter_timestamp", {timeout: 90000}), + serviceError, serviceSuccess, service, message, sendError, sendSuccess, + startDate, endDate, findError, findSuccess, i, timestampFilter, returnedValue = null; +t.step(function () { + + findSuccess = t.step_func(function (conversations) { + assert_equals(returnedValue, undefined, "Incorrect returned value"); + assert_type(conversations, "array", "Not an array"); + assert_greater_than(conversations.length, 0, "Received empty conversations array"); + for(i = 0; i < conversations.length; i++) { + assert_greater_than_equal(conversations[i].timestamp.getTime(), startDate.getTime(), "Incorrect date - too early"); + assert_less_than_equal(conversations[i].timestamp.getTime(), endDate.getTime(), "Incorrect date - too late"); + } - testName = "findConversations test filter V03"; + t.done(); + }); - findConversationsCallback = self.step_func(function (conversations) { - return self.done(); + findError = t.step_func(function (error) { + assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message); }); - onError = self.step_func(function (err) { - assert_unreached("Unexpected errorCallback arrived: " + err.message); + sendSuccess = t.step_func(function () { + timestampFilter = new tizen.AttributeRangeFilter("timestamp", startDate, endDate); + returnedValue = service.messageStorage.findConversations(timestampFilter, findSuccess, findError); }); - getMessagingServicesCallback = self.step_func(function (services) { + sendError = t.step_func(function (error) { + assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message); + }); - if (services.length === 1 && services[0].type === "messaging.mms") { - services[0].messageStorage.findConversations(timestampFilter, findConversationsCallback, onError); - } else { - assert_unreached(testName + " getMessageServices wrong value arrived"); - } + serviceSuccess = t.step_func(function (services) { + assert_greater_than(services.length, 0, "Received empty services array"); + service = services[0]; + + startDate = new Date(); + endDate = new Date(); + endDate.setFullYear(endDate.getFullYear() + 1); + + message = new tizen.Message("messaging.mms", mmsMessageInitDict); + setTimeout(t.step_func(function () { + service.sendMessage(message, sendSuccess, sendError); + }, 2000)); + }); + + serviceError = t.step_func(function (error) { + assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message); }); - tizen.messaging.getMessageServices("messaging.mms", getMessagingServicesCallback, onError); + tizen.messaging.getMessageServices("messaging.mms", serviceSuccess, serviceError); }); - - diff --git a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js index 8ea0b50c9..fdf4e8f37 100644 --- a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js +++ b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js @@ -30,13 +30,10 @@ var sendMessageReturnValue; var mmsService; var MMStypeFilter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.mms"); -var timestampFilter = new tizen.AttributeRangeFilter("timestamp", new Date(2012, 1, 15), new Date(2012, 12, 30)); var fromFilter = new tizen.AttributeFilter("from", "CONTAINS", TEST_SMS_RECIPIENT); var idFilter = new tizen.AttributeFilter("id", "EXACTLY", "1"); -var messageCountFilter = new tizen.AttributeFilter("messageCount", "EXACTLY", 2); var unreadMessagesFilter = new tizen.AttributeFilter("unreadMessages", "EXACTLY", 0); -var preview = new tizen.AttributeFilter("preview", "EXACTLY", "title"); var TYPE_MISMATCH_ERR = 'TypeMismatchError'; var INVALID_VALUES_ERR = 'InvalidValuesError'; diff --git a/tct-messaging-mms-tizen-tests/tests.xml b/tct-messaging-mms-tizen-tests/tests.xml index 988c38aae..2241ee661 100644 --- a/tct-messaging-mms-tizen-tests/tests.xml +++ b/tct-messaging-mms-tizen-tests/tests.xml @@ -740,12 +740,6 @@ - - - check whether 'findConversations' method properly retrieves conversations matching the supplied 'messageCount' filter from MessageStorage - Pass - - /opt/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html @@ -758,12 +752,6 @@ - - - check whether 'findConversations' method properly retrieves conversations matching the supplied 'preview' filter from MessageStorage - Pass - - /opt/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html @@ -776,12 +764,6 @@ - - - check whether 'findConversations' method properly retrieves conversations matching the supplied 'timestamp' filter from MessageStorage - Pass - - /opt/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html