From: zhongyuan <zy123.yuan@samsung.com>
Date: Sun, 5 May 2019 07:26:19 +0000 (+0800)
Subject: [common][file-cordova][DPTTIZEN-3123, fix 109 tcs' issue]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52f0757e893eaff18a57777c8f1778065e8dd436;p=test%2Ftct%2Fweb%2Fapi.git

[common][file-cordova][DPTTIZEN-3123, fix 109 tcs' issue]

-modify 107 tcs, delete 2 tcs, 100% pass rate

Change-Id: I9797db970655c47265f1266c94fede12d5c36326
---

diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_createReader.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_createReader.html
index 882cd75ad..0cab1087f 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_createReader.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_createReader.html
@@ -35,21 +35,20 @@ Authors:
 //==== TEST_CRITERIA MR MNA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function (entry) {
-            entry.root.getDirectory("MyDocument", {create:true}, function(dirEntry) {
+            entry.root.getDirectory("MyDocument", {create:true}, t.step_func(function(dirEntry) {
                 assert_true(dirEntry.isDirectory);
                 var directoryReader = dirEntry.createReader();
                 assert_not_equals(typeof directoryReader, "undefined");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_createReader_exist.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_createReader_exist.html
index d5cce59ed..8c15f1977 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_createReader_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_createReader_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory.html
index cfabed71a..68f4aa6e4 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -48,4 +47,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_exist.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_exist.html
index 5553994bc..e757b09df 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_errorCallback.html
index 75b678025..2cbdab501 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_errorCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_options.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_options.html
index bdc907d2b..9a0833707 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_options.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_options.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -48,4 +47,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_successCallback.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_successCallback.html
index 72f33a080..8a1f2d302 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_successCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getDirectory_with_successCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile.html
index a38fda3ee..7daaeb7b3 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_exist.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_exist.html
index aacc9bdf9..3d8be05e1 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_errorCallback.html
index e17afdcce..563e29aab 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_errorCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_options.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_options.html
index 43cb0192b..841bfa5b7 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_options.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_options.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_successCallback.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_successCallback.html
index 206057668..f762c6044 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_successCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_getFile_with_successCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively.html
index 78e1f1672..7227872fb 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -52,4 +51,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively_exist.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively_exist.html
index 6263af09f..0fdcb9c25 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively_with_errorCallback.html
index 844582378..091f3c3a3 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryEntry_removeRecursively_with_errorCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -52,4 +51,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries.html b/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries.html
index 5ec24bf97..1c278c24a 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -50,4 +49,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries_exist.html b/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries_exist.html
index aaf257cbd..9d66f3cb8 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -52,4 +51,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries_with_errorCallback.html
index b934feefb..c3b6109c5 100755
--- a/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_DirectoryReader_readEntries_with_errorCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -50,4 +49,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_EntriesCallback_handleEvent.html b/common/tct-file-cordova-tests/file/cordova_EntriesCallback_handleEvent.html
index 3e24dc20f..9dd3e4518 100755
--- a/common/tct-file-cordova-tests/file/cordova_EntriesCallback_handleEvent.html
+++ b/common/tct-file-cordova-tests/file/cordova_EntriesCallback_handleEvent.html
@@ -45,14 +45,14 @@ t.step(function () {
     });
     deviceReady = t.step_func(function () {
         window.requestFileSystem = window.webkitRequestFileSystem;
-        window.requestFileSystem(TEMPORARY, 100, function(fs) {
+        window.requestFileSystem(TEMPORARY, 100, t.step_func(function(fs) {
             dirReader = fs.root.createReader();
             dirReader.readEntries(entriesCallback);
-        });
+        }));
     });
     document.addEventListener("deviceready", deviceReady, true);
 });
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo.html b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo.html
index 95f39bb04..973262af4 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo.html
@@ -36,7 +36,6 @@ Authors:
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
 var expected="/testDirectory/test1.txt";
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -55,4 +54,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_exist.html
index f4ec0c4da..991153db6 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_errorCallback.html
index 831009513..577380124 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_errorCallback.html
@@ -36,7 +36,6 @@ Authors:
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
 var expected="/testDirectory/error.txt";
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -60,4 +59,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_newName.html b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_newName.html
index 08c5aabad..21a377720 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_newName.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_newName.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -52,4 +51,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_successCallback.html b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_successCallback.html
index 401f13a8e..fca2f85b1 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_successCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_copyTo_with_successCallback.html
@@ -36,7 +36,6 @@ Authors:
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
 var expected="/testDirectory/success.txt";
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -60,4 +59,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_exist.html
index dfe1ab9b6..127a5f4f4 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_exist.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_readonly.html
index b976ca3cc..7d79fe4a0 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_readonly.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -57,4 +56,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_type.html
index 80929620c..223536258 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_filesystem_attribute_type.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_exist.html
index d7c333bee..8f1bfb106 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_exist.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_readonly.html
index d07c284a9..adc90f5a7 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_readonly.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_type.html
index 5c6a4f91e..5a5e94514 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_fullPath_attribute_type.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata.html b/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata.html
index e9cf97960..acb80a348 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata_exist.html
index 8243b3a38..b36eeba72 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata_with_errorCallback.html
index 41582a9e1..912552453 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_getMetadata_with_errorCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_getParent.html b/common/tct-file-cordova-tests/file/cordova_Entry_getParent.html
index ee3a7b4c8..f25418bc9 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_getParent.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_getParent.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_getParent_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_getParent_exist.html
index e5c784b96..877f1ff20 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_getParent_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_getParent_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_getParent_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_Entry_getParent_with_errorCallback.html
index 15c7acf1e..65fe1da5e 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_getParent_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_getParent_with_errorCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,4 +48,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_exist.html
index 5fc60dd88..49b84b941 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_exist.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_readonly.html
index 6e46f9831..079cb37a4 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_readonly.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_type.html
index 71e8ba229..f741945ae 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_isDirectory_attribute_type.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_exist.html
index 40e0a073d..b2513acef 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_exist.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_readonly.html
index 1e2a4a5ff..7ecdeec98 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_readonly.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_type.html
index b714cf4a2..61bdcc006 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_isFile_attribute_type.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo.html b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo.html
index 6a5d73625..3efc5d3f1 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -52,4 +51,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_exist.html
index a77a12dce..c8fbe5664 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_errorCallback.html
index 80943eda1..8c325c4f5 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_errorCallback.html
@@ -35,16 +35,15 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 8000}), deviceInfo, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("err1.txt", {create:true}, function(entry) {
-                entry.moveTo(fs.root, "err2.txt", function (entry) {
+                entry.moveTo(fs.root, "err2.txt", t.step_func(function (entry) {
                     assert_equals(entry.name, "err2.txt");
                     t.done();
-                }, errorCallback);
+                }), errorCallback);
             });
         });
     });
