[Archive] Archive methods should support FileReference type.

Fixes: TNEF-6165

[Verification] TCT pass rate (r47): 100% (106/106/0/0/0)

Change-Id: I0153a13ac7e6db7ba3875ea294e31df105d1e312
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>

diff --git a/src/archive/archive_api.js b/src/archive/archive_api.js
index 95e148b..f3576ce 100755 (executable)
--- a/src/archive/archive_api.js
+++ b/src/archive/archive_api.js
@@ -175,7 +175,7 @@ function ArchiveFileEntry(data, priv) {
         xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.FILESYSTEM_WRITE);
 
         var args = validator_.validateArgs(arguments, [
-            { name: "destinationDirectory", type: types_.STRING }, //TODO: add FileReferece validation
+            { name: "destinationDirectory", type: types_.FILE_REFERENCE },
             { name: "onsuccess", type: types_.FUNCTION, optional: true, nullable: true },
             { name: "onerror", type: types_.FUNCTION, optional: true, nullable: true },
             { name: "onprogress", type: types_.FUNCTION, optional: true, nullable: true },
@@ -184,7 +184,7 @@ function ArchiveFileEntry(data, priv) {
         ]),
         opId = getNextOpId();
 
-        if (!CommonFS.isVirtualPath(args.destinationDirectory)) //TODO: add FileReferece validation
+        if (!CommonFS.isVirtualPath(args.destinationDirectory))
             throw new WebAPIException(WebAPIException.TYPE_MISMATCH_ERR,
                     "Destination directory should be virtual path or file.");
         bridge.async({
@@ -264,7 +264,7 @@ function ArchiveFile(data) {
         xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.FILESYSTEM_WRITE);
 
         var args = validator_.validateArgs(arguments, [
-            { name: "sourceFile", type: types_.STRING }, //TODO: add FileReferece validation
+            { name: "sourceFile", type: types_.FILE_REFERENCE },
             { name: "onsuccess", type: types_.FUNCTION, optional: true, nullable: true },
             { name: "onerror", type: types_.FUNCTION, optional: true, nullable: true },
             { name: "onprogress", type: types_.FUNCTION, optional: true, nullable: true },
@@ -272,7 +272,7 @@ function ArchiveFile(data) {
         ]),
         opId = getNextOpId();
 
-        if (!CommonFS.isVirtualPath(args.sourceFile)) //TODO: add FileReferece validation
+        if (!CommonFS.isVirtualPath(args.sourceFile))
             throw new WebAPIException(WebAPIException.TYPE_MISMATCH_ERR,
                     "sourceFile should be virtual path or file.");
 
@@ -330,7 +330,7 @@ function ArchiveFile(data) {
         xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.FILESYSTEM_WRITE);
 
         var args = validator_.validateArgs(arguments, [
-            { name: "destinationDirectory", type: types_.STRING }, //TODO: add FileReferece validation
+            { name: "destinationDirectory", type: types_.FILE_REFERENCE },
             { name: "onsuccess", type: types_.FUNCTION, optional: true, nullable: true },
             { name: "onerror", type: types_.FUNCTION, optional: true, nullable: true },
             { name: "onprogress", type: types_.FUNCTION, optional: true, nullable: true },
@@ -338,7 +338,7 @@ function ArchiveFile(data) {
         ]),
         opId = getNextOpId();
 
-        if (!CommonFS.isVirtualPath(args.destinationDirectory)) //TODO: add FileReferece validation
+        if (!CommonFS.isVirtualPath(args.destinationDirectory))
             throw new WebAPIException(WebAPIException.TYPE_MISMATCH_ERR,
                     "destinationDirectory should be virtual path or file.");
 
@@ -486,7 +486,7 @@ ArchiveManager.prototype.open = function () {
     xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.FILESYSTEM_WRITE);
 
     var args = validator_.validateArgs(arguments, [
-        { name: "file", type: types_.STRING }, //TODO: add FileReferece validation
+        { name: "file", type: types_.FILE_REFERENCE },
         { name: "mode", type: types_.ENUM, values: ["r", "rw", "w", "a"] },
         { name: "onsuccess", type: types_.FUNCTION },
         { name: "onerror", type: types_.FUNCTION, optional: true, nullable: true },
@@ -503,7 +503,7 @@ ArchiveManager.prototype.open = function () {
         }
     }
 
-    if (!CommonFS.isVirtualPath(args.file)) //TODO: add FileReferece validation
+    if (!CommonFS.isVirtualPath(args.file))
         throw new WebAPIException(WebAPIException.TYPE_MISMATCH_ERR,
                 "file should be virtual path or file.");
 

diff --git a/src/utils/utils_api.js b/src/utils/utils_api.js
index dcee69c..dc70f76 100755 (executable)
--- a/src/utils/utils_api.js
+++ b/src/utils/utils_api.js
@@ -551,7 +551,8 @@ var Validator = function() {
     PLATFORM_OBJECT: 'PLATFORM_OBJECT',
     LISTENER: 'LISTENER',
     ARRAY: 'ARRAY',
-    ENUM: 'ENUM'
+    ENUM: 'ENUM',
+    FILE_REFERENCE: 'FILE_REFERENCE'
   };
 };
 
@@ -806,6 +807,13 @@ Validator.prototype.validateArgs = function(a, d) {
           val = _converter.toEnum(val, values, nullable);
           break;
 
+        case this.Types.FILE_REFERENCE:
+          if (_type.isObject(val) && 'File' === val.constructor.name && val.fullPath) {
+            val = val.fullPath;
+          }
+          val = _converter.toString(val, nullable);
+          break;
+
         default:
           throw new WebAPIException(WebAPIException.TYPE_MISMATCH_ERR,
               'Unknown type: "' + type + '".');