[Messaging-email][Messaging-sms] various fixes - part 1
authorAndrzej Krolikowski <a.krolikowsk@samsung.com>
Tue, 13 Aug 2013 07:16:09 +0000 (09:16 +0200)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Tue, 13 Aug 2013 14:24:00 +0000 (14:24 +0000)
Change-Id: Iabc0ceeca8879b20813b7acbbfcf363a517dd63e

tct-messaging-email-tizen-tests/README
tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg.html
tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_invalid_cb.html
tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId.html
tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId_folderPath.html [deleted file]
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_invalid_cb.html
tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_missarg.html
tct-messaging-email-tizen-tests/tests.xml
tct-messaging-sms-tizen-tests/messaging/MessageStorage_sms_updateMessages_successCallback_TypeMismatch.html

index 8ce46f1a35635e4df692d8cc27747c2bb4d20e3d..c83e0102de1a45d790f03a27abf3ea1da5363899 100644 (file)
@@ -44,6 +44,7 @@ Test Environment
 ----------------------------------------------
 Pre-condition
 ----------------------------------------------
+There must be exactly one e-mail account configured.
 1. Add an account through Setting application.
    (Settings -> Personal / Accounts)
        2.1 set Email address:gmail 
index 3f933c59b0fa80753745286d93eb2ef1cbc1ec32..4293915bc1ea19a1a489bd87405ae0594d9ae0ee 100644 (file)
@@ -38,17 +38,17 @@ Authors:
 //==== TEST_CRITERIA MMA
 
 setup({timeout: 90000});
