[common][globalization-cordova][change path for supporting global user and update...

- update cordova plugins
- change path for supporting global user in inst.wgt.py

Change-Id: I5b8c3087b15374fc914f4bc4397c1b20be657e4e
Signed-off-by: wei.ji <wei.ji@samsung.com>

diff --git a/common/tct-globalization-cordova-tests/cordova/plugins/cordova-plugin-dialogs/tizen/Notification.js b/common/tct-globalization-cordova-tests/cordova/plugins/cordova-plugin-dialogs/tizen/Notification.js
index 9b1143d530c8bbb356f963d0338ed77bc1845ab8..8e56f2d7034ec9d96974a0679eca37400c18ea3c 100755 (executable)
--- a/common/tct-globalization-cordova-tests/cordova/plugins/cordova-plugin-dialogs/tizen/Notification.js
+++ b/common/tct-globalization-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-globalization-cordova-tests/cordova/plugins/cordova-plugin-globalization/tizen/Globalization.js b/common/tct-globalization-cordova-tests/cordova/plugins/cordova-plugin-globalization/tizen/Globalization.js
index 4c5131e287e8e2896fa7c20db0af7ac297cd7856..eb2388f310595477561e720b71c124834cdff197 100755 (executable)
--- a/common/tct-globalization-cordova-tests/cordova/plugins/cordova-plugin-globalization/tizen/Globalization.js
+++ b/common/tct-globalization-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-globalization-cordova-tests/inst.wgt.py b/common/tct-globalization-cordova-tests/inst.wgt.py
index 28b1eb42a8050b6e383212dd04fd0aec51784495..1f51fd5adc5612985041675d5fb10803111c10d3 100755 (executable)
--- a/common/tct-globalization-cordova-tests/inst.wgt.py
+++ b/common/tct-globalization-cordova-tests/inst.wgt.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 import string
-from optparse import OptionParser, make_option\r
+from optparse import OptionParser, make_option
 import ConfigParser
 
 
@@ -20,6 +20,15 @@ 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 doCMD(cmd):
@@ -41,7 +50,6 @@ def doCMD(cmd):
 
     return (cmd_return_code, output)
 
-
 def updateCMD(cmd=None):
     if "pkgcmd" in cmd:
         cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
@@ -56,8 +64,6 @@ def getUSERID():
     return doCMD(cmd)
 
 
-
-
 def getPKGID(pkg_name=None):
     if PARAMETERS.mode == "SDB":
         cmd = "sdb -s %s shell %s" % (
@@ -114,7 +120,7 @@ def uninstPKGs():
                     action_status = False
                     continue
                 (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)
+                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))
                 for line in output:
                     if "Failure" in line:
                         action_status = False
@@ -140,7 +146,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:
@@ -181,7 +187,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"
 
@@ -198,7 +204,9 @@ def main():
     if not PARAMETERS.device:
         print "No device provided"
         sys.exit(1)
-
+    
+    userCheck()
+    
     user_info = getUSERID()
     re_code = user_info[0]
     if re_code == 0 :