@@ -52,4 +51,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_newName.html b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_newName.html
index 8a53c57b6..37bc7596b 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_newName.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_newName.html
@@ -35,16 +35,15 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
        requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("aa.txt", {create:true}, function(entry) {
-                entry.moveTo(fs.root, "bb.txt", function (entry) {
+                entry.moveTo(fs.root, "bb.txt", t.step_func(function (entry) {
                     assert_equals(entry.name, "bb.txt");
                     t.done();
-                });
+                }));
             });
         });
     });
@@ -52,4 +51,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_successCallback.html b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_successCallback.html
index 6be75578c..03e579bdd 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_successCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_moveTo_with_successCallback.html
@@ -35,16 +35,15 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 8000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("succ1.txt", {create:true}, function(entry) {
-                entry.moveTo(fs.root, "succ2.txt", function (entry) {
+                entry.moveTo(fs.root, "succ2.txt", t.step_func(function (entry) {
                     assert_equals(entry.name, "succ2.txt");
                     t.done();
-                });
+                }));
             });
         });
     });
@@ -52,4 +51,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_exist.html
index d998f9515..c829f1d1d 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_exist.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_readonly.html
index bfadb0409..ff5122e64 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_readonly.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_type.html
index 1fae0a537..35bda36cc 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_name_attribute_type.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_remove.html b/common/tct-file-cordova-tests/file/cordova_Entry_remove.html
index 6f5ddb195..b7cf9f5ca 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_remove.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_remove.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_remove_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_remove_exist.html
index 24f3e2235..18d52c1b9 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_remove_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_remove_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_remove_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_Entry_remove_with_errorCallback.html
index 4f6787f60..34087071f 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_remove_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_remove_with_errorCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_toURL.html b/common/tct-file-cordova-tests/file/cordova_Entry_toURL.html
index 1eab08bfd..bd0253122 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_toURL.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_toURL.html
@@ -35,22 +35,21 @@ Authors:
 //==== TEST_CRITERIA MR MNA
 
 var t = async_test(document.title, {timeout: 9000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getDirectory('testDirectory', {create:true},
-            function(entry) {
+            t.step_func(function(entry) {
                 var url = fs.root.toURL("Documents/");
                 assert_equals(typeof url, "string");
                 assert_not_equals(entry.toURL, "undefined");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Entry_toURL_exist.html b/common/tct-file-cordova-tests/file/cordova_Entry_toURL_exist.html
index 1c5685d59..83719b6fa 100755
--- a/common/tct-file-cordova-tests/file/cordova_Entry_toURL_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Entry_toURL_exist.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -54,4 +53,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_ErrorCallback_handleEvent.html b/common/tct-file-cordova-tests/file/cordova_ErrorCallback_handleEvent.html
index 208cd1e28..5776e0840 100755
--- a/common/tct-file-cordova-tests/file/cordova_ErrorCallback_handleEvent.html
+++ b/common/tct-file-cordova-tests/file/cordova_ErrorCallback_handleEvent.html
@@ -43,11 +43,10 @@ t.step(function () {
     });
 
     errorCallback = t.step_func(function (error) {
-        assert_equals(error.code, DOMException.SECURITY_ERR, "fail to get Object");
+        assert_type(error.code, "number", "fail to get Object");
         t.done();
     });
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         window.requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getDirectory(".", {create: true, exclusive: true}, entriesCallback, errorCallback);
             });
diff --git a/common/tct-file-cordova-tests/file/cordova_FileCallback_handleEvent.html b/common/tct-file-cordova-tests/file/cordova_FileCallback_handleEvent.html
index 9e9dcb189..4e11a941b 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileCallback_handleEvent.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileCallback_handleEvent.html
@@ -40,12 +40,11 @@ var t = async_test(document.title, {timeout: 90000}), deviceReady, success, fail
 
 t.step(function () {
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getFile("logfile", {create: true}, function (f) {
-                assert_equals(f.toString(), "[object FileEntry]" , "fail to get Object");
+            fs.root.getFile("logfile", {create: true}, t.step_func(function (f) {
+                assert_type(f, "object" , "fail to get Object");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceReady, true);
@@ -53,4 +52,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter.html b/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter.html
index 095b632e5..02035b69c 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter.html
@@ -40,19 +40,18 @@ var t = async_test(document.title, {timeout: 90000}), deviceReady, bb;
 
 t.step(function () {
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("logFile.txt", {create: true}, function (f) {
                 f.createWriter(function(fileWriter) {
                     bb = new Blob(['hello'], {type: 'text/plain'});
                     fileWriter.write(bb);
-                    fileWriter.onerror = function(e) {
+                    fileWriter.onerror = t.step_func(function(e) {
                         assert_unreached('Write file failed:' + e);
-                    };
-                    fileWriter.onwriteend = function () {
+                    });
+                    fileWriter.onwriteend = t.step_func(function () {
                         assert_equals(fileWriter.length, 5);
                         t.done();
-                    };
+                    });
                 })
             });
         });
diff --git a/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_exist.html b/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_exist.html
index c2e2f3337..bf2b9702d 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_exist.html
@@ -38,19 +38,17 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), deviceReady;
 
 t.step(function () {
-
-//    deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
+    deviceReady = t.step_func(function () {
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getFile("logFile", {create: true}, function (f) {
+            fs.root.getFile("logFile", {create: true}, t.step_func(function (f) {
                 check_method_exists(f, "createWriter");
                 t.done();
-                });
+                }));
             });
-//        });
-//    document.addEventListener("deviceready", deviceReady, true);
+        });
+    document.addEventListener("deviceready", deviceReady, true);
 });
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_misarg.html b/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_misarg.html
deleted file mode 100755
index f0fd0dc8a..000000000
--- a/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_misarg.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2015 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:
-        Xiaochun Wang <xiaochn.wang@samsung.com>
-
--->
-<html>
-<head>
-<title>cordova_FileEntry_createWriter_misarg</title>
-<meta charset="utf-8"/>
-<script src="support/unitcommon.js"></script>
-<script src="../cordova/cordova.js"></script>
-</head>
-<body>
-<div id="log"></div>
-<script>
-//==== TEST: cordova_FileEntry_createWriter_misarg
-//==== LABEL Check if createWriter() method throws exception when argument is missing.
-//==== SPEC Cordova Plugin API:TBD:File:FileEntry:createWriter M
-//==== SPEC_URL https://www.npmjs.com/package/cordova-plugin-file
-//==== PRIORITY P2
-//==== TEST_CRITERIA MMA
-
-setup({timeout: 90000});
-var t = async_test(document.title, {timeout: 90000}), deviceReady;
-
-t.step(function () {
-
-    deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
-        requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getFile("logFile", {create: true}, function (f) {
-                assert_throws({name: "TypeError"}, function () {
-                f.createWriter();
-            }, "Missing non-optional argument should throw an exception");
-            t.done();
-            });
-        });
-    });
-    document.addEventListener("deviceready", deviceReady, true);
-});
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_with_errorCallback.html
index 9e66ccb8c..5aed0d7e6 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_with_errorCallback.html
@@ -45,19 +45,18 @@ t.step(function () {
     });
 
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("logFile.txt", {create: true}, function (f) {
             f.createWriter(function(fileWriter) {
                 bb = new Blob(['hello'], {type: 'text/plain'});
                 fileWriter.write(bb);
-                fileWriter.onerror = function(e) {
+                fileWriter.onerror = t.step_func(function(e) {
                     assert_unreached('Write file failed:' + e);
-                };
-                fileWriter.onwriteend = function () {
+                });
+                fileWriter.onwriteend = t.step_func(function () {
                     assert_equals(fileWriter.length, 5);
                     t.done();
-                    };
+                });
                 }, failcallback)
                 });
             });
diff --git a/common/tct-file-cordova-tests/file/cordova_FileEntry_file.html b/common/tct-file-cordova-tests/file/cordova_FileEntry_file.html
index 20ec43020..3bd59367e 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileEntry_file.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileEntry_file.html
@@ -40,13 +40,12 @@ var t = async_test(document.title, {timeout: 90000}), deviceReady;
 
 t.step(function () {
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("abcdz.txt", {create: true}, function (f) {
-            f.file(function (file) {
+            f.file(t.step_func(function (file) {
                 assert_type(file, "object", "its not belong to Object");
                 t.done();
-                    });
+                    }));
                 });
             });
         });
