[Messaging] improved pre-condition setting

Change-Id: I020c1aab49a2e85c7af445820e8f64cbaa97aa18

diff --git a/tct-messaging-email-tizen-tests/messaging/support/getJsonConf.js b/tct-messaging-email-tizen-tests/messaging/support/getJsonConf.js
old mode 100644 (file)
new mode 100755 (executable)
index 7952475..d43f9a1
--- a/tct-messaging-email-tizen-tests/messaging/support/getJsonConf.js
+++ b/tct-messaging-email-tizen-tests/messaging/support/getJsonConf.js
@@ -37,14 +37,5 @@ $.ajax({
   success:function(data){
     TEST_EMAIL_RECIPIENT_1 = data[0]["EMAIL_RECIPIENT_1"];
     TEST_EMAIL_RECIPIENT_2 = data[0]["EMAIL_RECIPIENT_2"];
-    emailMessageInitDict = {
-      subject: "sample subject",
-      to: [TEST_EMAIL_RECIPIENT_1],
-      cc: [TEST_EMAIL_RECIPIENT_2],
-      bcc: [TEST_EMAIL_RECIPIENT_1, TEST_EMAIL_RECIPIENT_2],
-      plainBody: "sample plainBody",
-      htmlBody: "sample htmlBody",
-      isHighPriority: false
-    };
   }
-})
+});

diff --git a/tct-messaging-email-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-email-tizen-tests/messaging/support/messaging_common.js
index c70a80c093f21e216077980ee85326584f254b98..1f57bd3ef470fea864ff68f6377b67245268cec8 100755 (executable)
--- a/tct-messaging-email-tizen-tests/messaging/support/messaging_common.js
+++ b/tct-messaging-email-tizen-tests/messaging/support/messaging_common.js
@@ -17,12 +17,17 @@ limitations under the License.
 
 
 Authors:
+        JungHyuk, Park <junghyuk.park@samsung.com>
 
 */
 
 var TEST_EMAIL_RECIPIENT_1 = ""; // this variable MUST be set before executing tests
 var TEST_EMAIL_RECIPIENT_2 = ""; // this variable MUST be set before executing tests
 
+// change TEST_EMAIL_RECIPIENT_1 and TEST_EMAIL_RECIPIENT_2
+document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
+document.write('<script src="support/getJsonConf.js"></script>');
+
 var EMAIL_SYNC_INTERVAL = 15000;
 var EMAIL_RESEND_LIMIT = 60;
 var EMAIL_RESYNC_LIMIT = 60;
@@ -198,10 +203,6 @@ function getInboxFolder(t, folders) {
     return inboxFolder;
 }
 
-// change TEST_EMAIL_RECIPIENT_1 and TEST_EMAIL_RECIPIENT_2
-document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
-document.write('<script src="support/getJsonConf.js"></script>');
-
 function findMessages(t, service, folder, subject, onSuccess, onError) {
     var subjectFilter, folderFilter, compositefilter;
 

diff --git a/tct-messaging-mms-tizen-tests/messaging/support/getJsonConf.js b/tct-messaging-mms-tizen-tests/messaging/support/getJsonConf.js
old mode 100644 (file)
new mode 100755 (executable)
index e63151a..67f3594
--- a/tct-messaging-mms-tizen-tests/messaging/support/getJsonConf.js
+++ b/tct-messaging-mms-tizen-tests/messaging/support/getJsonConf.js
@@ -38,10 +38,5 @@ $.ajax({
   success:function(data){
     TEST_SMS_RECIPIENT = data[0]["MMS_RECIPIENT_1"];
     TEST_SMS_RECIPIENT_2 = data[0]["MMS_RECIPIENT_2"];
-    mmsMessageInitDict = {
-      subject: "sample subject",
-      to: [TEST_SMS_RECIPIENT],
-      plainBody: "sample plainBody"
-    };
   }
-})
+});

diff --git a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
old mode 100644 (file)
new mode 100755 (executable)
index f11a7e7..537f4a2
--- a/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
+++ b/tct-messaging-mms-tizen-tests/messaging/support/messaging_common.js
@@ -17,12 +17,17 @@ limitations under the License.
 
 
 Authors:
