projects / test / tct / web / api.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cca7a3c)
[Messaging-mms] fixed tests
authorAndrzej Krolikowski <a.krolikowsk@samsung.com>
Tue, 20 Aug 2013 14:27:37 +0000 (16:27 +0200)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Wed, 21 Aug 2013 07:46:53 +0000 (07:46 +0000)
Change-Id: I1acf9eda3c337a00c1bbb2f84962ab51387bac3e

tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html patch | blob | history
tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html patch | blob | history

diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html
index f370264089777e242922dc2e5447ee8a7e7fafd7..a2d4cbf1850357a552d6ea2b1c75c3a8238758f0 100644 (file)
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findConversations_filter_to.html
@@ -33,14 +33,14 @@ Authors:
 -->
 
 <html>
-  <head>
-    <title>check the function of findConversations in MessageStore</title>
-    <script type="text/javascript" src="../resources/unitcommon.js"></script>
-    <script type="text/javascript" src="support/messaging_common.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-    <script type="text/javascript">
+<head>
+<title>check the function of findConversations in MessageStore</title>
+<script type="text/javascript" src="../resources/unitcommon.js"></script>
+<script type="text/javascript" src="support/messaging_common.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<script type="text/javascript">
 //==== TEST: MessageStorage_mms_findConversations_filter_to
 //==== LABEL Check if method findConversations of MessageStorage (mms) filter to
 //==== ONLOAD_DELAY 90
@@ -51,40 +51,53 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test("MessageStorage_mms_findConversations_filter_to", {timeout: 90000}),
-    conversationsArrayCB, errorCallback, serviceListCB, messageService,
+    findSuccess, findError, serviceSuccess, messageService,
     initDict = mmsMessageInitDict, sendSuccess, sendError, newMessage,
-    filter;
+    filter, serviceError, i, j, found = false;
 
 t.step(function () {
 
-    conversationsArrayCB = t.step_func(function (conversations) {
-        assert_true(conversations.length > 0, " conversation found!");
-        assert_not_equals(conversations[0].to.indexOf(TEST_SMS_RECIPIENT), -1,
-            "Found conversation should have proper recipient");
+    findSuccess = t.step_func(function (conversations) {
+        assert_greater_than(conversations.length, 0, "Received empty conversations array");
+        for(i = 0; i < conversations.length; i++) {
+            for(j = 0; j < conversations[i].to.length; j++) {
+                if (conversations[i].to[j].indexOf(TEST_SMS_RECIPIENT) > -1) {
+                    found = true;
+                }
+            }
+            assert_true(found, "Recipient not found");
+            found = false;
+        }
         t.done();
     });
 
-    errorCallback = t.step_func(function (error) {
-        assert_unreached("Error messaging: " + error.message);
+    findError = t.step_func(function (error) {
+        assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     sendSuccess = t.step_func(function (recipients) {
         filter = new tizen.AttributeFilter("to", "CONTAINS", TEST_SMS_RECIPIENT);
-        messageService.messageStorage.findConversations(filter, conversationsArrayCB, errorCallback);
+        messageService.messageStorage.findConversations(filter, findSuccess, findError);
     });
     sendError = t.step_func(function (error) {
         assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    serviceListCB = t.step_func(function (services) {
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
+
         messageService = services[0];
         newMessage = new tizen.Message(messageService.type, initDict);
         messageService.sendMessage(newMessage, sendSuccess, sendError);
     });
 
-    tizen.messaging.getMessageServices("messaging.mms", serviceListCB);
+    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>
+</script>
+</body>
 </html>
diff --git a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html
index 2a7b3aba749ea673810530c40123ec259aa50e3f..33214fa6d975aa1bc5d7b298c3951dbe91ae6da1 100755 (executable)
--- a/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html
+++ b/tct-messaging-mms-tizen-tests/messaging/MessageStorage_mms_findMessages_hasAttachment_with_errorCallback.html
@@ -36,11 +36,11 @@ Authors:
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
 //==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA
-setup({timeout:90000});
-var t = async_test("MessageStorage_mms_findMessages_hasAttachment_with_errorCallback", {timeout:90000});
+setup({timeout: 90000});
+var t = async_test("MessageStorage_mms_findMessages_hasAttachment_with_errorCallback", {timeout: 90000}),
+    getMessageServicesErrorCB, getMessageServicesSuccessCB, messageService, messageStorage,
+    message, addDraftSuccessCB, addDraftErrorCB, filter, findSuccessCB, findErrorCB, i;
 t.step(function () {
-    var getMessageServicesErrorCB, getMessageServicesSuccessCB, messageService, messageStorage,
-        message, addDraftSuccessCB, addDraftErrorCB, filter, findSuccessCB, findErrorCB, i;
 
     findSuccessCB = t.step_func(function (msg) {
         assert_not_equals(msg.length, 0, "No messages found");
Domain: Testing;