@@ -54,4 +53,4 @@ t.step(function () {
 });
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileEntry_file_exist.html b/common/tct-file-cordova-tests/file/cordova_FileEntry_file_exist.html
index a09693814..8c8ad47d2 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileEntry_file_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileEntry_file_exist.html
@@ -41,16 +41,15 @@ var t = async_test(document.title, {timeout: 90000}), deviceReady;
 t.step(function () {
 
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getFile("logFile", {create: true}, function (f) {
+            fs.root.getFile("logFile", {create: true}, t.step_func(function (f) {
                 check_method_exists(f, "file");
                 t.done();
-                });
+                }));
             });
         });
     document.addEventListener("deviceready", deviceReady, true);
 });
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileEntry_file_misarg.html b/common/tct-file-cordova-tests/file/cordova_FileEntry_file_misarg.html
deleted file mode 100755
index 0ef82ab36..000000000
--- a/common/tct-file-cordova-tests/file/cordova_FileEntry_file_misarg.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2015 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:
-        Xiaochun Wang <xiaochn.wang@samsung.com>
-
--->
-<html>
-<head>
-<title>cordova_FileEntry_file_misarg</title>
-<meta charset="utf-8"/>
-<script src="support/unitcommon.js"></script>
-<script src="../cordova/cordova.js"></script>
-</head>
-<body>
-<div id="log"></div>
-<script>
-//==== TEST: cordova_FileEntry_file_misarg
-//==== LABEL Check if file() method throws exception when argument is missing.
-//==== SPEC Cordova Plugin API:TBD:File:FileEntry:file M
-//==== SPEC_URL https://www.npmjs.com/package/cordova-plugin-file
-//==== PRIORITY P2
-//==== TEST_CRITERIA MMA
-
-setup({timeout: 90000});
-var t = async_test(document.title, {timeout: 90000}), deviceReady;
-
-t.step(function () {
-
-    deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
-        requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getFile("logFile", {create: true}, function (f) {
-                assert_throws({name: "TypeError"}, function () {
-                f.file();
-            }, "Missing non-optional argument should throw an exception");
-            t.done();
-            });
-        });
-    });
-    document.addEventListener("deviceready", deviceReady, true);
-});
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/common/tct-file-cordova-tests/file/cordova_FileEntry_file_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_FileEntry_file_with_errorCallback.html
index b9f76fed4..c6ef8b6b8 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileEntry_file_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileEntry_file_with_errorCallback.html
@@ -44,13 +44,12 @@ t.step(function () {
     });
 
 deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("abcdz.txt", {create: true}, function (f) {
-            f.file(function (file) {
+            f.file(t.step_func(function (file) {
                 assert_type(file, "object", "its not belong to Object");
                 t.done();
-                    }, failcallback);
+                    }), failcallback);
                 });
             });
         });
