From: zy123.yuan Date: Sat, 24 Feb 2018 02:49:08 +0000 (+0800) Subject: [common][systemsetting][TNEXT-10014, fix tc issue] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1be0d80a0ea90d0e1333c80aaef86ff000ac398b;p=test%2Ftct%2Fweb%2Fapi.git [common][systemsetting][TNEXT-10014, fix tc issue] Change-Id: I883d83196965be49d83c2fd3337339e5cf53e8ba --- diff --git a/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_getProperty_no_errorCallback.html b/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_getProperty_no_errorCallback.html index 98a75671b..22a24dab3 100755 --- a/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_getProperty_no_errorCallback.html +++ b/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_getProperty_no_errorCallback.html @@ -39,16 +39,23 @@ Authors: //==== PRIORITY P1 //==== TEST_CRITERIA MMINA MR var t = async_test(document.title), - successCallback, returnedValue = null; + successCallback, returnedValue = null, deviceCapability, type; t.step(function () { + deviceCapability = tizen.systeminfo.getCapability("http://tizen.org/feature/systemsetting.home_screen"); + if (deviceCapability) { + type = "HOME_SCREEN"; + } else { + type = "INCOMING_CALL"; + } + successCallback = t.step_func(function (value) { assert_equals(returnedValue, undefined, "Incorrect value returned from getProperty method."); assert_type(value, "string", "Incorrect type."); t.done(); }); - returnedValue = tizen.systemsetting.getProperty("INCOMING_CALL", successCallback); + returnedValue = tizen.systemsetting.getProperty(type, successCallback); }); diff --git a/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_setProperty_errorCallback_TypeMismatch.html b/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_setProperty_errorCallback_TypeMismatch.html index b596dcf0b..f9950acc9 100755 --- a/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_setProperty_errorCallback_TypeMismatch.html +++ b/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_setProperty_errorCallback_TypeMismatch.html @@ -39,11 +39,18 @@ Authors: //==== TEST_CRITERIA MC var t = async_test(document.title), - type = "INCOMING_CALL", propertyValue = IMAGE_FILE_PATH, newValue = IMAGE_FILE_PATH2, + type, propertyValue = IMAGE_FILE_PATH, newValue = IMAGE_FILE_PATH2, successCallback, exceptionName, errorCallback, i, conversionTable, - getDeviceValueCallback, getDeviceValueErrorCallback, deviceValue, deviceValue2; + getDeviceValueCallback, getDeviceValueErrorCallback, deviceValue, deviceValue2, deviceCapability; t.step(function () { + deviceCapability = tizen.systeminfo.getCapability("http://tizen.org/feature/systemsetting.home_screen"); + if (deviceCapability) { + type = "HOME_SCREEN"; + } else { + type = "INCOMING_CALL"; + } + successCallback = t.step_func(function () { assert_unreached("SuccessCallback invoked."); }); diff --git a/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_setProperty_no_errorCallback.html b/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_setProperty_no_errorCallback.html index 0ed9f43bd..d4bf3ec12 100755 --- a/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_setProperty_no_errorCallback.html +++ b/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingManager_setProperty_no_errorCallback.html @@ -38,13 +38,20 @@ Authors: //==== PRIORITY P1 //==== TEST_CRITERIA MMINA MAST MR -var t = async_test(document.title), type = "INCOMING_CALL", +var t = async_test(document.title), type, deviceCapability, previousValue, getPreviousValueCallback, newValue = IMAGE_FILE_PATH, newValue2 = IMAGE_FILE_PATH2, newValue_check, setNewValueSuccessCallback, getNewValueSuccessCallback, returnedValue = null, getNewValueSuccessCallback, setPreviousValueSuccessCallback, exception, getPropertyError, setPropertyPreviousError; t.step(function () { + deviceCapability = tizen.systeminfo.getCapability("http://tizen.org/feature/systemsetting.home_screen"); + if (deviceCapability) { + type = "HOME_SCREEN"; + } else { + type = "INCOMING_CALL"; + } + setPropertyPreviousError = t.step_func(function (error) { assert_unreached("setPropertyPreviousError() error: " + error.name + ": " + error.message); }); diff --git a/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingSuccessCallback_onsuccess.html b/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingSuccessCallback_onsuccess.html index 338182a91..eaa7fb191 100755 --- a/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingSuccessCallback_onsuccess.html +++ b/common/tct-systemsetting-tizen-tests/systemsetting/SystemSettingSuccessCallback_onsuccess.html @@ -38,16 +38,22 @@ Authors: //==== PRIORITY P1 //==== TEST_CRITERIA CBT CBOA -var t = async_test(document.title), successCallback; +var t = async_test(document.title), successCallback, deviceCapability, type; t.step(function () { + deviceCapability = tizen.systeminfo.getCapability("http://tizen.org/feature/systemsetting.home_screen"); + if (deviceCapability) { + type = "HOME_SCREEN"; + } else { + type = "INCOMING_CALL"; + } successCallback = t.step_func(function (value) { assert_type(value, "string", "Incorrect type."); t.done(); }); - tizen.systemsetting.getProperty("INCOMING_CALL", successCallback); + tizen.systemsetting.getProperty(type, successCallback); });