From: Piotr Szydelko Date: Tue, 8 Oct 2013 12:51:51 +0000 (+0200) Subject: [Filesystem] TYPE_MISMATCH_EXCEPTION in assert_throws() X-Git-Tag: 2.2.1_release~105^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f0e17df36dfae0af69860847721a6526a6ea6aa;p=test%2Ftct%2Fweb%2Fapi.git [Filesystem] TYPE_MISMATCH_EXCEPTION in assert_throws() Change-Id: I4eccd5d55f6705115e72c4f836c909e69e1793f8 --- diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_addStorageStateChangeListener_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_addStorageStateChangeListener_onerror_invalid_cb.html index 77e35e559..c7dd17c6c 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_addStorageStateChangeListener_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_addStorageStateChangeListener_onerror_invalid_cb.html @@ -37,7 +37,7 @@ Authors: // Check argument onError validation var t = async_test(document.title), - exceptionName = "TypeMismatchError", incorrectCallback, onSuccess; + incorrectCallback, onSuccess; t.step(function () { onSuccess = t.step_func(function (storage) { assert_unreached("onSuccess callback invoked"); @@ -47,10 +47,10 @@ t.step(function () { assert_unreached("invalid callback invoked"); }) }; - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.addStorageStateChangeListener(onSuccess, incorrectCallback); - }, exceptionName + " should be thrown - given incorrect error callback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_addStorageStateChangeListener_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_addStorageStateChangeListener_onsuccess_invalid_cb.html index 85beff561..f4d2db2a0 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_addStorageStateChangeListener_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_addStorageStateChangeListener_onsuccess_invalid_cb.html @@ -38,7 +38,7 @@ Authors: // Check argument onSuccess validation var t = async_test(document.title), - exceptionName = "TypeMismatchError", incorrectCallback; + incorrectCallback; t.step(function () { incorrectCallback = { @@ -46,10 +46,10 @@ t.step(function () { assert_unreached("Invalid callback invoked: "); }) }; - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.addStorageStateChangeListener(incorrectCallback); - }, exceptionName + " should be thrown - given incorrect error callback."); + }, "given incorrect error callback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_getStorage_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_getStorage_onerror_invalid_cb.html index 756c23a7f..8c758f3bc 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_getStorage_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_getStorage_onerror_invalid_cb.html @@ -38,7 +38,7 @@ Authors: // Check argument onError validation var t = async_test(document.title), - exceptionName = "TypeMismatchError", getStorageIncorrect, getStorageSuccess, + getStorageIncorrect, getStorageSuccess, listStoragesSuccess, listStoragesError; t.step(function () { @@ -54,10 +54,10 @@ t.step(function () { assert_unreached("listStorages() error callback invoked: name: " + error.name + ", msg: " + error.message); }); listStoragesSuccess = t.step_func(function (storages) { - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.getStorage(storages[0].label, getStorageSuccess, getStorageIncorrect); - }, exceptionName + " should be thrown - given incorrect error callback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_getStorage_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_getStorage_onsuccess_invalid_cb.html index 42799e3fc..62f344dcc 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_getStorage_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_getStorage_onsuccess_invalid_cb.html @@ -38,7 +38,7 @@ Authors: // Check argument onSuccess validation var t = async_test(document.title), - exceptionName = "TypeMismatchError", getStorageIncorrect, listStoragesError, + getStorageIncorrect, listStoragesError, listStoragesSuccess; t.step(function () { @@ -49,10 +49,10 @@ t.step(function () { }; listStoragesSuccess = t.step_func(function (storages) { - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.getStorage(storages[0].label, getStorageIncorrect); - }, exceptionName + " should be thrown - given incorrect error callback."); + }, "given incorrect error callback"); t.done(); }); listStoragesError = t.step_func(function (error) { diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_onerror_invalid_cb.html index 5b1fda80a..0e92d5332 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_onerror_invalid_cb.html @@ -38,8 +38,7 @@ Authors: // Check argument onError validation var t = async_test(document.title), - exceptionName = "TypeMismatchError", listStoragesIncorrect, - listStoragesSuccess; + listStoragesIncorrect, listStoragesSuccess; t.step(function () { @@ -52,10 +51,10 @@ t.step(function () { assert_unreached("Invalid callback invoked: "); }) }; - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.listStorages(listStoragesSuccess, listStoragesIncorrect); - }, exceptionName + "should be thrown - given incorrect error callback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_onsuccess_invalid_cb.html index f3fc62cfa..fd5359152 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_onsuccess_invalid_cb.html @@ -39,7 +39,7 @@ Authors: // Check argument onSuccess validation var t = async_test(document.title), - exceptionName = "TypeMismatchError", listStoragesIncorrect; + listStoragesIncorrect; t.step(function () { @@ -48,10 +48,10 @@ t.step(function () { assert_unreached("Invalid callback invoked: "); }) }; - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.listStorages(listStoragesIncorrect); - }, exceptionName + "should be thrown - given incorrect error callback."); + }, "given incorrect error callback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_with_invalid_error_callbacks.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_with_invalid_error_callbacks.html index 3804f70de..ecadf0658 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_with_invalid_error_callbacks.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_listStorages_with_invalid_error_callbacks.html @@ -41,17 +41,17 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/filesystem.html //==== TEST_CRITERIA MC var t = async_test(document.title), - invalid_type_params = [123, "abc", true, {}], getStorageSuccess, i; + invalidTypeParams = [123, "abc", true, {}], getStorageSuccess, i; t.step(function () { getStorageSuccess = t.step_func(function (storages) { assert_unreached("Unexpected getStorageSuccess"); }); - for (i = 0; i < invalid_type_params.length; i++) { + for (i = 0; i < invalidTypeParams.length; i++) { assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.listStorages( getStorageSuccess, - invalid_type_params[i] + invalidTypeParams[i] ); }); } diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_onerror_invalid_cb.html index 0c01810c4..fe98abbb4 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_onerror_invalid_cb.html @@ -37,8 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - exceptionName = "TypeMismatchError", resolveError, resolveSuccess, - conversionTable; + resolveError, resolveSuccess, conversionTable; t.step(function () { conversionTable = getTypeConversionExceptions("functionObject", true); @@ -49,10 +48,10 @@ t.step(function () { assert_unreached("Invalid callback invoked: "); }) }; - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.resolve("images", resolveSuccess, resolveError, "rw"); - }, exceptionName + "should be thrown - given incorrect error callback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_onsuccess_invalid_cb.html index ba4d843d3..7cda4b175 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_onsuccess_invalid_cb.html @@ -37,7 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - exceptionName = "TypeMismatchError", resolveSuccess, resolveError; + resolveSuccess, resolveError; t.step(function () { @@ -51,10 +51,10 @@ t.step(function () { }) }; - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.filesystem.resolve("documents", resolveSuccess, resolveError); - }, exceptionName + "should be thrown - given incorrect error callback."); + }, "given incorrect error callback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_works_correctly.html b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_works_correctly.html index a763a0eae..4ef77f499 100644 --- a/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_works_correctly.html +++ b/tct-filesystem-tizen-tests/filesystem/FileSystemManager_resolve_works_correctly.html @@ -64,7 +64,7 @@ t.step(function () { assert_true("fileSize" in dir, "fileSize don't exist in object"); assert_type(dir.fileSize, "undefined", "fileSize should be undefined"); assert_true("length" in dir, "length don't exist in object"); - assert_type(dir.length, "number", "type of length should be number"); + assert_type(dir.length, "long", "type of length should be number"); assert_true(dir.length >= 0, "value of length should be >= 0"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_copyTo_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_copyTo_onerror_invalid_cb.html index 258a9503f..1e6c088c5 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_copyTo_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_copyTo_onerror_invalid_cb.html @@ -42,7 +42,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), resolveSuccess, resolveError, - copySuccess, copyError, exceptionName = "TypeMismatchError", fsTestFileName; + copySuccess, copyError, fsTestFileName; t.step(function () { fsTestFileName = getFileName("filesystem.txt"); @@ -58,10 +58,10 @@ t.step(function () { }); resolveSuccess = t.step_func(function (dir) { - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.copyTo(fsTestFileName, "images", true, copySuccess, copyError); - }, exceptionName + " should be thrown - given incorrect errorCallback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_copyTo_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_copyTo_onsuccess_invalid_cb.html index 52e0d677d..40367a06e 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_copyTo_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_copyTo_onsuccess_invalid_cb.html @@ -40,7 +40,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - resolveSuccess, resolveError, copySuccess, exceptionName = "TypeMismatchError", fsTestFile, fsTestFileName; + resolveSuccess, resolveError, copySuccess, fsTestFile, fsTestFileName; t.step(function (){ fsTestFileName = getFileName("filesystem.txt"); @@ -53,10 +53,10 @@ t.step(function (){ resolveSuccess = t.step_func(function (dir) { fsTestFile = dir.createFile(fsTestFileName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.copyTo(fsTestFile.fullPath, "images", true, copySuccess); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect successCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_deleteDirectory_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_deleteDirectory_onerror_invalid_cb.html index e27937b8c..44e8da319 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_deleteDirectory_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_deleteDirectory_onerror_invalid_cb.html @@ -42,8 +42,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - resolveSuccess, resolveError, deleteDirectorySuccess, deleteDirectoryError, fsTestDirName, fsTestDir, - exceptionName = "TypeMismatchError"; + resolveSuccess, resolveError, deleteDirectorySuccess, deleteDirectoryError, fsTestDirName, fsTestDir; t.step(function () { fsTestDirName = getDirName("filesystem"); @@ -60,10 +59,10 @@ t.step(function () { resolveSuccess = t.step_func(function (dir) { fsTestDir = dir.createDirectory(fsTestDirName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.deleteDirectory(fsTestDir.fullPath, deleteDirectorySuccess, deleteDirectoryError); - }, exceptionName + " should be thrown - given incorrect deleteDirectorySuccess."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_deleteDirectory_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_deleteDirectory_onsuccess_invalid_cb.html index 808b3a4d4..8206afb62 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_deleteDirectory_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_deleteDirectory_onsuccess_invalid_cb.html @@ -43,7 +43,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - resolveSuccess, resolveError, deleteSuccess, exceptionName = "TypeMismatchError", fsTestDirName, fsTestDir; + resolveSuccess, resolveError, deleteSuccess, fsTestDirName, fsTestDir; t.step(function (){ fsTestDirName = getDirName("filesystem"); @@ -56,10 +56,10 @@ t.step(function (){ resolveSuccess = t.step_func(function (dir) { fsTestDir = dir.createDirectory(fsTestDirName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.deleteDirectory(fsTestDir.fullPath, false, deleteSuccess); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect successCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_deleteFile_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_deleteFile_onerror_invalid_cb.html index 1401ffb81..6e8af7cd9 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_deleteFile_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_deleteFile_onerror_invalid_cb.html @@ -37,8 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), fsTestFileName, fsTestFile, - resolveSuccess, resolveError, deleteFileSuccess, exceptionName = "TypeMismatchError", - deleteFileError; + resolveSuccess, resolveError, deleteFileSuccess, deleteFileError; t.step(function () { fsTestFileName = getFileName("filesystem.txt"); @@ -53,10 +52,10 @@ t.step(function () { }); resolveSuccess = t.step_func(function (dir) { fsTestFile = dir.createDirectory(fsTestFileName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.deleteFile(fsTestFile.fullPath, deleteFileSuccess, deleteFileError); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_deleteFile_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_deleteFile_onsuccess_invalid_cb.html index f7259e8ce..dc4cc2d2a 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_deleteFile_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_deleteFile_onsuccess_invalid_cb.html @@ -37,7 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), fsTestFileName, fsTestFile, - resolveSuccess, resolveError, deleteFileSuccess, exceptionName = "TypeMismatchError"; + resolveSuccess, resolveError, deleteFileSuccess; t.step(function () { fsTestFileName = getFileName("filesystem.txt"); @@ -50,10 +50,10 @@ t.step(function () { resolveSuccess = t.step_func(function (dir) { fsTestFile = dir.createFile(fsTestFileName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.deleteFile(fsTestFile.fullPath, deleteFileSuccess); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect successCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_listFiles.html b/tct-filesystem-tizen-tests/filesystem/File_listFiles.html index 4c1ec0d5c..31b4f0878 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_listFiles.html +++ b/tct-filesystem-tizen-tests/filesystem/File_listFiles.html @@ -22,7 +22,7 @@ Authors: File_listFiles - + @@ -39,6 +39,7 @@ var t = async_test(document.title), resolveSuccess, resolveError, listFilesSuccess, retVal=null; t.step(function () { listFilesSuccess = t.step_func(function (files) { + assert_type(files, "array", "files should be array"); assert_equals(retVal, undefined, "incorrect returned value"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_listFiles_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_listFiles_onerror_invalid_cb.html index 017051876..8e7eecdcc 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_listFiles_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_listFiles_onerror_invalid_cb.html @@ -37,8 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), fsTestFileName, fsTestFile, - resolveSuccess, resolveError, listFilesSuccess, exceptionName = "TypeMismatchError", - listFilesError; + resolveSuccess, resolveError, listFilesSuccess, listFilesError; t.step(function () { fsTestFileName = getFileName("filesystem.txt"); @@ -52,10 +51,10 @@ t.step(function () { }); resolveSuccess = t.step_func(function (dir) { fsTestFile = dir.createFile(fsTestFileName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { fsTestFile.listFiles(listFilesSuccess, listFilesError); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_listFiles_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_listFiles_onsuccess_invalid_cb.html index 01a1da201..e52cf034d 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_listFiles_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_listFiles_onsuccess_invalid_cb.html @@ -37,7 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - resolveSuccess, resolveError, listFilesSuccess, exceptionName = "TypeMismatchError"; + resolveSuccess, resolveError, listFilesSuccess; t.step(function () { listFilesSuccess = { @@ -47,11 +47,10 @@ t.step(function () { }; resolveSuccess = t.step_func(function (dir) { - assert_throws({ - name: exceptionName - }, function () { + assert_throws(TYPE_MISMATCH_EXCEPTION, + function () { dir.listFiles(listFilesSuccess); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect successCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_moveTo_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_moveTo_onerror_invalid_cb.html index 29721c422..a31a80d7b 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_moveTo_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_moveTo_onerror_invalid_cb.html @@ -37,8 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), fsTestFileName, fsTestFile, - resolveSuccess, resolveError, moveToSuccess, exceptionName = "TypeMismatchError", - moveToError; + resolveSuccess, resolveError, moveToSuccess, moveToError; t.step(function () { fsTestFileName = getFileName("filesystem.txt"); @@ -54,10 +53,10 @@ t.step(function () { resolveSuccess = t.step_func(function (dir) { fsTestFile = dir.createFile(fsTestFileName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.moveTo(fsTestFile.fullPath, "images", true, moveToSuccess, moveToError); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_moveTo_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_moveTo_onsuccess_invalid_cb.html index 4ae4c3103..8cbf4cbb6 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_moveTo_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_moveTo_onsuccess_invalid_cb.html @@ -38,7 +38,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), resolveSuccess, resolveError, - moveToSuccess, exceptionName = "TypeMismatchError", fsTestFileName, fsTestFile; + moveToSuccess, fsTestFileName, fsTestFile; t.step(function () { fsTestFileName = getFileName("filesystem.txt"); @@ -51,10 +51,10 @@ t.step(function () { resolveSuccess = t.step_func(function (dir) { fsTestFile = dir.createFile(fsTestFileName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.moveTo(fsTestFile.fullPath, "images", true, moveToSuccess); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect successCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_openStream_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_openStream_onerror_invalid_cb.html index 55b21bf63..cb90cdcb3 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_openStream_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_openStream_onerror_invalid_cb.html @@ -36,8 +36,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - resolveSuccess, resolveError, openStreamSuccess, exceptionName = "TypeMismatchError", - openStreamError; + resolveSuccess, resolveError, openStreamSuccess, openStreamError; t.step(function () { openStreamError = { onerror: t.step_func(function (error) { @@ -51,10 +50,10 @@ t.step(function () { }); resolveSuccess = t.step_func(function (dir) { - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.openStream("r", openStreamSuccess, openStreamError); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect errorCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_openStream_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_openStream_onsuccess_invalid_cb.html index 3e21e3543..7363cb40e 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_openStream_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_openStream_onsuccess_invalid_cb.html @@ -37,7 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - resolveSuccess, resolveError, openStreamSuccess, exceptionName = "TypeMismatchError", fsTestFileName, fsTestFile; + resolveSuccess, resolveError, openStreamSuccess, fsTestFileName, fsTestFile; t.step(function (){ fsTestFileName = getFileName("filesystem.txt"); @@ -49,10 +49,10 @@ t.step(function (){ resolveSuccess = t.step_func(function (dir) { fsTestFile = dir.createFile(fsTestFileName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { fsTestFile.openStream("r", openStreamSuccess); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect successCallback"); t.done(); }); diff --git a/tct-filesystem-tizen-tests/filesystem/File_readAsText_onerror_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_readAsText_onerror_invalid_cb.html index 49850255d..7b9b26b54 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_readAsText_onerror_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_readAsText_onerror_invalid_cb.html @@ -37,8 +37,7 @@ Authors: //==== TEST_CRITERIA MTCB var t = async_test(document.title), - resolveSuccess, resolveError, readAsTextSuccess, readAsTextError, - exceptionName = "TypeMismatchError"; + resolveSuccess, resolveError, readAsTextSuccess, readAsTextError; t.step(function () { readAsTextError = { @@ -51,10 +50,10 @@ t.step(function () { }); resolveSuccess = t.step_func(function (dir) { - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { dir.readAsText(readAsTextSuccess, readAsTextError); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect errorCallback"); t.done(); }); resolveError = t.step_func(function (error) { diff --git a/tct-filesystem-tizen-tests/filesystem/File_readAsText_onsuccess_invalid_cb.html b/tct-filesystem-tizen-tests/filesystem/File_readAsText_onsuccess_invalid_cb.html index fd5b7e914..de99a69a1 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_readAsText_onsuccess_invalid_cb.html +++ b/tct-filesystem-tizen-tests/filesystem/File_readAsText_onsuccess_invalid_cb.html @@ -39,7 +39,6 @@ Authors: var t = async_test(document.title), resolveSuccess, resolveError, readAsTextSuccess, - exceptionName = "TypeMismatchError", fsTestFileName = getFileName("goodFile.txt"), file; t.step(function (){ @@ -50,10 +49,10 @@ t.step(function (){ }; resolveSuccess = t.step_func(function (dir) { file = dir.createFile(fsTestFileName); - assert_throws({name: exceptionName}, + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { file.readAsText(readAsTextSuccess); - }, exceptionName + " should be thrown - given incorrect successCallback."); + }, "given incorrect successCallback"); t.done(); }); resolveError = t.step_func(function (error) { diff --git a/tct-filesystem-tizen-tests/filesystem/File_readAsText_with_encoding.html b/tct-filesystem-tizen-tests/filesystem/File_readAsText_with_encoding.html index fe8b6108c..1b9da4544 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_readAsText_with_encoding.html +++ b/tct-filesystem-tizen-tests/filesystem/File_readAsText_with_encoding.html @@ -40,7 +40,7 @@ var t = async_test(document.title), readAsTextSuccess, readAsTextError, i; t.step(function (){ - readAsTextSuccess = t.step_func(function (files) { + readAsTextSuccess = t.step_func(function (text) { t.done(); }); readAsTextError = t.step_func(function (error) { diff --git a/tct-filesystem-tizen-tests/filesystem/File_readAsText_with_onerror.html b/tct-filesystem-tizen-tests/filesystem/File_readAsText_with_onerror.html index 7ee47ae63..7b3a7abb0 100644 --- a/tct-filesystem-tizen-tests/filesystem/File_readAsText_with_onerror.html +++ b/tct-filesystem-tizen-tests/filesystem/File_readAsText_with_onerror.html @@ -46,7 +46,7 @@ t.step(function () { assert_not_equals(error.message, "", "incorrect error message"); t.done(); }); - readAsTextSuccess = t.step_func(function (files) { + readAsTextSuccess = t.step_func(function (text) { assert_unreached("readAsTextSuccess: readAsTextError should be invoked"); });