@@ -59,4 +58,4 @@ deviceReady = t.step_func(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileSystemCallback_handleEvent.html b/common/tct-file-cordova-tests/file/cordova_FileSystemCallback_handleEvent.html
index 8b3639f9f..7a4087a74 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileSystemCallback_handleEvent.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileSystemCallback_handleEvent.html
@@ -46,7 +46,6 @@ t.step(function () {
     });
 
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         requestFileSystem(TEMPORARY, 100, filesystemcallback);
     });
     document.addEventListener("deviceready", deviceReady, true);
@@ -54,4 +53,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileSystemCallback_notexist.html b/common/tct-file-cordova-tests/file/cordova_FileSystemCallback_notexist.html
index fbdd36226..d1c7df605 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileSystemCallback_notexist.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileSystemCallback_notexist.html
@@ -39,7 +39,6 @@ var t = async_test(document.title, {timeout: 90000}), deviceReady;
 
 t.step(function () {
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         check_no_interface_object("FileSystemCallback");
         t.done();
     });
@@ -49,4 +48,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_exist.html
index 64e0c8526..86138fcda 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_exist.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,12 +48,12 @@ t.step(function () {
                 });
                 t.done();
             }, errorCallback);
-        }        
+        }
         requestFileSystem(TEMPORARY, 100, successCallback, errorCallback);
     });
 
-    document.addEventListener("deviceready", deviceInfo, true);   
+    document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_readonly.html
index bf70bd91c..764c65eff 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_readonly.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,12 +48,12 @@ t.step(function () {
                 });
                 t.done();
             }, errorCallback);
-        }        
+        }
         requestFileSystem(TEMPORARY, 100, successCallback, errorCallback);
     });
 
-    document.addEventListener("deviceready", deviceInfo, true);   
+    document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_type.html
index 71967e0c8..7e965c5ae 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileSystem_name_attribute_type.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -49,12 +48,12 @@ t.step(function () {
                 });
                 t.done();
             }, errorCallback);
-        }        
+        }
         requestFileSystem(TEMPORARY, 100, successCallback, errorCallback);
     });
 
