From: chen Date: Sat, 7 Dec 2024 06:25:55 +0000 (+0800) Subject: [tv][bluetooth] sync tizen_9.0 to latest X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F316618%2F2;p=test%2Ftct%2Fweb%2Fapi.git [tv][bluetooth] sync tizen_9.0 to latest Change-Id: Id6f60f9c2506aae686a46aa0241aacb3d9bab33e Signed-off-by: chen --- diff --git a/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_createBonding_bondingDevice.html b/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_createBonding_bondingDevice.html index df200947c..a9ffb3ce3 100755 --- a/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_createBonding_bondingDevice.html +++ b/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_createBonding_bondingDevice.html @@ -64,6 +64,9 @@ t.step(function () { onstarted: t.step_func(function () { }), ondevicefound: t.step_func(function (device) { + if (device.address === REMOTE_DEVICE_ADDRESS) { + stopDiscovery(t, adapter, stopDiscoverySuccess1); + } }), ondevicedisappeared: t.step_func(function (address) { }), @@ -71,7 +74,7 @@ t.step(function () { if (devices.length > 0) { adapter.createBonding(REMOTE_DEVICE_ADDRESS, onBondingSuccess, onBondingError); } else { - setTimeout(setstopDiscoverySuccess, 1000); + setTimeout(stopDiscoverySuccess, 1000); } }) }; @@ -96,6 +99,10 @@ t.step(function () { assert_unreached("discoverDevicesError exception:" + e.message); }); + stopDiscoverySuccess1 = t.step_func(function () { + console.log("stopDiscoverySuccess1"); + }); + stopDiscoverySuccess = t.step_func(function () { adapter.discoverDevices(discoverDevicesSuccessCallback, discoverDevicesError); }); diff --git a/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_discoverDevices_with_errorCallback.html b/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_discoverDevices_with_errorCallback.html index fcad5677c..288cc2ff1 100755 --- a/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_discoverDevices_with_errorCallback.html +++ b/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_discoverDevices_with_errorCallback.html @@ -33,17 +33,16 @@ Authors: //==== TEST: BluetoothAdapter_discoverDevices_with_errorCallback //==== LABEL Check with non-optional arguments discoverDevices(valid_successCallback, errorCallback) //==== PRIORITY P2 -//==== ONLOAD_DELAY 180 +//==== ONLOAD_DELAY 300 //==== SPEC Tizen Web API:Communication:Bluetooth:BluetoothAdapter:discoverDevices M //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/bluetooth.html //==== PRE The bluetooth of the remote/test device MUST be turned on and discoverable from other devices. //==== TEST_CRITERIA MOA MAST -setup({timeout: 180000}); -var t = async_test(document.title, {timeout: 180000}), adapter, discoverDevicesErrorCB, stopDiscoverySuccess, +setup({timeout: 300000}); +var t = async_test(document.title, {timeout: 300000}), adapter, discoverDevicesErrorCB, stopDiscoverySuccess, discoverDevicesSuccessCB; t.step(function () { if (BT_SUPPORT) { // network.bluetooth support - discoverDevicesSuccessCB = { onstarted: t.step_func(function () { }), diff --git a/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_getKnownDevices.html b/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_getKnownDevices.html index 4dca76c95..30b87470b 100755 --- a/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_getKnownDevices.html +++ b/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_getKnownDevices.html @@ -34,13 +34,13 @@ Authors: //==== TEST: BluetoothAdapter_getKnownDevices //==== LABEL Check with optional arguments getKnownDevices(valid_successCallback) //==== PRIORITY P2 -//==== ONLOAD_DELAY 180 +//==== ONLOAD_DELAY 300 //==== SPEC Tizen Web API:Communication:Bluetooth:BluetoothAdapter:getKnownDevices M //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/bluetooth.html //==== PRE The bluetooth of the remote/test device MUST be turned on and discoverable from other devices. //==== TEST_CRITERIA MMINA MAST MR -setup({timeout: 180000}); -var t = async_test(document.title, {timeout: 180000}), adapter, testDeviceSuccessCB, discoverSuccess, discoverError, +setup({timeout: 300000}); +var t = async_test(document.title, {timeout: 300000}), adapter, testDeviceSuccessCB, discoverSuccess, discoverError, stopDiscoverySuccess, retValue = null; t.step(function () { if (BT_SUPPORT) { // network.bluetooth support diff --git a/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothDiscoverDevicesSuccessCallback_ondevicedisappeared.html b/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothDiscoverDevicesSuccessCallback_ondevicedisappeared.html index 8245181d5..9316f5ce5 100755 --- a/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothDiscoverDevicesSuccessCallback_ondevicedisappeared.html +++ b/common/tct-bluetooth-tizen-tests/bluetooth/BluetoothDiscoverDevicesSuccessCallback_ondevicedisappeared.html @@ -43,8 +43,8 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/bluetooth.html //==== PRE The bluetooth of the remote/test device MUST be turned on and discoverable from other devices. //==== TEST_CRITERIA CBT CBOA -setup({ timeout: 180000 }); -var adapter = null, t = async_test(document.title, { timeout: 180000 }), +setup({ timeout: 300000 }); +var adapter = null, t = async_test(document.title, { timeout: 300000 }), stopDiscoverySuccess, discoverDevicesErrorCB, discoverDevicesSuccessOneCB, discoverDevicesSuccessTwoCB, flag = false; t.step(function () { @@ -60,6 +60,7 @@ t.step(function () { }), ondevicedisappeared: t.step_func(function (address) { assert_type(address, "string", "address has wrong type"); + console.log("ondevicedisappeared address: " + address); if (address === REMOTE_DEVICE_ADDRESS) { flag = true; } diff --git a/common/tct-bluetooth-tizen-tests/tests.full.xml b/common/tct-bluetooth-tizen-tests/tests.full.xml index e56b32ab2..233f8be21 100755 --- a/common/tct-bluetooth-tizen-tests/tests.full.xml +++ b/common/tct-bluetooth-tizen-tests/tests.full.xml @@ -8730,7 +8730,7 @@ The bluetooth of the remote/test device MUST be turned on and discoverable from - + The bluetooth of the remote device MUST be turned on and discoverable from other devices. /opt/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_discoverDevices_with_errorCallback.html @@ -8890,7 +8890,7 @@ The bluetooth of the remote/test device MUST be turned on and discoverable from - + The bluetooth of the remote/test device MUST be turned on and discoverable from other devices. /opt/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_getKnownDevices.html diff --git a/common/tct-bluetooth-tizen-tests/tests.xml b/common/tct-bluetooth-tizen-tests/tests.xml index 6c433d2fe..8a89b04a0 100755 --- a/common/tct-bluetooth-tizen-tests/tests.xml +++ b/common/tct-bluetooth-tizen-tests/tests.xml @@ -4025,7 +4025,7 @@ The bluetooth of the remote/test device MUST be turned on and discoverable from /opt/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_discoverDevices_successCallback_invalid_cb.html - + /opt/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_discoverDevices_with_errorCallback.html @@ -4093,7 +4093,7 @@ The bluetooth of the remote/test device MUST be turned on and discoverable from /opt/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_getDevice_with_success_TypeMismatch_and_error_null.html - + /opt/tct-bluetooth-tizen-tests/bluetooth/BluetoothAdapter_getKnownDevices.html