[Messaging-mms] various fixes - part 3
authorAndrzej Krolikowski <a.krolikowsk@samsung.com>
Tue, 13 Aug 2013 15:09:17 +0000 (17:09 +0200)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Wed, 14 Aug 2013 10:43:13 +0000 (10:43 +0000)
Change-Id: If418f0b69b7e0a2ffbcd8b8383980845a55ce79f

tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html
tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html
tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html
tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
tct-messaging-mms-tizen-tests/tests.xml

index 548686575172b0a95491e559d15705610de94f34..a5023409ad65702235c4b6fc0a9c33c9fcd69b2e 100644 (file)
@@ -23,7 +23,7 @@ Authors:
 <html lang="en">
 
 <head>
-<title>Messaging/UTC_messaging</title>
+<title>MessageStorage_mms_findConversations_filter_messageCount</title>
 <meta charset="utf-8">
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -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);
 });
 
 </script>
-
 </body>
-
 </html>
index cddf68948881fd088f63c6f4814e1c686c851da2..1df62fc59490dac2fcc436c5d6be6d6f4e452e6a 100644 (file)
@@ -23,7 +23,7 @@ Authors:
 <html lang="en">
 
 <head>
-<title>Messaging/UTC_messaging</title>
+<title>MessageStorage_mms_findConversations_filter_preview</title>
 <meta charset="utf-8">
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -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);
 });
 
 </script>
-
 </body>
-
 </html>
index 1eb5df9062b8a2d2e15c798bbcf3230dcc702724..7820c622624bd802ebadf221ff3753faeb193cc4 100644 (file)
@@ -23,7 +23,7 @@ Authors:
 <html lang="en">
 
 <head>
-<title>Messaging/UTC_messaging</title>
+<title>MessageStorage_mms_findConversations_filter_timestamp</title>
 <meta charset="utf-8">
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -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);
 });
 
 </script>
-
 </body>
-
 </html>
index 8ea0b50c98d593d0c028bd455dbef1898b1bdbd0..fdf4e8f371da4f69910e425fa800b6edcd5ccc70 100644 (file)
@@ -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';
index 988c38aae46bd1238764201c5b8c880ca1f9aeb4..2241ee66174b4e55fa4fc764e7af0ce5c6e86ce9 100644 (file)
       </testcase>
       <testcase purpose="check whether 'findConversations' method properly retrieves conversations matching the supplied 'messageCount' filter from MessageStorage" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_mms_findConversations_filter_messageCount">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>check whether 'findConversations' method properly retrieves conversations matching the supplied 'messageCount' filter from MessageStorage</step_desc>
-              <expected>Pass</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_messageCount.html</test_script_entry>
         </description>
         <specs>
       </testcase>
       <testcase purpose="check whether 'findConversations' method properly retrieves conversations matching the supplied 'preview' filter from MessageStorage" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_mms_findConversations_filter_preview">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>check whether 'findConversations' method properly retrieves conversations matching the supplied 'preview' filter from MessageStorage</step_desc>
-              <expected>Pass</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_preview.html</test_script_entry>
         </description>
         <specs>
       </testcase>
       <testcase purpose="check whether 'findConversations' method properly retrieves conversations matching the supplied 'timestamp' filter from MessageStorage" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_mms_findConversations_filter_timestamp">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>check whether 'findConversations' method properly retrieves conversations matching the supplied 'timestamp' filter from MessageStorage</step_desc>
-              <expected>Pass</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_timestamp.html</test_script_entry>
         </description>
         <specs>