-var t = async_test("MessageService_email_loadMessageBody_missarg", {timeout:90000});
+var t = async_test("MessageService_email_loadMessageBody_missarg", {timeout:90000}),
+    messageService, messageStorage,
+    currentDate = new Date(), subjectToSet = currentDate.getTime().toString(),
+    message, attachment,
+    serviceSuccess, serviceError, addDraftSuccess, addDraftError, exceptionName = "TypeMismatchError";
 t.step(function () {
-    var messageService, messageStorage,
-        currentDate = new Date(), subjectToSet = currentDate.getTime().toString(),
-        message, attachment,
-        serviceSuccess, serviceError, addDraftSuccess, addDraftError, exceptionName = "TypeMismatchError";
 
     addDraftSuccess = t.step_func(function () {
         assert_throws({ name: exceptionName },
             function () {
-                messageService.loadMessageAttachment(message.attachments[0]);
+                messageService.loadMessageBody(message);
             }, exceptionName + " should be thrown - missing argument.");
         t.done();
     });
@@ -71,6 +71,7 @@ t.step(function () {
     serviceError = t.step_func(function (error) {
         assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
     });
+
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
 </script>
index 70149026d64732eba617c93b5ef7b6d3b2ad3ca3..14aa4e94c73909ede17e1365a5e5d1c46a34154e 100644 (file)
@@ -36,31 +36,35 @@ Authors:
 //==== EXPECT: An exception must be thrown.
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
 //==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
-//==== TEST_CRITERIA MC
+//==== TEST_CRITERIA MTCB
 //==== ONLOAD_DELAY 90
 setup({timeout: 90000});
 
 var t = async_test("MessageService_sync_successCallback_invalid_cb", {timeout: 90000}),
-    successCallback, errorCallback, serviceListCB, ret = null,
+    successCallback, serviceSuccess, serviceError,
     exceptionName = "TypeMismatchError";
 
 t.step(function () {
-    errorCallback = t.step_func(function (e) {
-        assert_unreached("Error: " + e);
-    });
+
     successCallback = {
-        onsuccess: "wrong callback"
+        onsuccess: t.step_func(function () {
+            assert_unreached("Incorrect successCallback invoked.");
+        })
     };
-    serviceListCB = t.step_func(function (services) {
+    serviceSuccess = t.step_func(function (services) {
         assert_true(services.length > 0, "No MessageService found.");
         assert_throws({name : exceptionName},
             function () {
-                ret = services[0].sync(successCallback);
-        }, exceptionName + " should be thrown - given incorrect successCallback.");
+                services[0].sync(successCallback);
+            }, exceptionName + " should be thrown - given incorrect successCallback.");
         t.done();
     });
-    tizen.messaging.getMessageServices("messaging.email", serviceListCB,
-        errorCallback);
+
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
 </script>
 </body>
index 83f0c6865cda967127c9e88bc1c7f6db30705439..dbaee246085447bdf490367d7cfeb538085cf3c6 100644 (file)
@@ -57,7 +57,7 @@ t.step(function () {
     serviceSuccess = t.step_func(function (services) {
         assert_greater_than(services.length, 0, "Received empty services array");
 
-        serviceIdFilter = new tizen.AttributeFilter("serviceId", "EXACTLY", "1");
+        serviceIdFilter = new tizen.AttributeFilter("serviceId", "EXACTLY", services[0].id);
         returnedValue = services[0].messageStorage.findFolders(serviceIdFilter, findFoldersSuccess, findFoldersError);
     });
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId_folderPath.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId_folderPath.html
deleted file mode 100644 (file)
index 608ec1e..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-
-Copyright (c) 2013 Samsung Electronics Co., Ltd.
-
-Licensed under the Apache License, Version 2.0 (the License);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-
-Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
--->
-<html lang="en">
-
-<head>
-<title>MessageStorage_findFolders_filter_serviceId_folderPath</title>
-<meta charset="utf-8">
-<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>
-
-//==== TEST: MessageStorage_findFolders_filter_serviceId_folderPath
-//==== LABEL check whether 'findFolders' method properly retrieves folders matching the supplied filter from MessageStorage (part 2)
-//==== PRIORITY P2
-//==== ONLOAD_DELAY 90
-//==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#findFoldersid2466935
-//==== TEST_CRITERIA MOA MR
-setup({timeout: 90000});
-
-var t = async_test("MessageStorage_findFolders_filter_serviceId_folderPath", {timeout: 90000}),
-    serviceError, serviceSuccess, serviceIdFilter, folderPath, filter, findFoldersError, findFoldersSuccess,
-    returnedValue = null;
-
-t.step(function () {
-    findFoldersSuccess = t.step_func(function (folders) {
-        assert_equals(returnedValue, undefined, "Incorrect returned value");
-        t.done();
-    });
-
-    findFoldersError = t.step_func(function (error) {
-        assert_unreached("findFolders() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    serviceSuccess = t.step_func(function (services) {
-        assert_greater_than(services.length, 0, "Received empty services array");
-
-        serviceIdFilter = new tizen.AttributeFilter("serviceId", "EXACTLY", "1");
-        folderPath = new tizen.AttributeFilter("path", "EXACTLY", "INBOX");
-        filter = new tizen.CompositeFilter("INTERSECTION", [serviceIdFilter, folderPath]);
-        returnedValue = services[0].messageStorage.findFolders(filter, findFoldersSuccess, findFoldersError);
-    });
-
-    serviceError = t.step_func(function (error) {
-        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
-    });
-
-    tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
-});
-
-</script>
-</body>
-</html>
index 59178b76966bc3de82309bc94b0e932b629e2aef..7af74ef46a15bb50a2ff7cee9eee21ccad7ed41d 100644 (file)
@@ -22,7 +22,7 @@ Authors:
 
 <html>
 <head>
-<title>MessageStorage_removeConversations_successCallback_invalid_cb</title>
+<title>MessageStorage_removeConversations_errorCallback_invalid_cb</title>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
 </head>
@@ -32,8 +32,6 @@ Authors:
 //==== TEST: MessageStorage_removeConversations_errorCallback_invalid_cb
 //==== LABEL: Test whether the constructor of the interface is defined or not for errorCallback callback in removeConversations method.
 //==== PRIORITY: P2
-//==== STEP: Test whether the constructor of the interface is defined or not for errorCallback callback in start method.
-//==== EXPECT: An exception must be thrown.
 //==== ONLOAD_DELAY 90
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
 //==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
@@ -41,48 +39,57 @@ Authors:
 setup({timeout:90000});
 
 var t = async_test("MessageStorage_removeConversations_errorCallback_invalid_cb", {timeout: 90000}),
-    service, successCallback, conversationsArrayCB, errorCB, errorCallback,
-    serviceListCB, ret = null, serviceListCB,
-    exceptionName = "TypeMismatchError", msg, filter;
+    service, serviceError, serviceSuccess, sendError, sendSuccess, findError, findSuccess,
+    exceptionName = "TypeMismatchError", msg, filter, errorCallback, successCallback;
 t.step(function () {
-    errorCB = t.step_func(function (error) {
-        assert_unreached("Error: " + error.message);
-    });
-    successCallback = t.step_func(function (error) {
+
+    successCallback = t.step_func(function () {
         assert_unreached("removeConversations() success callback invoked.");
     });
+
     errorCallback = {
         onerror: t.step_func(function (error) {
             assert_unreached("removeConversations() error callback invoked.");
         })
     };
-    conversationsArrayCB = t.step_func(function (conversations) {
+
+    findSuccess = t.step_func(function (conversations) {
         assert_true(conversations.length > 0, "find conversation");
-        assert_throws({name : exceptionName},
-            function () {
-                service.messageStorage.removeConversations(conversations,
-                     successCallback, errorCallback);
-        }, exceptionName + " should be thrown - given incorrect successCallback.");
+
+        assert_throws({name : exceptionName}, function () {
+            service.messageStorage.removeConversations(conversations, successCallback, errorCallback);
+        }, exceptionName + " should be thrown - given incorrect error callback.");
+
         t.done();
     });
-    serviceListCB = t.step_func(function (services) {
+
+    findError = t.step_func(function (error) {
+        assert_unreached("findConversations() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    sendSuccess = t.step_func(function () {
+        filter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.email");
+        service.messageStorage.findConversations(filter, findSuccess, findError);
+    });
+
+    sendError = t.step_func(function (error) {
+        assert_unreached("sendMessage() error callback: name:" + error.name + ", msg:" + error.message);
+    });
+
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
+
         service = services[0];
         msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
             subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg);
-        setTimeout(
-            function () {
-                ret = service.sync();
-        }, 15000);
-        setTimeout(
-            function () {
-                service.stopSync(ret);
-        }, 22000);
-        filter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.email");
-        service.messageStorage.findConversations(filter, conversationsArrayCB, errorCB);
+        service.sendMessage(msg, sendSuccess, sendError);
+    });
+
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    tizen.messaging.getMessageServices("messaging.email", serviceListCB);
+    tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
 </script>
 </body>
index 8105b517386fc1816aed6edbf9348e71d9570ad7..d4a1fde4d4d3dbeaf5fa134b79a13c6adb6ddb87 100644 (file)
@@ -41,39 +41,25 @@ Authors:
 setup({timeout:90000});
 
 var t = async_test("MessageStorage_removeConversations_missarg", {timeout: 90000}),
-    service, conversationsArrayCB, errorCB, msg, filter,
-    serviceListCB, ret = null;
+    service, serviceError, serviceSuccess;
 t.step(function () {
-    errorCB = t.step_func(function (error) {
-        assert_unreached("Error: " + error.message);
-    });
-    conversationsArrayCB = t.step_func(function (conversations) {
-        assert_true(conversations.length > 0, "find conversation");
-        assert_throws({name: "TypeMismatchError"},
-            function () {
-                service.messageStorage.removeConversations();
+
+    serviceSuccess = t.step_func(function (services) {
+        assert_greater_than(services.length, 0, "Received empty services array");
+        service = services[0];
+
+        assert_throws({name: "TypeMismatchError"}, function () {
+            service.messageStorage.removeConversations();
         });
+
         t.done();
     });
 
-    serviceListCB = t.step_func(function (services) {
-        service = services[0];
-        msg = new tizen.Message("messaging.email", {plainBody: "Message text.",
-            subject: "Some subject", to: [TEST_EMAIL_RECIPIENT_2]});
-        service.sendMessage(msg);
-        setTimeout(
-            function () {
-                ret = service.sync();
-        }, 15000);
-        setTimeout(
-            function () {
-                service.stopSync(ret);
-        }, 22000);
-        filter = new tizen.AttributeFilter("type", "EXACTLY", "messaging.email");
-        service.messageStorage.findConversations(filter, conversationsArrayCB, errorCB);
+    serviceError = t.step_func(function (error) {
+        assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    tizen.messaging.getMessageServices("messaging.email", serviceListCB);
+    tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
 </script>
 </body>
index 4e6100112bc8fb1d5107a067a0b10a2347eba441..9587f84ba23ba83281dcda6c9f4907cca90fa235 100644 (file)
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="check whether 'findFolders' method properly retrieves folders matching the supplied filter from MessageStorage (part 2)" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_findFolders_filter_serviceId_folderPath">
-        <description>
-          <test_script_entry>/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId_folderPath.html</test_script_entry>
-        </description>
-        <specs>
-          <spec>
-            <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#findFoldersid2466935</spec_url>
-            <spec_statement>TBD</spec_statement>
-          </spec>
-        </specs>
-      </testcase>
       <testcase purpose="Check if exception is thrown when mandatory arguments not given" type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_findFolders_missarg">
         <description>
           <test_script_entry>/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_missarg.html</test_script_entry>
       </testcase>
       <testcase purpose="Test whether the constructor of the interface is defined or not for errorCallback callback in removeConversations method." type="compliance" onload_delay="90" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_removeConversations_errorCallback_invalid_cb">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>Test whether the constructor of the interface is defined or not for errorCallback callback in start method.</step_desc>
-              <expected>An exception must be thrown.</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_invalid_cb.html</test_script_entry>
         </description>
         <specs>
index 9b1b7426d4ff116662961cd2cc0fbaf1f945f26b..6cb79f69676d1b111948e7c2d5d8956722e853e1 100644 (file)
@@ -38,12 +38,12 @@ Authors:
 //==== TEST_CRITERIA MC
 setup({timeout: 90000});
 
-var t = async_test("MessageStorage_sms_updateMessages_successCallback_TypeMismatch", {timeout:90000});
+var t = async_test("MessageStorage_sms_updateMessages_successCallback_TypeMismatch", {timeout:90000}),
+    serviceSuccess, serviceError, messageService, messageStorage, message,
+    addDraftSuccess, addDraftError, exceptionName,
+    updateError, incorrectCallback, conversionTable, i;
+
 t.step(function () {
-    var serviceSuccess, serviceError, services,
-        messageService, messageStorage, message,
-        addDraftSuccess, addDraftError, exceptionName,
-        updateError, incorrectCallback, conversionTable, i;
 
     updateError = t.step_func(function (error) {
         assert_unreached("updateMessages() error callback: name:" + error.name + ", msg:" + error.message);
@@ -59,7 +59,7 @@ t.step(function () {
             assert_throws({name : exceptionName},
             function () {
                 messageStorage.updateMessages([message], incorrectCallback, updateError);
-            }, exceptionName + " should be thrown - given incorrect error callback - " + incorrectCallback);
+            }, exceptionName + " should be thrown - given incorrect success callback - " + incorrectCallback);
         }
         t.done();
     });
@@ -80,6 +80,7 @@ t.step(function () {
     serviceError = t.step_func(function (error) {
         assert_unreached("getMessageServices() error callback: name:" + error.name + ", msg:" + error.message);
     });
+
     tizen.messaging.getMessageServices("messaging.sms", serviceSuccess, serviceError);
 });