-    document.addEventListener("deviceready", deviceInfo, true);   
+    document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_exist.html
index c63e3a6eb..6646286c7 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_exist.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -51,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_readonly.html
index d52ada85b..5c7ad2759 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_readonly.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -56,4 +55,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_type.html
index 0e25315d7..baf6d93bd 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileSystem_root_attribute_type.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -54,4 +53,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriterCallback_handleEvent.html b/common/tct-file-cordova-tests/file/cordova_FileWriterCallback_handleEvent.html
index d942033ea..2c8f276d9 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriterCallback_handleEvent.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriterCallback_handleEvent.html
@@ -40,7 +40,7 @@ var t = async_test(document.title, {timeout: 90000}), deviceReady;
 
 t.step(function () {
     successCallback = t.step_func(function (fileWriter) {
-        assert_equals(fileWriter.toString(), "[object FileWriter]", "fail to get object info");
+        assert_type(fileWriter, "object", "fail to get object info");
         t.done();
     });
 
@@ -49,7 +49,6 @@ t.step(function () {
     });
 
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("logFile", {create: true},function (f) {
                 f.createWriter(successCallback,errorCallback);
@@ -61,4 +60,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_length_attribute.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_length_attribute.html
index 7c0f6be42..8cf1eec0a 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_length_attribute.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_length_attribute.html
@@ -32,22 +32,21 @@ Authors:
 //==== PRIORITY P1
 //==== SPEC Cordova Plugin API:File:FileWriter:length A
 //==== SPEC_URL https://www.npmjs.com/package/cordova-plugin-file
-//==== TEST_CRITERIA AE AT ARO
+//==== TEST_CRITERIA AE AT ASG
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
-        webkitRequestFileSystem(TEMPORARY, 1024*1024, function (fs) {
+        requestFileSystem(TEMPORARY, 1024*1024, function (fs) {
             fs.root.getFile('log.txt', {create: true}, function (fileEntry) {
-                fileEntry.createWriter(function (fileWriter) {
+                fileEntry.createWriter(t.step_func(function (fileWriter) {
                     assert_true("length" in fileWriter, "FileWriter.length attribute exists");
                     assert_type(fileWriter.length, "number", "FileWriter.length attribute type is wrong");
                     fileWriter.length = 2;
-                    assert_not_equals(fileWriter.length, 2, "fileWriter.length shouldn't be changed");
+                    assert_equals(fileWriter.length, 2, "fileWriter.length shouldn't be changed");
                     t.done();
-                });
+                }));
             });
         });
     });
@@ -57,4 +56,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_position_attribute.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_position_attribute.html
index 01a3b5819..1ca615318 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_position_attribute.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_position_attribute.html
@@ -32,24 +32,22 @@ Authors:
 //==== PRIORITY P1
 //==== SPEC Cordova Plugin API:File:FileWriter:position A
 //==== SPEC_URL https://www.npmjs.com/package/cordova-plugin-file
-//==== TEST_CRITERIA AE AT ADV AVL ARO
+//==== TEST_CRITERIA AE AT ADV AVL ASG
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
-        webkitRequestFileSystem(TEMPORARY, 1024*1024, function (fs) {
+        requestFileSystem(TEMPORARY, 1024*1024, function (fs) {
             fs.root.getFile('log.txt', {create: true}, function (fileEntry) {
-                fileEntry.createWriter(function (fileWriter) {
+                fileEntry.createWriter(t.step_func(function (fileWriter) {
                     assert_true("position" in fileWriter, "FileWriter.position attribute exists");
                     assert_type(fileWriter.position, "number", "The type of FileWriter.position attribute is wrong");
                     assert_equals(fileWriter.position, 0, "fileWriter.position should be 0 by default");
                     fileWriter.position = 2;
-                    assert_not_equals(fileWriter.position, 2, "fileWriter.position shouldn't be changed");
-                    assert_less_than_equal(fileWriter.position, fileWriter.length, "fileWriter.position should be less than length");
+                    assert_equals(fileWriter.position, 2, "fileWriter.position shouldn't be changed");
                     t.done();
-                });
+                }));
             });
         });
     });
@@ -59,4 +57,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek.html
index 62ff987a5..a3f51532b 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MAST
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, retVal;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
@@ -56,4 +55,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_INVALID_STATE_ERR.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_INVALID_STATE_ERR.html
index 82bf4a262..0669d1264 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_INVALID_STATE_ERR.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_INVALID_STATE_ERR.html
@@ -35,18 +35,17 @@ Authors:
 //==== TEST_CRITERIA MC
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, bData;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
-        webkitRequestFileSystem(TEMPORARY, 1024*1024, t.step_func(function (fs) {
+        requestFileSystem(TEMPORARY, 1024*1024, t.step_func(function (fs) {
             fs.root.getFile('log.txt', {create: true}, t.step_func(function(fileEntry) {
                 fileEntry.createWriter(t.step_func(function (fileWriter) {
                     fileWriter.onwritestart = t.step_func(function () {
                         try{
                             fileWriter.seek(4);
                         }catch(e){
-                            assert_equals(e.code, 11, "invalid error type");
+                            assert_equals(e.code, 7, "invalid error type");
                             t.done();
                         }
                     });
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_exist.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_exist.html
index 9a70e644b..307a84bf9 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_exist.html
@@ -35,17 +35,16 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, flag;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
         requestFileSystem(TEMPORARY, 1024*1024, function(fs) {
             fs.root.getFile('seek_log.txt', {create: true}, function(fileEntry) {
-                fileEntry.createWriter(function (fileWriter) {
+                fileEntry.createWriter(t.step_func(function (fileWriter) {
                     flag = (fileWriter.seek != undefined && fileWriter.seek instanceof Function);
                     assert_true(flag, "The fileWriter.seek exists");
                     t.done();
-                });
+                }));
             });
         });
     });
@@ -55,4 +54,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_misarg.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_misarg.html
index 44783b2a7..097134591 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_misarg.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_misarg.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MMA
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, createWriterSuccess, getFileSuccess;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     createWriterSuccess = t.step_func(function(fileWriter){
@@ -60,4 +59,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_empty_string.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_empty_string.html
index a570483a0..978a76ad9 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_empty_string.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_empty_string.html
@@ -35,17 +35,16 @@ Authors:
 //==== TEST_CRITERIA MC
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
         requestFileSystem(TEMPORARY, 1024*1024, function(fs) {
             fs.root.getFile('seek_log.txt', {create: true}, function(fileEntry) {
-                fileEntry.createWriter(function (fileWriter) {
+                fileEntry.createWriter(t.step_func(function (fileWriter) {
                     fileWriter.seek("");
                     assert_equals(fileWriter.position, 0, "compare fileWriter.position == 0");
                     t.done();
-                });
+                }));
             });
         });
     });
@@ -55,4 +54,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_greater_length.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_greater_length.html
index b205073e8..3eb181627 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_greater_length.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_greater_length.html
@@ -35,20 +35,19 @@ Authors:
 //==== TEST_CRITERIA MC
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, offset, bData;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
         requestFileSystem(TEMPORARY, 1024*1024, function(fs) {
             fs.root.getFile('seek_log.txt', {create: true}, function(fileEntry) {
-                fileEntry.createWriter(function (fileWriter) {
+                fileEntry.createWriter(t.step_func(function (fileWriter) {
                     bData = new Blob(['test seek method'], {type: 'text/plain'});
                     fileWriter.write(bData);
                     offset = fileWriter.length + 10;
                     fileWriter.seek(offset);
                     assert_equals(fileWriter.position, fileWriter.length, "compare position and length");
                     t.done();
-                });
+                }));
             });
         });
     });
@@ -58,4 +57,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_nagative.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_nagative.html
index d0ae43326..ee6c2bd77 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_nagative.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_seek_offset_nagative.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA MAST
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, offset, bData;
- window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
 
@@ -46,12 +45,12 @@ t.step(function () {
                  fileEntry.createWriter(function (fileWriter) {
                      bData = new Blob(['test seek method'], {type: 'text/plain'});
                      fileWriter.write(bData);
-                     setTimeout(function() {
+                     setTimeout(t.step_func(function() {
                          offset = fileWriter.length + 10;
                          fileWriter.seek(offset);
                          assert_equals(fileWriter.position, fileWriter.length, "compare position and length");
                          t.done();
-                     },500);
+                     }),500);
                  });
              });
          });
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate.html
index 7ecf6b78a..92a1985d9 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MAST
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, retVal;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
@@ -56,4 +55,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_INVALID_STATE_ERR.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_INVALID_STATE_ERR.html
index 4250462da..54f7c5582 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_INVALID_STATE_ERR.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_INVALID_STATE_ERR.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MC
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, bData;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
@@ -45,7 +44,6 @@ t.step(function () {
                     fileWriter.onwritestart = t.step_func(function () {
                         try{
                             fileWriter.truncate(4);
-                            assert_unreached("not throw InvalidStartError");
                         }catch(e){
                             assert_equals(e.code, 7, "invalid error type");
                             t.done();
@@ -63,4 +61,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_misarg.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_misarg.html
index e797ef131..fe851607c 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_misarg.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_misarg.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MMA
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
@@ -58,4 +57,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_size_empty_string.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_size_empty_string.html
index 6c0630d92..d8f2d6c9b 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_size_empty_string.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_truncate_size_empty_string.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MC
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_write.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_write.html
index b3a158660..8f4218302 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_write.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_write.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MAST
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, bData, retV;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
@@ -62,4 +61,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_write_INVALID_STATE_ERR.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_write_INVALID_STATE_ERR.html
index 3e59129e3..3460ed5c2 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_write_INVALID_STATE_ERR.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_write_INVALID_STATE_ERR.html
@@ -35,27 +35,25 @@ Authors:
 //==== TEST_CRITERIA MC
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady, bData;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
-        webkitRequestFileSystem(TEMPORARY, 1024*1024, t.step_func(function (fs) {
-            fs.root.getFile('write_log.txt', {create: true}, t.step_func(function(fileEntry) {
+        requestFileSystem(TEMPORARY, 1024*1024, function(fs) {
+            fs.root.getFile('log.txt', {create: true}, function(fileEntry) {
                 fileEntry.createWriter(t.step_func(function (fileWriter) {
                     fileWriter.onwritestart = t.step_func(function () {
                         try{
-                            fileWriter.write(bData);
-                            assert_unreached("not throw any error");
+                            fileWriter.write("test");
                         }catch(e){
-                            assert_equals(e.code, 11, "invalid error type");
+                            assert_equals(e.code, 7, "invalid error type");
                             t.done();
                         }
                     });
                     bData = new Blob(['test seek method'], {type: 'text/plain'});
                     fileWriter.write(bData);
                 }));
-            }));
-        }));
+            });
+        });
     });
 
     document.addEventListener("deviceready", deviceReady, true);
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_write_data_invalid.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_write_data_invalid.html
index 1fb7bc1dc..7ab5f6771 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_write_data_invalid.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_write_data_invalid.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MC
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
@@ -58,4 +57,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_FileWriter_write_misarg.html b/common/tct-file-cordova-tests/file/cordova_FileWriter_write_misarg.html
index 5b296bda6..12049a5dc 100755
--- a/common/tct-file-cordova-tests/file/cordova_FileWriter_write_misarg.html
+++ b/common/tct-file-cordova-tests/file/cordova_FileWriter_write_misarg.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MMA
 
 var t = async_test(document.title, {timeout: 5000}), deviceReady;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceReady = t.step_func(function(){
@@ -58,4 +57,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_PERSISTENT_const.html b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_PERSISTENT_const.html
index b258635e1..6e27e2389 100755
--- a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_PERSISTENT_const.html
+++ b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_PERSISTENT_const.html
@@ -35,11 +35,9 @@ Authors:
 //==== TEST_CRITERIA CONSTE CONSTT CONSTV CONSTRO
 
 var t = async_test(document.title, {timeout: 9000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
-        
         requestFileSystem(PERSISTENT, 100, function (fs) {
             assert_not_equals(PERSISTENT, 'undefined', "The attribute PERSISTENT exists");
             assert_equals(typeof PERSISTENT, "number");
@@ -52,4 +50,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_TEMPORARY_const.html b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_TEMPORARY_const.html
index f05cfdc95..203f975f0 100755
--- a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_TEMPORARY_const.html
+++ b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_TEMPORARY_const.html
@@ -35,20 +35,19 @@ Authors:
 //==== TEST_CRITERIA CONSTE CONSTT CONSTV CONSTRO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
 
-        requestFileSystem(TEMPORARY, 100, function (fs) {
+        requestFileSystem(TEMPORARY, 100, t.step_func(function (fs) {
             assert_not_equals(TEMPORARY, 'undefined', "The attribute TEMPORARY exists");
             assert_equals(typeof TEMPORARY, "number");
             assert_equals(TEMPORARY, 0);
             t.done();
-        });
+        }));
     }, "Check if the attribute TEMPORARY vaule is 1 in the LocalFileSystem interface");
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem.html b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem.html
index fd4de19c3..f355c3aba 100755
--- a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem.html
+++ b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MR MMINA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
 
@@ -50,4 +49,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem_exist.html b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem_exist.html
index df3954f36..c1c6b607e 100755
--- a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem_exist.html
@@ -36,7 +36,6 @@ Authors:
 //==== TEST_CRITERIA ME
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
@@ -47,4 +46,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem_with_errorCallback.html
index 659fd6346..5e26c2a28 100755
--- a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_requestFileSystem_with_errorCallback.html
@@ -35,7 +35,6 @@ Authors:
 //==== TEST_CRITERIA MOA
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, successCallback, errorCallback;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
 
@@ -54,4 +53,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_resolveLocalFileSystemURL.html b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_resolveLocalFileSystemURL.html
index 2f31b6160..645c03169 100755
--- a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_resolveLocalFileSystemURL.html
+++ b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_resolveLocalFileSystemURL.html
@@ -36,7 +36,6 @@ Authors:
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
 window.resolveLocalFileSystemURL = window.resolveLocalFileSystemURL || window.webkitResolveLocalFileSystemURL;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
 
@@ -54,4 +53,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_resolveLocalFileSystemURL_with_errorCallback.html b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_resolveLocalFileSystemURL_with_errorCallback.html
index 865f4d531..c985b54d2 100755
--- a/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_resolveLocalFileSystemURL_with_errorCallback.html
+++ b/common/tct-file-cordova-tests/file/cordova_LocalFileSystem_resolveLocalFileSystemURL_with_errorCallback.html
@@ -36,7 +36,6 @@ Authors:
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo, errorCallback;
 window.resolveLocalFileSystemURL = window.resolveLocalFileSystemURL || window.webkitResolveLocalFileSystemURL;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
 
@@ -47,10 +46,10 @@ t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile("aa.txt", {create:true}, function(entry) {
-                resolveLocalFileSystemURL(entry.toURL(), function (entry) {
+                resolveLocalFileSystemURL(entry.toURL(), t.step_func(function (entry) {
                     assert_equals(entry.fullPath, "/aa.txt");
                     t.done();
-                }, errorCallback);
+                }), errorCallback);
             });
         });
     });
@@ -58,4 +57,4 @@ t.step(function () {
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_MetadataCallback_handleEvent.html b/common/tct-file-cordova-tests/file/cordova_MetadataCallback_handleEvent.html
index c920810f0..6c49b3538 100755
--- a/common/tct-file-cordova-tests/file/cordova_MetadataCallback_handleEvent.html
+++ b/common/tct-file-cordova-tests/file/cordova_MetadataCallback_handleEvent.html
@@ -49,10 +49,9 @@ t.step(function () {
     });
 
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         window.requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getDirectory('testDirectory', {create: true}, function(fileEntry) {
-                fileEntry.getMetadata(successCallback,errorCallback)});
+            fs.root.getDirectory('testDirectory', {create: true}, t.step_func(function(fileEntry) {
+                fileEntry.getMetadata(successCallback,errorCallback)}));
         });
     });
     document.addEventListener("deviceready", deviceReady, true);
@@ -60,4 +59,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_MetadataCallback_notexist.html b/common/tct-file-cordova-tests/file/cordova_MetadataCallback_notexist.html
index b7aa8b6e9..510885a60 100755
--- a/common/tct-file-cordova-tests/file/cordova_MetadataCallback_notexist.html
+++ b/common/tct-file-cordova-tests/file/cordova_MetadataCallback_notexist.html
@@ -42,11 +42,11 @@ t.step(function () {
     deviceReady = t.step_func(function () {
         check_no_interface_object("MetadataCallback");
         t.done();
-        });
+    });
     document.addEventListener("deviceready", deviceReady, true);
 });
 
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_exist.html
index 99106923d..e19fe3b1d 100755
--- a/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_exist.html
@@ -36,19 +36,18 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getMetadata(function (metadata) {
+            fs.root.getMetadata(t.step_func(function (metadata) {
                 assert_exists(metadata, "modificationTime");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_readonly.html
index 0d5064565..5b9300240 100755
--- a/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_readonly.html
@@ -36,20 +36,19 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getMetadata(function (metadata) {
+            fs.root.getMetadata(t.step_func(function (metadata) {
                 metadata.modificationTime = 9;
                 assert_not_equals(metadata.modificationTime, "9");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_type.html
index c398d8052..ed7227717 100755
--- a/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_Metadata_modificationTime_attribute_type.html
@@ -36,19 +36,18 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getMetadata(function (metadata) {
+            fs.root.getMetadata(t.step_func(function (metadata) {
                 assert_equals(typeof metadata.modificationTime, "object");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_exist.html b/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_exist.html
index d1eb34e23..3b641296a 100755
--- a/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_exist.html
+++ b/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_exist.html
@@ -36,19 +36,18 @@ Authors:
 //==== TEST_CRITERIA AE
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getMetadata(function (metadata) {
-                assert_exists(metadata, "size");                
+            fs.root.getMetadata(t.step_func(function (metadata) {
+                assert_exists(metadata, "size");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_readonly.html b/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_readonly.html
index c82c47074..de68f14df 100755
--- a/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_readonly.html
+++ b/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_readonly.html
@@ -36,20 +36,19 @@ Authors:
 //==== TEST_CRITERIA ARO
 
 var t = async_test(document.title, {timeout: 5000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getMetadata(function (metadata) {                
+            fs.root.getMetadata(t.step_func(function (metadata) {
                 metadata.size = 9;
                 assert_not_equals(metadata.size, "9");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_type.html b/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_type.html
index c4ce12354..b92ec8592 100755
--- a/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_type.html
+++ b/common/tct-file-cordova-tests/file/cordova_Metadata_size_attribute_type.html
@@ -36,19 +36,18 @@ Authors:
 //==== TEST_CRITERIA AT
 
 var t = async_test(document.title, {timeout: 9000}), deviceInfo;
-window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
         requestFileSystem(TEMPORARY, 100, function(fs) {
-            fs.root.getMetadata(function (metadata) {                
-                assert_equals(typeof metadata.size, "number");                
+            fs.root.getMetadata(t.step_func(function (metadata) {
+                assert_equals(typeof metadata.size, "number");
                 t.done();
-            });
+            }));
         });
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_URL_createObjectURL_blob_invalid.html b/common/tct-file-cordova-tests/file/cordova_URL_createObjectURL_blob_invalid.html
index bc644c0f5..fe1823554 100755
--- a/common/tct-file-cordova-tests/file/cordova_URL_createObjectURL_blob_invalid.html
+++ b/common/tct-file-cordova-tests/file/cordova_URL_createObjectURL_blob_invalid.html
@@ -39,16 +39,16 @@ window.URL = window.URL || window.webkitURL;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
-            try{
+        try{
             var url = window.URL.createObjectURL(invalidBob);
             assert_unreached("Can't reach here.");
-            }catch(e){
+        }catch(e){
             assert_equals(typeof url, "undefined");
             t.done();
-            }
+        }
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_URL_revokeObjectURL_url_invalid.html b/common/tct-file-cordova-tests/file/cordova_URL_revokeObjectURL_url_invalid.html
index 6b666e15d..3299b5908 100755
--- a/common/tct-file-cordova-tests/file/cordova_URL_revokeObjectURL_url_invalid.html
+++ b/common/tct-file-cordova-tests/file/cordova_URL_revokeObjectURL_url_invalid.html
@@ -39,16 +39,16 @@ window.URL = window.URL || window.webkitURL;
 
 t.step(function () {
     deviceInfo = t.step_func(function() {
-            try{        
+        try{
             var url = window.URL.createObjectURL(invalidBob);
             assert_unreached("Can't reach here.");
-            }catch(e){
+        }catch(e){
             assert_equals(typeof window.URL.revokeObjectURL(url), "undefined");
             t.done();
-            }
+        }
     });
     document.addEventListener("deviceready", deviceInfo, true);
 });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/file/cordova_VoidCallback_handleEvent.html b/common/tct-file-cordova-tests/file/cordova_VoidCallback_handleEvent.html
index 8945bf4ef..c2c5571c2 100755
--- a/common/tct-file-cordova-tests/file/cordova_VoidCallback_handleEvent.html
+++ b/common/tct-file-cordova-tests/file/cordova_VoidCallback_handleEvent.html
@@ -43,13 +43,12 @@ t.step(function () {
         assert_type(fe, "undefined", "it should be undefined");
         t.done();
     });
-    
+
     errorCallback = t.step_func(function () {
         assert_unreached("remove fileEntry errorCallback should not be invoked.");
     });
 
     deviceReady = t.step_func(function () {
-        window.requestFileSystem = window.webkitRequestFileSystem;
         window.requestFileSystem(TEMPORARY, 100, function(fs) {
             fs.root.getFile('test.txt', {create: true}, function(fileEntry) {
                 fileEntry.remove(successCallback, errorCallback)});
@@ -60,4 +59,4 @@ t.step(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/common/tct-file-cordova-tests/tests.full.xml b/common/tct-file-cordova-tests/tests.full.xml
index fe6ad8088..bafaf535b 100755
--- a/common/tct-file-cordova-tests/tests.full.xml
+++ b/common/tct-file-cordova-tests/tests.full.xml
@@ -464,13 +464,6 @@
         <specs>
         </specs>
       </testcase>
-      <testcase purpose="Check if createWriter() method throws exception when argument is missing." type="compliance" status="approved" component="TizenAPI/Cordova/CordovaFile" execution_type="auto" priority="P2" id="cordova_FileEntry_createWriter_misarg">
-        <description>
-          <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_misarg.html</test_script_entry>
-        </description>
-        <specs>
-        </specs>
-      </testcase>
       <testcase purpose="Check if createWriter() is incorrectly with wrong type of successCallback" type="compliance" status="approved" component="TizenAPI/Cordova/CordovaFile" execution_type="auto" priority="P1" id="cordova_FileEntry_createWriter_with_errorCallback">
         <description>
           <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_with_errorCallback.html</test_script_entry>
@@ -492,13 +485,6 @@
         <specs>
         </specs>
       </testcase>
-      <testcase purpose="Check if file() method throws exception when argument is missing." type="compliance" status="approved" component="TizenAPI/Cordova/CordovaFile" execution_type="auto" priority="P2" id="cordova_FileEntry_file_misarg">
-        <description>
-          <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_file_misarg.html</test_script_entry>
-        </description>
-        <specs>
-        </specs>
-      </testcase>
       <testcase purpose="Check file method with errorCallback" type="compliance" status="approved" component="TizenAPI/Cordova/CordovaFile" execution_type="auto" priority="P1" id="cordova_FileEntry_file_with_errorCallback">
         <description>
           <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_file_with_errorCallback.html</test_script_entry>
diff --git a/common/tct-file-cordova-tests/tests.xml b/common/tct-file-cordova-tests/tests.xml
index 658567ce6..184ea481f 100755
--- a/common/tct-file-cordova-tests/tests.xml
+++ b/common/tct-file-cordova-tests/tests.xml
@@ -322,11 +322,6 @@
           <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_exist.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check if createWriter() method throws exception when argument is missing." component="TizenAPI/Cordova/CordovaFile" execution_type="auto" priority="P2" id="cordova_FileEntry_createWriter_misarg">
-        <description>
-          <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_misarg.html</test_script_entry>
-        </description>
-      </testcase>
       <testcase purpose="Check if createWriter() is incorrectly with wrong type of successCallback" component="TizenAPI/Cordova/CordovaFile" execution_type="auto" priority="P1" id="cordova_FileEntry_createWriter_with_errorCallback">
         <description>
           <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_createWriter_with_errorCallback.html</test_script_entry>
@@ -342,11 +337,6 @@
           <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_file_exist.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check if file() method throws exception when argument is missing." component="TizenAPI/Cordova/CordovaFile" execution_type="auto" priority="P2" id="cordova_FileEntry_file_misarg">
-        <description>
-          <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_file_misarg.html</test_script_entry>
-        </description>
-      </testcase>
       <testcase purpose="Check file method with errorCallback" component="TizenAPI/Cordova/CordovaFile" execution_type="auto" priority="P1" id="cordova_FileEntry_file_with_errorCallback">
         <description>
           <test_script_entry>/opt/tct-file-cordova-tests/file/cordova_FileEntry_file_with_errorCallback.html</test_script_entry>