From: qunfang.lin Date: Wed, 4 Sep 2019 01:59:36 +0000 (+0800) Subject: [common][account][fix assert_throws description and coding style issue] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75989aa3ad584682c42539c7cadd8a3dba9cacd7;p=test%2Ftct%2Fweb%2Fapi.git [common][account][fix assert_throws description and coding style issue] Change-Id: Ife6e4033b6f57c75bbfeedfa305e9aa71eb2e5f9 Signed-off-by: qunfang.lin --- diff --git a/common/tct-account-tizen-tests/account/AccountChangeCallback_onadded.html b/common/tct-account-tizen-tests/account/AccountChangeCallback_onadded.html index 2b8f654b8..8723cae93 100755 --- a/common/tct-account-tizen-tests/account/AccountChangeCallback_onadded.html +++ b/common/tct-account-tizen-tests/account/AccountChangeCallback_onadded.html @@ -49,7 +49,7 @@ t.step(function () { assert_own_property(accountAdded, "iconUri", "accountAdded doesn't have iconUri property"); assert_own_property(accountAdded, "provider", "accountAdded doesn't have provider property"); accountRemove(accountAdded.id); - tizen.account.removeAccountListener(id); + tizen.account.removeAccountListener(id); t.done(); }), onremoved: t.step_func(function (accountIdRemoved) { diff --git a/common/tct-account-tizen-tests/account/AccountChangeCallback_onremoved.html b/common/tct-account-tizen-tests/account/AccountChangeCallback_onremoved.html index b90f7ab0f..4067a6706 100755 --- a/common/tct-account-tizen-tests/account/AccountChangeCallback_onremoved.html +++ b/common/tct-account-tizen-tests/account/AccountChangeCallback_onremoved.html @@ -47,7 +47,7 @@ t.step(function () { onremoved: t.step_func(function (accountIdRemoved) { assert_type(accountIdRemoved, "number", "accountIdRemoved should be number type"); tizen.account.removeAccountListener(watchId); - t.done(); + t.done(); }), onupdated: t.step_func(function (accountUpdated) { assert_unreached("Should be invoked to onremoved callback"); diff --git a/common/tct-account-tizen-tests/account/AccountChangeCallback_onupdated.html b/common/tct-account-tizen-tests/account/AccountChangeCallback_onupdated.html index 41020e80f..8296223b6 100755 --- a/common/tct-account-tizen-tests/account/AccountChangeCallback_onupdated.html +++ b/common/tct-account-tizen-tests/account/AccountChangeCallback_onupdated.html @@ -56,7 +56,7 @@ t.step(function () { assert_own_property(accountUpdated, "iconUri", "accountUpdated doesn't have iconUri property"); assert_own_property(accountUpdated, "provider", "accountUpdated doesn't have provider property"); accountRemove(accountUpdated.id); - tizen.account.removeAccountListener(watchId); + tizen.account.removeAccountListener(watchId); t.done(); }) }; diff --git a/common/tct-account-tizen-tests/account/AccountManager_add.html b/common/tct-account-tizen-tests/account/AccountManager_add.html index 2e7636526..7123993de 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_add.html +++ b/common/tct-account-tizen-tests/account/AccountManager_add.html @@ -37,6 +37,7 @@ Authors: test(function () { var appId, provider, account1, returnedValue, account2; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account1 = new tizen.Account(provider, {userName: "admin", iconUri: "/home/owner/share/tct-account-tizen-tests/icon.png"}); diff --git a/common/tct-account-tizen-tests/account/AccountManager_addAccountListener.html b/common/tct-account-tizen-tests/account/AccountManager_addAccountListener.html index 7c45d96e2..8fa148cc7 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_addAccountListener.html +++ b/common/tct-account-tizen-tests/account/AccountManager_addAccountListener.html @@ -49,7 +49,7 @@ t.step(function () { }), onremoved: t.step_func(function (accountIdRemoved) { assert_equals(accountIdRemoved, account.id, "the id should be same"); - tizen.account.removeAccountListener(watchId); + tizen.account.removeAccountListener(watchId); t.done(); }), onupdated: t.step_func(function (accountUpdated) { diff --git a/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_callback_TypeMismatch.html b/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_callback_TypeMismatch.html index c29b30e0d..59955a172 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_callback_TypeMismatch.html +++ b/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_callback_TypeMismatch.html @@ -36,12 +36,13 @@ Authors: test(function () { var conversionTable, accountChangeCallback, i; + conversionTable = getTypeConversionExceptions("object", false); for (i = 0; i < conversionTable.length; i++) { accountChangeCallback = conversionTable[i][0]; assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.account.addAccountListener(accountChangeCallback); - }, TYPE_MISMATCH_EXCEPTION + " exception should be thrown - given incorrect callback argument"); + }, "TypeMismatchError should be thrown - given incorrect callback argument"); } }, document.title); diff --git a/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_callback_invalid_cb.html b/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_callback_invalid_cb.html index 603e91830..24061a793 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_callback_invalid_cb.html +++ b/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_callback_invalid_cb.html @@ -36,12 +36,13 @@ Authors: test(function () { var incorrectListeners, i, accountChangeCallback; + incorrectListeners = getListenerConversionExceptions(["onadded", "onremoved", "onupdated"]); for (i = 0; i < incorrectListeners.length; i++) { accountChangeCallback = incorrectListeners[i][0]; assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.account.addAccountListener(accountChangeCallback); - }, TYPE_MISMATCH_EXCEPTION + " exception should be thrown - given incorrect callback"); + }, "TypeMismatchError should be thrown - given incorrect callback"); } }, document.title); diff --git a/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_misarg.html b/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_misarg.html index bc9272977..311e33620 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_misarg.html +++ b/common/tct-account-tizen-tests/account/AccountManager_addAccountListener_misarg.html @@ -37,7 +37,7 @@ Authors: test(function () { assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.account.addAccountListener(); - }, TYPE_MISMATCH_EXCEPTION + " exception should be thrown - not given callback argument."); + }, "TypeMismatchError should be thrown - not given callback argument."); }, document.title); diff --git a/common/tct-account-tizen-tests/account/AccountManager_add_TypeMismatch.html b/common/tct-account-tizen-tests/account/AccountManager_add_TypeMismatch.html index e0831a957..9e2168d0d 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_add_TypeMismatch.html +++ b/common/tct-account-tizen-tests/account/AccountManager_add_TypeMismatch.html @@ -36,11 +36,12 @@ Authors: test(function () { var conversionTable, i; + conversionTable = getTypeConversionExceptions("object", false); for (i = 0; i < conversionTable.length; i++) { assert_throws(TYPE_MISMATCH_EXCEPTION, function () { tizen.account.add(conversionTable[i][0]); - }, TYPE_MISMATCH_EXCEPTION + " exception should be thrown - given incorrect account object"); + }, "TypeMismatchError should be thrown - given incorrect account object"); } }, document.title); diff --git a/common/tct-account-tizen-tests/account/AccountManager_getAccount.html b/common/tct-account-tizen-tests/account/AccountManager_getAccount.html index fc761ccab..23496f673 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_getAccount.html +++ b/common/tct-account-tizen-tests/account/AccountManager_getAccount.html @@ -37,6 +37,7 @@ Authors: test(function () { var appId, provider, account1, account2; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account1 = new tizen.Account(provider, {userName: "admin", iconUri: "/home/owner/share/tct-account-tizen-tests/icon.png"}); diff --git a/common/tct-account-tizen-tests/account/AccountManager_getAccount_without_accountId.html b/common/tct-account-tizen-tests/account/AccountManager_getAccount_without_accountId.html index d58f28408..2e20e2500 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_getAccount_without_accountId.html +++ b/common/tct-account-tizen-tests/account/AccountManager_getAccount_without_accountId.html @@ -36,6 +36,7 @@ Authors: test(function () { var returnedValue; + returnedValue = tizen.account.getAccount(); assert_equals(returnedValue, null, "the returned value should be null"); }, document.title); diff --git a/common/tct-account-tizen-tests/account/AccountManager_getProvider.html b/common/tct-account-tizen-tests/account/AccountManager_getProvider.html index d9911a87a..439a9c497 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_getProvider.html +++ b/common/tct-account-tizen-tests/account/AccountManager_getProvider.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); assert_not_equals(provider, null, "provider should not be null"); diff --git a/common/tct-account-tizen-tests/account/AccountManager_getProvider_without_applicationId.html b/common/tct-account-tizen-tests/account/AccountManager_getProvider_without_applicationId.html index 93b0fb5c0..0724b638d 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_getProvider_without_applicationId.html +++ b/common/tct-account-tizen-tests/account/AccountManager_getProvider_without_applicationId.html @@ -36,6 +36,7 @@ Authors: test(function () { var returnedValue; + returnedValue = tizen.account.getProvider(); assert_equals(returnedValue, null, "the returned value should be null"); }, document.title); diff --git a/common/tct-account-tizen-tests/account/AccountManager_remove.html b/common/tct-account-tizen-tests/account/AccountManager_remove.html index 7c67017fe..78ccd714d 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_remove.html +++ b/common/tct-account-tizen-tests/account/AccountManager_remove.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider, account, returnedValue, accountGet; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account = new tizen.Account(provider, {userName: "admin", iconUri: "/home/owner/share/tct-account-tizen-tests/icon.png"}); diff --git a/common/tct-account-tizen-tests/account/AccountManager_removeAccountListener_without_accountListenerId.html b/common/tct-account-tizen-tests/account/AccountManager_removeAccountListener_without_accountListenerId.html index 239248d12..b35c40ec5 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_removeAccountListener_without_accountListenerId.html +++ b/common/tct-account-tizen-tests/account/AccountManager_removeAccountListener_without_accountListenerId.html @@ -37,6 +37,7 @@ Authors: test(function () { var returnedValue; + returnedValue = tizen.account.removeAccountListener(); assert_equals(returnedValue, undefined, "Returned value should be undefined"); }, document.title); diff --git a/common/tct-account-tizen-tests/account/AccountManager_remove_without_accountId.html b/common/tct-account-tizen-tests/account/AccountManager_remove_without_accountId.html index 9b08fd20c..3c65d61de 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_remove_without_accountId.html +++ b/common/tct-account-tizen-tests/account/AccountManager_remove_without_accountId.html @@ -36,6 +36,7 @@ Authors: test(function () { var returnedValue; + returnedValue = tizen.account.remove(); assert_equals(returnedValue, undefined, "Returned value should be undefined"); }, document.title); diff --git a/common/tct-account-tizen-tests/account/AccountManager_update.html b/common/tct-account-tizen-tests/account/AccountManager_update.html index 376076d0a..a785212a5 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_update.html +++ b/common/tct-account-tizen-tests/account/AccountManager_update.html @@ -37,6 +37,7 @@ Authors: test(function () { var appId, provider, account1, returnedValue, account2; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account1 = new tizen.Account(provider, {userName: 'admin', iconUri: 'path/to/icon.jpg'}); diff --git a/common/tct-account-tizen-tests/account/AccountManager_update_TypeMismatch.html b/common/tct-account-tizen-tests/account/AccountManager_update_TypeMismatch.html index 38b25c760..c6fce0789 100755 --- a/common/tct-account-tizen-tests/account/AccountManager_update_TypeMismatch.html +++ b/common/tct-account-tizen-tests/account/AccountManager_update_TypeMismatch.html @@ -36,6 +36,7 @@ Authors: test(function () { var conversionTable, i; + conversionTable = getTypeConversionExceptions("object", false); for (i = 0; i < conversionTable.length; i++) { assert_throws(TYPE_MISMATCH_EXCEPTION, function () { diff --git a/common/tct-account-tizen-tests/account/AccountProvider_applicationId_attribute.html b/common/tct-account-tizen-tests/account/AccountProvider_applicationId_attribute.html index 20f2b4424..58fe53724 100755 --- a/common/tct-account-tizen-tests/account/AccountProvider_applicationId_attribute.html +++ b/common/tct-account-tizen-tests/account/AccountProvider_applicationId_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var app, provider; + app = tizen.application.getCurrentApplication(); provider = tizen.account.getProvider(app.appInfo.id); check_readonly(provider, "applicationId", provider.applicationId, "string", "Tizen"); diff --git a/common/tct-account-tizen-tests/account/AccountProvider_capabilities_attribute.html b/common/tct-account-tizen-tests/account/AccountProvider_capabilities_attribute.html index 2aa05552c..42d9ea81b 100755 --- a/common/tct-account-tizen-tests/account/AccountProvider_capabilities_attribute.html +++ b/common/tct-account-tizen-tests/account/AccountProvider_capabilities_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); check_readonly(provider, "capabilities", provider.capabilities, "object", ["Tizen", "Samsung"]); diff --git a/common/tct-account-tizen-tests/account/AccountProvider_displayName_attribute.html b/common/tct-account-tizen-tests/account/AccountProvider_displayName_attribute.html index 58453f590..98db76964 100755 --- a/common/tct-account-tizen-tests/account/AccountProvider_displayName_attribute.html +++ b/common/tct-account-tizen-tests/account/AccountProvider_displayName_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); check_readonly(provider, "displayName", provider.displayName, "string", "Tizen"); diff --git a/common/tct-account-tizen-tests/account/AccountProvider_extend.html b/common/tct-account-tizen-tests/account/AccountProvider_extend.html index 16df75d34..d34becdaa 100755 --- a/common/tct-account-tizen-tests/account/AccountProvider_extend.html +++ b/common/tct-account-tizen-tests/account/AccountProvider_extend.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); check_extensibility(provider); diff --git a/common/tct-account-tizen-tests/account/AccountProvider_iconUri_attribute.html b/common/tct-account-tizen-tests/account/AccountProvider_iconUri_attribute.html index 3cdc466df..fbd9c1ac0 100755 --- a/common/tct-account-tizen-tests/account/AccountProvider_iconUri_attribute.html +++ b/common/tct-account-tizen-tests/account/AccountProvider_iconUri_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var app, provider; + app = tizen.application.getCurrentApplication(); provider = tizen.account.getProvider(app.appInfo.id); check_readonly(provider, "iconUri", provider.iconUri, "string", "Tizen"); diff --git a/common/tct-account-tizen-tests/account/AccountProvider_isMultipleAccountSupported_attribute.html b/common/tct-account-tizen-tests/account/AccountProvider_isMultipleAccountSupported_attribute.html index 60600ea2d..8583c00c3 100755 --- a/common/tct-account-tizen-tests/account/AccountProvider_isMultipleAccountSupported_attribute.html +++ b/common/tct-account-tizen-tests/account/AccountProvider_isMultipleAccountSupported_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var app, provider; + app = tizen.application.getCurrentApplication(); provider = tizen.account.getProvider(app.appInfo.id); check_readonly(provider, "isMultipleAccountSupported", provider.isMultipleAccountSupported, "boolean", false); diff --git a/common/tct-account-tizen-tests/account/AccountProvider_smallIconUri_attribute.html b/common/tct-account-tizen-tests/account/AccountProvider_smallIconUri_attribute.html index ca3b74bcb..38ad1a099 100755 --- a/common/tct-account-tizen-tests/account/AccountProvider_smallIconUri_attribute.html +++ b/common/tct-account-tizen-tests/account/AccountProvider_smallIconUri_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var app, provider; + app = tizen.application.getCurrentApplication(); provider = tizen.account.getProvider(app.appInfo.id); check_readonly(provider, "smallIconUri", provider.smallIconUri, "string", "Tizen"); diff --git a/common/tct-account-tizen-tests/account/Account_constructor.html b/common/tct-account-tizen-tests/account/Account_constructor.html index 79e83eaae..21b385e32 100755 --- a/common/tct-account-tizen-tests/account/Account_constructor.html +++ b/common/tct-account-tizen-tests/account/Account_constructor.html @@ -37,6 +37,7 @@ Authors: test(function () { var appId, provider, account1, account2; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account1 = new tizen.Account(provider); diff --git a/common/tct-account-tizen-tests/account/Account_extend.html b/common/tct-account-tizen-tests/account/Account_extend.html index af6f7abb5..bb5f081a6 100755 --- a/common/tct-account-tizen-tests/account/Account_extend.html +++ b/common/tct-account-tizen-tests/account/Account_extend.html @@ -37,6 +37,7 @@ Authors: test(function () { var appId, provider, account; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account = new tizen.Account(provider); diff --git a/common/tct-account-tizen-tests/account/Account_iconUri_attribute.html b/common/tct-account-tizen-tests/account/Account_iconUri_attribute.html index a12803c8f..abad90f23 100755 --- a/common/tct-account-tizen-tests/account/Account_iconUri_attribute.html +++ b/common/tct-account-tizen-tests/account/Account_iconUri_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider, account; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account = new tizen.Account(provider); diff --git a/common/tct-account-tizen-tests/account/Account_id_attribute.html b/common/tct-account-tizen-tests/account/Account_id_attribute.html index b38e4af44..acff872b9 100755 --- a/common/tct-account-tizen-tests/account/Account_id_attribute.html +++ b/common/tct-account-tizen-tests/account/Account_id_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider, account; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account = new tizen.Account(provider); diff --git a/common/tct-account-tizen-tests/account/Account_provider_attribute.html b/common/tct-account-tizen-tests/account/Account_provider_attribute.html index 226e57785..1bfbfa224 100755 --- a/common/tct-account-tizen-tests/account/Account_provider_attribute.html +++ b/common/tct-account-tizen-tests/account/Account_provider_attribute.html @@ -35,7 +35,8 @@ Authors: //==== TEST_CRITERIA AE AT ARO test(function () { - var appId, provider; + var appId, provider, account; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account = new tizen.Account(provider); diff --git a/common/tct-account-tizen-tests/account/Account_setExtendedData_exist.html b/common/tct-account-tizen-tests/account/Account_setExtendedData_exist.html index 9251b1eb6..ae2b98551 100755 --- a/common/tct-account-tizen-tests/account/Account_setExtendedData_exist.html +++ b/common/tct-account-tizen-tests/account/Account_setExtendedData_exist.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider, account; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account = new tizen.Account(provider); diff --git a/common/tct-account-tizen-tests/account/Account_userName_attribute.html b/common/tct-account-tizen-tests/account/Account_userName_attribute.html index 3705f5f3a..3334ecda9 100755 --- a/common/tct-account-tizen-tests/account/Account_userName_attribute.html +++ b/common/tct-account-tizen-tests/account/Account_userName_attribute.html @@ -36,6 +36,7 @@ Authors: test(function () { var appId, provider, account; + appId = tizen.application.getCurrentApplication().appInfo.id; provider = tizen.account.getProvider(appId); account = new tizen.Account(provider);