+        JungHyuk, Park <junghyuk.park@samsung.com>
 
 */
 
 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
 
+// change TEST_SMS_RECIPIENT and TEST_SMS_RECIPIENT_2
+document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
+document.write('<script src="support/getJsonConf.js"></script>');
+
 var imagePathToSet = "images/webapi-tizen-messaging-test_image.jpg";
 var soundPathToSet = "music/webapi-tizen-messaging-test_noise.mp3";
 
@@ -39,7 +44,7 @@ var IO_ERR             = 'IOError';
 var UNKNOWN_ERR        = 'UnknownError';
 var EXCEPTION_TYPE = "name";
 
-var MMS_RESEND_LIMIT = 60;
+var MMS_RESEND_LIMIT = 10;
 
 var generateSubject = function () {
     var datetime = new Date().getTime();
@@ -116,7 +121,7 @@ function sendMessage(t, service, msg, onSuccess, onError) {
 
     sendError = t.step_func(function (error) {
         if (resend <= MMS_RESEND_LIMIT) {
-            setTimeout(requestSending, 1000);
+            setTimeout(requestSending, 5000);
         } else {
             onError(error);
         }
@@ -129,8 +134,3 @@ function sendMessage(t, service, msg, onSuccess, onError) {
 
     requestSending();
 }
-
-
-// change TEST_SMS_RECIPIENT and TEST_SMS_RECIPIENT_2
-document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
-document.write('<script src="support/getJsonConf.js"></script>');

diff --git a/tct-messaging-sms-tizen-tests/messaging/support/getJsonConf.js b/tct-messaging-sms-tizen-tests/messaging/support/getJsonConf.js
old mode 100644 (file)
new mode 100755 (executable)
index 7faa045..45339dd
--- a/tct-messaging-sms-tizen-tests/messaging/support/getJsonConf.js
+++ b/tct-messaging-sms-tizen-tests/messaging/support/getJsonConf.js
@@ -38,9 +38,5 @@ $.ajax({
   success:function(data){
     TEST_SMS_RECIPIENT = data[0]["SMS_RECIPIENT_1"];
     TEST_SMS_RECIPIENT_2 = data[0]["SMS_RECIPIENT_2"];
-    smsMessageInitDict = {
-      to: [TEST_SMS_RECIPIENT],
-      plainBody: "sample plainBody"
-    };
   }
-})
+});

diff --git a/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js b/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js
old mode 100644 (file)
new mode 100755 (executable)
index 5b45ab6..e8dcac7
--- a/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js
+++ b/tct-messaging-sms-tizen-tests/messaging/support/messaging_common.js
@@ -17,12 +17,17 @@ limitations under the License.
 
 
 Authors:
+        JungHyuk, Park <junghyuk.park@samsung.com>
 
 */
 
 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
 
+// change TEST_SMS_RECIPIENT and TEST_SMS_RECIPIENT_2
+document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
+document.write('<script src="support/getJsonConf.js"></script>');
+
 var smsService;
 
 var TYPE_MISMATCH_ERR  = 'TypeMismatchError';
@@ -33,7 +38,7 @@ var IO_ERR             = 'IOError';
 var UNKNOWN_ERR        = 'UnknownError';
 var EXCEPTION_TYPE = "name";
 
-var SMS_RESEND_LIMIT = 60;
+var SMS_RESEND_LIMIT = 10;
 
 var generatePlainBody = function () {
     var datetime = new Date().getTime();
@@ -114,7 +119,7 @@ function sendMessage(t, service, msg, onSuccess, onError) {
 
     sendError = t.step_func(function (error) {
         if (resend <= SMS_RESEND_LIMIT) {
-            setTimeout(requestSending, 1000);
+            setTimeout(requestSending, 5000);
         } else {
             onError(error);
         }
@@ -127,8 +132,3 @@ function sendMessage(t, service, msg, onSuccess, onError) {
 
     requestSending();
 }
-
-
-// change TEST_SMS_RECIPIENT and TEST_SMS_RECIPIENT_2
-document.write('<script src="../testkit/web/jquery-1.10.2.min.js"></script>');
-document.write('<script src="support/getJsonConf.js"></script>');