From eed5710d817a37fb0d7863e3dee8fc419eb86daf Mon Sep 17 00:00:00 2001 From: hwx951322 Date: Tue, 19 Jul 2022 13:59:29 +0000 Subject: [PATCH] updata2 Signed-off-by: hwx951322 --- .../main/js/default/test/BluetoothOn.test.js | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js b/communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js index 8f9c05662..5a343cac9 100644 --- a/communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js +++ b/communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js @@ -240,11 +240,7 @@ describe('bluetoothhostTest', function() { console.info('[bluetooth_js] BLE scan device find result1 = '+JSON.stringify(data)); except(true).assertTrue(data.length>0); } -<<<<<<< HEAD bluetooth.BLE.on("BLEDeviceFind", onReceiveEvent) -======= - bluetooth.BLE.on("BLEDeviceFind", onReceiveEvent) ->>>>>>> 38f2b81935e5260f075cb7d6702ead0bffa7af8a bluetooth.BLE.startBLEScan([{}]); await sleep(1000); console.info('[bluetooth_js] BLE SCAN OFF01'); @@ -271,21 +267,12 @@ describe('bluetoothhostTest', function() { console.info('[bluetooth_js] BLE scan device find result2 = '+JSON.stringify(data )); except(true).assertTrue(data.length>0); } -<<<<<<< HEAD bluetooth.BLE.on("BLEDeviceFind", onReceiveEvent) bluetooth.BLE.startBLEScan([{deviceId:"00:11:22:33:44:55"}]); await sleep(1000); console.info('[bluetooth_js] BLE scan off2'); bluetooth.BLE.off('BLEDeviceFind'); bluetooth.BLE.stopBLEScan(); -======= - bluetooth.BLE.on("BLEDeviceFind", onReceiveEvent) - bluetooth.BLE.startBLEScan([{deviceId:"00:11:22:33:44:55"}]); - await sleep(1000); - console.info('[bluetooth_js] BLE scan off2'); - bluetooth.BLE.off('BLEDeviceFind'); - bluetooth.BLE.stopBLEScan(); ->>>>>>> 38f2b81935e5260f075cb7d6702ead0bffa7af8a done(); }) @@ -300,7 +287,6 @@ describe('bluetoothhostTest', function() { */ it('SUB_COMMUNACATION_bluetooth_START_BLESCAN_WITHOUT_PARAM_0003', 0, async function (done) { console.info('[bluetooth_js] BLE scan3 test start'); -<<<<<<< HEAD await sleep(1000); await tryToEnableBt(); function onReceiveEvent(data) @@ -315,23 +301,6 @@ describe('bluetoothhostTest', function() { bluetooth.BLE.off('BLEDeviceFind',onReceiveEvent); bluetooth.BLE.stopBLEScan(); done(); -======= - await sleep(1000); - await tryToEnableBt(); - function onReceiveEvent(data) - { - console.info('[bluetooth_js] BLE scan device find result3 = '+JSON.stringify(dat - a )); - except(true).assertTrue(data.length>0); - } - bluetooth.BLE.on("BLEDeviceFind", onReceiveEvent) - bluetooth.BLE.startBLEScan([{deviceId:"00:11:22:33:44:55"}]); - await sleep(1000); - console.info('[bluetooth_js] BLE scan off3'); - bluetooth.BLE.off('BLEDeviceFind',onReceiveEvent); - bluetooth.BLE.stopBLEScan(); - done(); ->>>>>>> 38f2b81935e5260f075cb7d6702ead0bffa7af8a }) -- GitLab