[common][file-transfer-cordova][Change path for supporting global user]

Change-Id: Id7e16614f879872f87acc0fdb725e573721b4a69
Signed-off-by: mengli.zhang <mengli.zhang@samsung.com>

diff --git a/common/tct-file-transfer-cordova-tests/askpolicy.sh b/common/tct-file-transfer-cordova-tests/askpolicy.sh
new file mode 100755 (executable)
index 0000000..1c39bdd
--- /dev/null
+++ b/common/tct-file-transfer-cordova-tests/askpolicy.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+for i in `grep -r "0xA" /var/cynara/db/_ | grep $1`
+do
+    CLIENT=`echo $i | cut -d ";" -f1`
+    USER=`echo $i | cut -d ";" -f2`
+    PRIVILEGE=`echo $i | cut -d ";" -f3`
+    #echo "cyad --erase=\"\" -r=no -c $CLIENT -u $USER -p $PRIVILEGE"
+    cyad --erase="" -r=no -c $CLIENT -u $USER -p $PRIVILEGE
+done

diff --git a/common/tct-file-transfer-cordova-tests/cordova/plugins/cordova-plugin-dialogs/tizen/Notification.js b/common/tct-file-transfer-cordova-tests/cordova/plugins/cordova-plugin-dialogs/tizen/Notification.js
index 9b1143d530c8bbb356f963d0338ed77bc1845ab8..8e56f2d7034ec9d96974a0679eca37400c18ea3c 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/cordova/plugins/cordova-plugin-dialogs/tizen/Notification.js
+++ b/common/tct-file-transfer-cordova-tests/cordova/plugins/cordova-plugin-dialogs/tizen/Notification.js
@@ -25,7 +25,7 @@ var _document = document || {};
 var playback = (function() {
   var soundElement;
   var counter = 1;
-  var soundPathArray = ['/usr/share/feedback/sound/operation/operation.wav', '/usr/share/feedback/sound/operation/home.wav'];
+  var soundPathArray = ['/usr/share/feedback/sound/operation/operation.wav', '/usr/share/feedback/sound/operation/home.wav', '/usr/share/feedback/sound/operation/back.wav'];
   var soundPathCount = 0;
 
   function win(v) {

diff --git a/common/tct-file-transfer-cordova-tests/cordova/plugins/cordova-plugin-globalization/tizen/Globalization.js b/common/tct-file-transfer-cordova-tests/cordova/plugins/cordova-plugin-globalization/tizen/Globalization.js
index 4c5131e287e8e2896fa7c20db0af7ac297cd7856..eb2388f310595477561e720b71c124834cdff197 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/cordova/plugins/cordova-plugin-globalization/tizen/Globalization.js
+++ b/common/tct-file-transfer-cordova-tests/cordova/plugins/cordova-plugin-globalization/tizen/Globalization.js
@@ -59,28 +59,48 @@ function Globalization_dateToString(timestamp, successCb, errorCb, options) {
   var formatLength = (options && options.formatLength) || FORMAT_SHORT_STR;
   var selector = (options && options.selector) || SELECTOR_DATE_AND_TIME_STR;
 
-  tizen.cordova.globalization.dateToString(timestamp, formatLength, selector, successCb, errorCb);
+  try {
+    tizen.cordova.globalization.dateToString(timestamp, formatLength, selector, successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 function Globalization_stringToDate(dateString, successCb, errorCb, options) {
   var formatLength = (options && options.formatLength) || FORMAT_SHORT_STR;
   var selector = (options && options.selector) || SELECTOR_DATE_AND_TIME_STR;
 
-  tizen.cordova.globalization.stringToDate(dateString, formatLength, selector, successCb, errorCb);
+  try {
+    tizen.cordova.globalization.stringToDate(dateString, formatLength, selector, successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 function Globalization_getDatePattern(successCb, errorCb, options) {
   var formatLength = (options && options.formatLength) || FORMAT_SHORT_STR;
   var selector = (options && options.selector) || SELECTOR_DATE_AND_TIME_STR;
 
-  tizen.cordova.globalization.getDatePattern(formatLength, selector, successCb, errorCb);
+  try {
+    tizen.cordova.globalization.getDatePattern(formatLength, selector, successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 function Globalization_getDateNames(successCb, errorCb, options) {
   var type = (options && options.type) || TYPE_WIDE;
   var item = (options && options.item) || ITEM_MONTHS;
 
-  tizen.cordova.globalization.getDateNames(type, item, successCb, errorCb);
+  try {
+    tizen.cordova.globalization.getDateNames(type, item, successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 function Globalization_isDayLightSavingsTime(timestamp, successCb, errorCb) {
@@ -98,29 +118,54 @@ function Globalization_isDayLightSavingsTime(timestamp, successCb, errorCb) {
 }
 
 function Globalization_getFirstDayOfWeek(successCb, errorCb) {
-  tizen.cordova.globalization.getFirstDayOfWeek(successCb, errorCb);
+  try {
+    tizen.cordova.globalization.getFirstDayOfWeek(successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 function Globalization_numberToString(number, successCb, errorCb, options) {
   var type = (options && options.type) || NUMBER_TYPE_DECIMAL;
 
-  tizen.cordova.globalization.numberToString(number, type, successCb, errorCb);
+  try {
+    tizen.cordova.globalization.numberToString(number, type, successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 function Globalization_stringToNumber(numberStr, successCb, errorCb, options) {
   var type = (options && options.type) || NUMBER_TYPE_DECIMAL;
 
-  tizen.cordova.globalization.stringToNumber(numberStr, type, successCb, errorCb);
+  try {
+    tizen.cordova.globalization.stringToNumber(numberStr, type, successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 function Globalization_getNumberPattern(successCb, errorCb, options) {
   var type = (options && options.type) || NUMBER_TYPE_DECIMAL;
 
-  tizen.cordova.globalization.getNumberPattern(type, successCb, errorCb);
+  try {
+    tizen.cordova.globalization.getNumberPattern(type, successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 function Globalization_getCurrencyPattern(currencyCode, successCb, errorCb) {
-  tizen.cordova.globalization.getCurrencyPattern(currencyCode, successCb, errorCb);
+  try {
+    tizen.cordova.globalization.getCurrencyPattern(currencyCode, successCb, errorCb);
+  } catch (e) {
+    errorCb(new GlobalizationError(GlobalizationError.UNKNOWN_ERROR,
+    'globalization not initialized'));
+  }
 }
 
 exports = {

diff --git a/common/tct-file-transfer-cordova-tests/file-transfer/cordova_FileTransfer_upload.html b/common/tct-file-transfer-cordova-tests/file-transfer/cordova_FileTransfer_upload.html
index cee5506dfbbc88f906b252307fef2066e713493d..9d09828fec5944241e5ce8a09e4dd5404e6c0c56 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/file-transfer/cordova_FileTransfer_upload.html
+++ b/common/tct-file-transfer-cordova-tests/file-transfer/cordova_FileTransfer_upload.html
@@ -36,7 +36,7 @@ Authors:
 //==== PRIORITY P1
 //==== TEST_CRITERIA MR MOA
 
-var t = async_test(document.title, {timeout: 5000}), deviceready, fileTransfer, uri,
+var t = async_test(document.title, {timeout: 500000}), deviceready, fileTransfer, uri,
     retVal = null, successCallback, errorCallback;
 
 t.step(function () {

diff --git a/common/tct-file-transfer-cordova-tests/inst.wgt.py b/common/tct-file-transfer-cordova-tests/inst.wgt.py
index 53d786117772d793d8f95127786ca439a43b7fba..4bcbd777fe52ac33fb287667607bbeb4600c32c2 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/inst.wgt.py
+++ b/common/tct-file-transfer-cordova-tests/inst.wgt.py
@@ -20,8 +20,33 @@ tct_parser = ConfigParser.ConfigParser()
 tct_parser.read(TCT_CONFIG_FILE)
 SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')
 PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')
+
+def userCheck():
+    global GLOVAL_OPT
+    if ADMIN_USER_30 == EXECUTION_MODE_30:
+        GLOVAL_OPT="--global"
+    else:
+        GLOVAL_OPT=""
 
 
+def askpolicyremoving():
+    for root, dirs, files in os.walk(SCRIPT_DIR):
+        for file in files:
+            if file.endswith(".wgt"):
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
+   
+    print pkg_id
+    print (os.getcwd())
+    print (os.path.dirname(os.path.realpath(__file__)) )
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):
+        action_status = False
+    if PARAMETERS.mode == "SDB":
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, 
+        SRC_DIR, pkg_id)
+    return doCMD(cmd)
+       
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
     print "-->> \"%s\"" % cmd
@@ -114,7 +139,7 @@ def uninstPKGs():
                     action_status = False
                     continue
                 (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
                 for line in output:
                     if "Failure" in line:
                         action_status = False
@@ -144,7 +169,7 @@ def instPKGs():
                 if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
                     action_status = False
                 (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t wgt -q -p %s/%s" % (SRC_DIR, file))
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))
                 doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
                 for line in output:
                     if "Failure" in line:
@@ -188,7 +213,7 @@ def main():
         sys.exit(1)
 
     if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
+        PARAMETERS.user = EXECUTION_MODE_30
     if not PARAMETERS.mode:
         PARAMETERS.mode = "SDB"
 
@@ -206,6 +231,8 @@ def main():
         print "No device provided"
         sys.exit(1)
 
+    userCheck()
+
     user_info = getUSERID()
     re_code = user_info[0]
     if re_code == 0 :
@@ -224,6 +251,7 @@ def main():
             sys.exit(1)
     else:
         if not instPKGs():
+            #askpolicyremoving()
             sys.exit(1)
 
 if __name__ == "__main__":

diff --git a/common/tct-file-transfer-cordova-tests/resources/testharness.js b/common/tct-file-transfer-cordova-tests/resources/testharness.js
index ecc050c28ed7c5b7275c511d0a1a0c5979d9540d..1c213b58a026612bccfedf56dd3a7433ead07dca 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/resources/testharness.js
+++ b/common/tct-file-transfer-cordova-tests/resources/testharness.js
@@ -19,7 +19,7 @@ policies and contribution forms [3].
     var settings = {
         output:true,
         harness_timeout:{
-            "normal":10000,
+            "normal":100000,
             "long":60000
         },
         test_timeout:null

diff --git a/common/tct-file-transfer-cordova-tests/suite.json b/common/tct-file-transfer-cordova-tests/suite.json
index 291b72d1be8c599195ef9196df21ab866a306302..b8a908e2a3b558223adc7a1618ae34f5711858ca 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/suite.json
+++ b/common/tct-file-transfer-cordova-tests/suite.json
@@ -18,6 +18,7 @@
             "copylist": {
                 "inst.wgt.py": "inst.py",
                 "file-transfer": "file-transfer",
+                "askpolicy.sh": "askpolicy.sh",
                 "tests.full.xml": "tests.full.xml",
                 "tests.xml": "tests.xml"
             },