From e6790c677fe4e992a8d4cc7427aec285db432796 Mon Sep 17 00:00:00 2001 From: q00313334 Date: Tue, 24 May 2022 18:29:37 +0800 Subject: [PATCH] quanli125@huawei.com Signed-off-by: q00313334 --- .../src/main/js/default/pages/index/index.js | 7 ++++--- .../main/js/default/test/BluetoothBle.test.js | 18 ------------------ .../src/main/js/default/pages/index/index.js | 7 ++++--- .../src/main/js/default/pages/index/index.js | 7 ++++--- .../src/main/js/default/pages/index/index.js | 11 ++++++----- .../src/main/js/default/pages/index/index.js | 9 +++++---- .../src/main/js/default/pages/index/index.js | 7 ++++--- 7 files changed, 27 insertions(+), 39 deletions(-) diff --git a/communication/bluetooth_ble/src/main/js/default/pages/index/index.js b/communication/bluetooth_ble/src/main/js/default/pages/index/index.js index 1e1c2e8fb..062ae450f 100644 --- a/communication/bluetooth_ble/src/main/js/default/pages/index/index.js +++ b/communication/bluetooth_ble/src/main/js/default/pages/index/index.js @@ -26,9 +26,6 @@ export default { }, onShow() { console.info('onShow finish') - }, - onReady() { - console.info('onReady finish') const core = Core.getInstance() const expectExtend = new ExpectExtend({ 'id': 'extend' @@ -43,6 +40,10 @@ export default { require('../../test/List.test') core.execute() + + }, + onReady() { + console.info('onReady finish') }, } diff --git a/communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js b/communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js index 2bac077d4..4e8afec46 100644 --- a/communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js +++ b/communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js @@ -126,24 +126,6 @@ describe('bluetoothhostTest', function() { }) - /** - * @tc.number SUB_COMMUNACATION_bluetoothble_CREATE_GATT_SERVER_0001 - * @tc.name testCreateGattServer - * @tc.desc Test CreateGattServer api . - * @tc.size MEDIUM - * @tc.type Function - * @tc.level Level 2 - */ - it('SUB_COMMUNACATION_bluetoothble_CREATE_GATT_SERVER_0001', 0, async function (done) { - console.info('[bluetooth_js] createGattServer test start ...'); - await tryToEnableBt(); - let result = bluetooth.BLE.createGattServer(); - let resultLength = Object.keys(result).length; - console.info("[bluetooth_js] createGattServer:" + JSON.stringify(result) + "length:" + resultLength); - expect(resultLength).assertEqual(1); - done(); - }) - /** * @tc.number SUB_COMMUNACATION_bluetooth_START_ADVERTISING_0001 diff --git a/communication/bluetooth_on/src/main/js/default/pages/index/index.js b/communication/bluetooth_on/src/main/js/default/pages/index/index.js index b51283e8d..a8dddf999 100644 --- a/communication/bluetooth_on/src/main/js/default/pages/index/index.js +++ b/communication/bluetooth_on/src/main/js/default/pages/index/index.js @@ -25,9 +25,6 @@ export default { }, onShow() { console.info('onShow finish') - }, - onReady() { - console.info('onReady finish') const core = Core.getInstance() const expectExtend = new ExpectExtend({ 'id': 'extend' @@ -42,6 +39,10 @@ export default { require('../../test/List.test') core.execute() + + }, + onReady() { + console.info('onReady finish') }, } diff --git a/communication/bluetooth_profile/src/main/js/default/pages/index/index.js b/communication/bluetooth_profile/src/main/js/default/pages/index/index.js index 59a617c21..0eea3ac7f 100644 --- a/communication/bluetooth_profile/src/main/js/default/pages/index/index.js +++ b/communication/bluetooth_profile/src/main/js/default/pages/index/index.js @@ -26,9 +26,6 @@ export default { }, onShow() { console.info('onShow finish') - }, - onReady() { - console.info('onReady finish') const core = Core.getInstance() const expectExtend = new ExpectExtend({ 'id': 'extend' @@ -43,6 +40,10 @@ export default { require('../../test/List.test') core.execute() + + }, + onReady() { + console.info('onReady finish') }, } diff --git a/communication/bluetooth_standard/src/main/js/default/pages/index/index.js b/communication/bluetooth_standard/src/main/js/default/pages/index/index.js index bf314e06f..062ae450f 100644 --- a/communication/bluetooth_standard/src/main/js/default/pages/index/index.js +++ b/communication/bluetooth_standard/src/main/js/default/pages/index/index.js @@ -26,9 +26,6 @@ export default { }, onShow() { console.info('onShow finish') - }, - onReady() { - console.info('onReady finish') const core = Core.getInstance() const expectExtend = new ExpectExtend({ 'id': 'extend' @@ -37,12 +34,16 @@ export default { core.init() const configService = core.getDefaultService('config') - this.timeout = this.myTimeout - configService.setConfig(this) + this.timeout = this.myTimeout + configService.setConfig(this) require('../../test/List.test') core.execute() + + }, + onReady() { + console.info('onReady finish') }, } diff --git a/communication/wifi_p2p/src/main/js/default/pages/index/index.js b/communication/wifi_p2p/src/main/js/default/pages/index/index.js index a1554d173..12b48cb9f 100644 --- a/communication/wifi_p2p/src/main/js/default/pages/index/index.js +++ b/communication/wifi_p2p/src/main/js/default/pages/index/index.js @@ -27,9 +27,6 @@ export default { }, onShow() { console.info('onShow finish') - }, - onReady() { - console.info('onReady finish') const core = Core.getInstance() const expectExtend = new ExpectExtend({ 'id': 'extend' @@ -38,13 +35,17 @@ export default { core.init() const configService = core.getDefaultService('config') - + this.timeout = this.myTimeout configService.setConfig(this) require('../../test/List.test') core.execute() + + }, + onReady() { + console.info('onReady finish') }, } diff --git a/communication/wifi_standard/src/main/js/default/pages/index/index.js b/communication/wifi_standard/src/main/js/default/pages/index/index.js index b74a408c5..458bc80ae 100755 --- a/communication/wifi_standard/src/main/js/default/pages/index/index.js +++ b/communication/wifi_standard/src/main/js/default/pages/index/index.js @@ -25,9 +25,6 @@ export default { }, onShow() { console.info('onShow finish') - }, - onReady() { - console.info('onReady finish') const core = Core.getInstance() const expectExtend = new ExpectExtend({ 'id': 'extend' @@ -42,6 +39,10 @@ export default { require('../../test/List.test') core.execute() + + }, + onReady() { + console.info('onReady finish') }, } -- GitLab