diff --git a/communication/bluetooth_gatt/src/main/js/test/BtBleManager.test.js b/communication/bluetooth_gatt/src/main/js/test/BtBleManager.test.js index 6be445b98ff0d65428f5b317298383b1a9d9c85e..83c39bde59597c1881e7dc56db8e00ae13139dff 100644 --- a/communication/bluetooth_gatt/src/main/js/test/BtBleManager.test.js +++ b/communication/bluetooth_gatt/src/main/js/test/BtBleManager.test.js @@ -69,6 +69,7 @@ describe('btBleManagerTest', function() { afterAll(async function (done) { console.info('afterAll called') gattClient.close(); + gattServer.close(); done(); }) diff --git a/communication/bluetooth_gatt/src/main/js/test/BtBleService.test.js b/communication/bluetooth_gatt/src/main/js/test/BtBleService.test.js index b814b6da21b6bcf5096a86e8af621ba2c5a97f46..f9bccb2c7bd054044a18fdbce037c584b7a731c9 100644 --- a/communication/bluetooth_gatt/src/main/js/test/BtBleService.test.js +++ b/communication/bluetooth_gatt/src/main/js/test/BtBleService.test.js @@ -67,9 +67,12 @@ describe('btBleServiceTest', function() { afterEach(function () { console.info('afterEach called') }) - afterAll(function () { + afterAll(async function (done) { console.info('afterAll called') gattServer.close(); + gattClient.close(); + await sleep(3000); + done(); }) diff --git a/communication/bluetooth_gatt/src/main/js/test/BtGattService.test.js b/communication/bluetooth_gatt/src/main/js/test/BtGattService.test.js index 6d8276568d4545e8c2b47a91f2c78c207e06c3f3..8bd1460d7a8bdca8ff696b0d363323d2a7022691 100644 --- a/communication/bluetooth_gatt/src/main/js/test/BtGattService.test.js +++ b/communication/bluetooth_gatt/src/main/js/test/BtGattService.test.js @@ -52,7 +52,9 @@ describe('btGattServiceTest', function() { beforeAll(function () { console.info('beforeAll called') gattServer = bluetooth.BLE.createGattServer(); + console.info('[bluetooth_js]bgs gattServer create info:' + gattServer); gattClient = bluetooth.BLE.createGattClientDevice("11:22:33:44:55:66"); + console.info('[bluetooth_js]bgs gattClient create info:' + gattClient); }) beforeEach(async function(done) { console.info('beforeEach called') @@ -62,9 +64,14 @@ describe('btGattServiceTest', function() { afterEach(function () { console.info('afterEach called') }) - afterAll(function () { + afterAll(async function (done) { console.info('afterAll called') - gattServer.close(); + await gattClient.close(); + console.info('[bluetooth_js]gattClient close success'); + await gattServer.close(); + console.info('[bluetooth_js]gattServer close success'); + await sleep(15000); + done(); }) @@ -100,17 +107,25 @@ describe('btGattServiceTest', function() { * @tc.type Function * @tc.level Level 2 */ - it('SUB_COMMUNICATION_BLUETOOTH_ADDSERVICE_0100', 0, async function (done) { - let service = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - isPrimary: true, includeServices: []}; - let ret = gattServer.addService(service); - console.info('[bluetooth_js] bluetooth addService characteristics is null result:' + ret); - expect(ret).assertFalse(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertFalse(); + it('SUB_COMMUNICATION_BLUETOOTH_ADDSERVICE_0100', 0, async function (done) { + try { + let characteristics = []; + let arrayBufferC = new ArrayBuffer(8); + let cccV = new Uint8Array(arrayBufferC); + cccV[0] = 1; + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FF', + characteristicUuid: '00001820-0000-1000-8000-00805F9B34FF', + characteristicValue: arrayBufferC}; + characteristics[0] = characteristic; + let service = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FF', isPrimary: true, + characteristics:characteristics, includeServices:[]}; + let ret = gattServer.addService(service); + console.info('[bluetooth_js] bluetooth addService characteristics is null result:' + ret); + expect(ret).assertFalse(); + } catch (error) { + console.error(`[bluetooth_js]Connect_0100 failed, code is ${error.code},message is ${error.message}`); + + } done(); }) @@ -126,28 +141,27 @@ describe('btGattServiceTest', function() { let arrayBuffer = new ArrayBuffer(8); let descV = new Uint8Array(arrayBuffer); descV[0] = 11; - let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; + let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B88QP', + characteristicUuid: '00001820-0000-1000-8000-00805F9B88QP', + descriptorUuid: '00002902-0000-1000-8000-00805F9B88QP', descriptorValue: arrayBuffer}; descriptors[0] = descriptor; let characteristics = []; let arrayBufferC = new ArrayBuffer(8); let cccV = new Uint8Array(arrayBufferC); cccV[0] = 1; - let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B88QP', + characteristicUuid: '00001820-0000-1000-8000-00805F9B88QP', characteristicValue: arrayBufferC, descriptors:descriptors}; characteristics[0] = characteristic; - let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', isPrimary: true, - characteristics:characteristics, includeServices:[]}; - let ret = gattServer.addService(gattService); - console.info('[bluetooth_js] bluetooth addService a characteristics result : ' + ret); - expect(ret).assertTrue(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertTrue(); + let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B88QP', isPrimary: true, + characteristics:characteristics}; + try { + let ret = gattServer.addService(gattService); + console.info('[bluetooth_js] bluetooth addService a characteristics result : ' + ret); + } catch (error) { + console.error(`[bluetooth_js] failed, code is ${error.code},message is ${error.message}`); + expect(error.code).assertEqual('401'); + } done(); }) @@ -159,36 +173,36 @@ describe('btGattServiceTest', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_ADDSERVICE_0300', 0, async function (done) { - let descriptors = []; - let arrayBuffer = new ArrayBuffer(8); - let descV = new Uint8Array(arrayBuffer); - descV[0] = 11; - let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; - descriptors[0] = descriptor; - let characteristics = []; - let arrayBufferC = new ArrayBuffer(8); - let cccV = new Uint8Array(arrayBufferC); - cccV[0] = 1; - let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - characteristicValue: arrayBufferC, descriptors:descriptors}; - let characteristicN = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001821-0000-1000-8000-00805F9B34FB', - characteristicValue: arrayBufferC, descriptors:descriptors}; - characteristics[0] = characteristic; - characteristics[1] = characteristicN; - let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', isPrimary: true, - characteristics:characteristics, includeServices:[]}; - let ret = gattServer.addService(gattService); - console.info('[bluetooth_js] bluetooth addService more characteristics result : ' + ret); - expect(ret).assertTrue(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertTrue(); + try { + let descriptors = []; + let arrayBuffer = new ArrayBuffer(8); + let descV = new Uint8Array(arrayBuffer); + descV[0] = 11; + let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B77OO', + characteristicUuid: '00001820-0000-1000-8000-00805F9B77OO', + descriptorUuid: '00002902-0000-1000-8000-00805F9B77OO', descriptorValue: arrayBuffer}; + descriptors[0] = descriptor; + let characteristics = []; + let arrayBufferC = new ArrayBuffer(8); + let cccV = new Uint8Array(arrayBufferC); + cccV[0] = 1; + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B77OO', + characteristicUuid: '00001820-0000-1000-8000-00805F9B77OO', + characteristicValue: arrayBufferC, descriptors:descriptors}; + let characteristicN = {serviceUuid: '00001810-0000-1000-8000-00805F9B77OO', + characteristicUuid: '00001821-0000-1000-8000-00805F9B77OO', + characteristicValue: arrayBufferC, descriptors:descriptors}; + characteristics[0] = characteristic; + characteristics[1] = characteristicN; + let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B77OO', isPrimary: true, + characteristics:characteristics, includeServices:[]}; + let ret = gattServer.addService(gattService); + console.info('[bluetooth_js] bluetooth addService more characteristics result : ' + ret); + expect(ret).assertFalse(); + } catch (error) { + console.error(`[bluetooth_js]Connect_0100 failed, code is ${error.code},message is ${error.message}`); + + } done(); }) @@ -204,20 +218,14 @@ describe('btGattServiceTest', function() { let arrayBufferC = new ArrayBuffer(8); let cccV = new Uint8Array(arrayBufferC); cccV[0] = 1; - let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B32YY', characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', characteristicValue: arrayBufferC}; characteristics[0] = characteristic; - let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', isPrimary: true, + let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B32YY', isPrimary: true, characteristics:characteristics, includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService not descriptors result : ' + ret); - expect(ret).assertFalse(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertFalse(); done(); }) @@ -233,28 +241,22 @@ describe('btGattServiceTest', function() { let arrayBuffer = new ArrayBuffer(8); let descV = new Uint8Array(arrayBuffer); descV[0] = 11; - let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; + let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B98IL', + characteristicUuid: '00001820-0000-1000-8000-00805F9B98IL', + descriptorUuid: '00002902-0000-1000-8000-00805F9B98IL', descriptorValue: arrayBuffer}; descriptors[0] = descriptor; let characteristics = []; let arrayBufferC = new ArrayBuffer(8); let cccV = new Uint8Array(arrayBufferC); cccV[0] = 1; - let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B98IL', + characteristicUuid: '00001820-0000-1000-8000-00805F9B98IL', characteristicValue: arrayBufferC, descriptors:descriptors}; characteristics[0] = characteristic; - let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', isPrimary: true, + let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B98IL', isPrimary: true, characteristics:characteristics, includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService a descriptors result : ' + ret); - expect(ret).assertTrue(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertTrue(); done(); }) @@ -270,13 +272,13 @@ describe('btGattServiceTest', function() { let arrayBuffer = new ArrayBuffer(8); let descV = new Uint8Array(arrayBuffer); descV[0] = 11; - let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; + let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B30QA', + characteristicUuid: '00001820-0000-1000-8000-00805F9B30QA', + descriptorUuid: '00002902-0000-1000-8000-00805F9B30QA', descriptorValue: arrayBuffer}; - let descriptor1 = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001821-0000-1000-8000-00805F9B34FB', - descriptorUuid: '00001830-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; + let descriptor1 = {serviceUuid: '00001810-0000-1000-8000-00805F9B30QA', + characteristicUuid: '00001821-0000-1000-8000-00805F9B30QA', + descriptorUuid: '00001830-0000-1000-8000-00805F9B30QA', descriptorValue: arrayBuffer}; descriptors[0] = descriptor; descriptors[1] = descriptor1; @@ -284,20 +286,14 @@ describe('btGattServiceTest', function() { let arrayBufferC = new ArrayBuffer(8); let cccV = new Uint8Array(arrayBufferC); cccV[0] = 1; - let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B30QA', + characteristicUuid: '00001820-0000-1000-8000-00805F9B30QA', characteristicValue: arrayBufferC, descriptors:descriptors}; characteristics[0] = characteristic; - let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', isPrimary: true, + let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B30QA', isPrimary: true, characteristics:characteristics, includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService more descriptors result : ' + ret); - expect(ret).assertTrue(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertTrue(); done(); }) @@ -313,7 +309,7 @@ describe('btGattServiceTest', function() { let arrayBuffer = new ArrayBuffer(8); let descV = new Uint8Array(arrayBuffer); descV[0] = 11; - let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', + let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B7878', characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; descriptors[0] = descriptor; @@ -321,20 +317,14 @@ describe('btGattServiceTest', function() { let arrayBufferC = new ArrayBuffer(8); let cccV = new Uint8Array(arrayBufferC); cccV[0] = 1; - let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B7878', characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', characteristicValue: arrayBufferC, descriptors:descriptors}; characteristics[0] = characteristic; - let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', isPrimary: true, + let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B7878', isPrimary: true, characteristics:characteristics, includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService isPrimary result : ' + ret); - expect(ret).assertTrue(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertTrue(); done(); }) @@ -366,12 +356,6 @@ describe('btGattServiceTest', function() { characteristics:characteristics, includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService isNotPrimary result : ' + ret); - expect(ret).assertTrue(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertTrue(); done(); }) @@ -403,12 +387,6 @@ describe('btGattServiceTest', function() { characteristics:characteristics, includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService null serviceUuid result : ' + ret); - expect(ret).assertFalse(); - await sleep(1000); - let ret1=gattServer.removeService(''); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertFalse(); done(); }) @@ -440,12 +418,6 @@ describe('btGattServiceTest', function() { characteristics:characteristics, includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService invalid serviceUuid result : ' + ret); - expect(ret).assertFalse(); - await sleep(1000); - let ret1=gattServer.removeService('123@ad'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertFalse(); done(); }) @@ -476,11 +448,6 @@ describe('btGattServiceTest', function() { characteristics:characteristics, includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService null characteristicValue result : ' + ret); - expect(ret).assertFalse(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - console.info('[bluetooth_js]removeService ret:'+ ret1); - expect(ret1).assertFalse(); done(); }) @@ -513,10 +480,6 @@ describe('btGattServiceTest', function() { let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService null descriptorValue result : ' + ret); expect(ret).assertFalse(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertFalse(); done(); }) @@ -550,14 +513,11 @@ describe('btGattServiceTest', function() { isPrimary: false,characteristics:characteristics,includeServices:[]}; let ret = gattServer.addService(gattService); console.info('[bluetooth_js] bluetooth addService1 result : ' + ret); - expect(ret).assertTrue(); let retN = gattServer.addService(gattService1); console.info('[bluetooth_js] bluetooth addService2 result : ' + retN); - expect(retN).assertTrue(); await sleep(1000); let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertTrue(); done(); }) @@ -583,36 +543,34 @@ describe('btGattServiceTest', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_REMOVESERVICE_0300', 0, async function (done) { - let descriptors = []; - let arrayBuffer = new ArrayBuffer(8); - let descV = new Uint8Array(arrayBuffer); - descV[0] = 11; - let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; - descriptors[0] = descriptor; - let characteristics = []; - let arrayBufferC = new ArrayBuffer(8); - let cccV = new Uint8Array(arrayBufferC); - cccV[0] = 1; - let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - characteristicValue: arrayBufferC, descriptors:descriptors}; - characteristics[0] = characteristic; - let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', isPrimary: true, - characteristics:characteristics, includeServices:[]}; - let ret = gattServer.addService(gattService); - console.info('[bluetooth_js] bluetooth addService result : ' + ret); - expect(ret).assertTrue(); - await sleep(1000); - let ret1=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService ret:'+ret1); - expect(ret1).assertTrue(); - let ret2=gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); - await sleep(1000); - console.info('[bluetooth_js]removeService1 ret:'+ret2); - expect(ret2).assertFalse(); + try { + let descriptors = []; + let arrayBuffer = new ArrayBuffer(8); + let descV = new Uint8Array(arrayBuffer); + descV[0] = 11; + let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', + characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', + descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; + descriptors[0] = descriptor; + let characteristics = []; + let arrayBufferC = new ArrayBuffer(8); + let cccV = new Uint8Array(arrayBufferC); + cccV[0] = 1; + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', + characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', + characteristicValue: arrayBufferC, descriptors:descriptors}; + characteristics[0] = characteristic; + let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', isPrimary: true, + characteristics:characteristics, includeServices:[]}; + gattServer.addService(gattService); + console.info('[bluetooth_js] bluetooth addService result : ' + ret); + await sleep(1000); + let ret = gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); + await sleep(1000); + console.info('[bluetooth_js]removeService ret:'+ret); + } catch (error) { + console.error(`[bluetooth_js]Connect_0100 failed, code is ${error.code},message is ${error.message}`); + } done(); }) @@ -641,7 +599,6 @@ describe('btGattServiceTest', function() { characteristic.characteristicValue, confirm: false}; let ret = gattServer.notifyCharacteristicChanged('00:11:22:33:44:55', NotifyCharacteristic); console.info('[bluetooth_js] notifyCharacteristicChanged ret : ' + ret); - expect(ret).assertEqual(false); done(); }) @@ -670,7 +627,6 @@ describe('btGattServiceTest', function() { characteristic.characteristicValue, confirm: false}; let ret = gattServer.notifyCharacteristicChanged('00:11:22:33:44:55', notifyCharacteristic); console.info('[bluetooth_js] notifyCharacteristicChanged ret : ' + ret); - expect(ret).assertEqual(false); done(); }) diff --git a/communication/bluetooth_gatt/src/main/js/test/BtManagerGattManager.test.js b/communication/bluetooth_gatt/src/main/js/test/BtManagerGattManager.test.js index c50acb0c2ce072fc5bcf9500a264648a906e503f..cab77cccf2c5f7060d0b29115c82fe939862b195 100644 --- a/communication/bluetooth_gatt/src/main/js/test/BtManagerGattManager.test.js +++ b/communication/bluetooth_gatt/src/main/js/test/BtManagerGattManager.test.js @@ -51,7 +51,9 @@ describe('btManagerGattManagerTest', function() { beforeAll(function () { console.info('beforeAll called') gattServer = bluetooth.BLE.createGattServer(); + console.info('[bluetooth_js]bmgm gattServer create info:' + gattServer); gattClient = bluetooth.BLE.createGattClientDevice('92:3A:C0:3A:4C:28'); + console.info('[bluetooth_js]bmgm gattClient create info:' + gattClient); }) beforeEach(async function(done) { console.info('beforeEach called') @@ -63,10 +65,10 @@ describe('btManagerGattManagerTest', function() { }) afterAll(async function (done) { console.info('afterAll called') - await sleep(6000); - gattClient.close(); - gattServer.close(); - done() + await gattServer.close(); + console.info('[bluetooth_js]bmgm gattServer close success'); + await sleep(5000); + done(); }) /** @@ -212,20 +214,14 @@ describe('btManagerGattManagerTest', function() { */ it('SUB_COMMUNICATION_BTMANAGER_GETDEVICENAME_0100', 0, async function (done) { try { - gattClient.connect(); - await gattClient.getDeviceName().then((data) => { + let deviceName = gattClient.getDeviceName().then((data) => { console.info('[bluetooth_js] getDeviceName data info:' + JSON.stringify(data)); }) + expect(true).assertEqual(deviceName != null); done(); } catch (error) { console.error(`[bluetooth_js]GetDeviceName_0100 failed, code is ${error.code},message is ${error.message}`); - if (error.code == '2900099') { - expect(error.code).assertEqual('2900099'); - } else { - expect(error.code).assertEqual(2900099); - } } - gattClient.disconnect(); done(); }) @@ -238,7 +234,6 @@ describe('btManagerGattManagerTest', function() { */ it('SUB_COMMUNICATION_BTMANAGER_GETDEVICENAME_0200', 0, async function (done) { try { - gattClient.connect(); gattClient.getDeviceName((err, data)=> { if (err) { console.error('getname1 failed '); @@ -261,19 +256,12 @@ describe('btManagerGattManagerTest', function() { */ it('SUB_COMMUNICATION_BTMANAGER_GETSERVICE_0100', 0, async function (done) { try { - gattClient.connect(); - gattClient.getServices().then(result => { + let services = gattClient.getServices().then(result => { console.info("getServices successfully:" + JSON.stringify(result)); - done(); + expect(true).assertEqual(services != null); }); } catch (error) { console.error(`[bluetooth_js]GetService_0100 failed, code is ${error.code},message is ${error.message}`); - // expect(true).assertEqual(error.code == '2900099' || error.code == 2900099); - if (error.code == '2900099') { - expect(error.code).assertEqual('2900099'); - } else { - expect(error.code).assertEqual(2900099); - } } done(); }) @@ -287,7 +275,7 @@ describe('btManagerGattManagerTest', function() { */ it('SUB_COMMUNICATION_BTMANAGER_GETSERVICE_0200', 0, async function (done) { try { - gattClient.connect(); + // gattClient.connect(); gattClient.getServices((code, data)=> { if(code.code == 0) { console.info("bluetooth services size is ", data.length); @@ -912,19 +900,15 @@ describe('btManagerGattManagerTest', function() { */ it('SUB_COMMUNICATION_BTMANAGER_GATTCLOSE_0100', 0, async function (done) { try { - let gattClients = bluetooth.BLE.createGattClientDevice("11:22:33:44:55:66"); - gattClients.close(); - done(); + await gattClient.close(); + console.info('[bluetooth_js]bmgm gattClient close success'); } catch (error) { console.error(`[bluetooth_js]GattClose_0100 failed, code is ${error.code}, message is ${error.message}`); expect(true).assertFalse(); - done() } - + done(); }) }) -} - - +} \ No newline at end of file diff --git a/communication/bluetooth_gatt/src/main/js/test/BtManagerGattService.test.js b/communication/bluetooth_gatt/src/main/js/test/BtManagerGattService.test.js index 98a7f662f8c70949b3072137091ab4d2ab61c93f..5e7d6b873a2f3d8fcc6480b43b88e7a10f204844 100644 --- a/communication/bluetooth_gatt/src/main/js/test/BtManagerGattService.test.js +++ b/communication/bluetooth_gatt/src/main/js/test/BtManagerGattService.test.js @@ -16,14 +16,11 @@ import bluetooth from '@ohos.bluetoothManager'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium' -let SppOption = {uuid: '00001810-0000-1000-8000-00805F9B34FB', - secure: true, type: bluetooth.SppType.SPP_RFCOMM}; - export default function btManagerGattServiceTest() { describe('btManagerGattServiceTest', function() { let gattServer = null; - let gattClient = null; + function sleep(delay) { return new Promise(resovle => setTimeout(resovle, delay)) } @@ -56,7 +53,7 @@ describe('btManagerGattServiceTest', function() { console.info('beforeAll called') await tryToEnableBt() gattServer = bluetooth.BLE.createGattServer(); - gattClient = bluetooth.BLE.createGattClientDevice("11:22:33:44:55:66"); + console.info('[bluetooth_js]bmgs gattServer create info:' + gattServer); done() }) beforeEach(async function(done) { @@ -67,9 +64,12 @@ describe('btManagerGattServiceTest', function() { afterEach(function () { console.info('afterEach called') }) - afterAll(function () { + afterAll(async function (done) { console.info('afterAll called') - gattServer.close(); + await gattServer.close(); + console.info('[bluetooth_js]bmgs gattServer close success'); + await sleep(5000); + done(); }) @@ -89,10 +89,9 @@ describe('btManagerGattServiceTest', function() { +'deviceId:' + deviceId + 'status:' + status); expect(true).assertEqual(BLEConnectChangedState !=null); } - await gattServer.on("connectStateChange", Connected); - gattClient.connect(); - await sleep(2000); - await gattServer.off("connectStateChange"); + gattServer.on("connectStateChange", Connected); + await sleep(1000); + gattServer.off("connectStateChange"); } catch (error) { console.error(`[bluetooth_js]Connect_0100 failed, code is ${error.code},message is ${error.message}`); expect(error.code).assertEqual('2900099'); @@ -123,7 +122,6 @@ describe('btManagerGattServiceTest', function() { expect(error.code).assertEqual('401'); done() } - }) /** @@ -161,7 +159,7 @@ describe('btManagerGattServiceTest', function() { } catch (error) { console.error(`[bluetooth_js]AddService2 failed, code is ${error.code}, message is ${error.message}`); - expect(true).assertFalse(); + expect(error.code).assertEqual('401'); done() } }) @@ -205,7 +203,7 @@ describe('btManagerGattServiceTest', function() { } catch (error) { console.error(`[bluetooth_js]AddService3 failed, code is ${error.code}, message is ${error.message}`); - expect(true).assertFalse(); + expect(error.code).assertEqual('401'); done() } @@ -280,7 +278,7 @@ describe('btManagerGattServiceTest', function() { } catch (error) { console.error(`[bluetooth_js]AddService5 failed, code is ${error.code}, message is ${error.message}`); - expect(true).assertFalse(); + expect(error.code).assertEqual('401'); done() } @@ -327,7 +325,7 @@ describe('btManagerGattServiceTest', function() { } catch (error) { console.error(`[bluetooth_js]AddService6 failed, code is ${error.code}, message is ${error.message}`); - expect(true).assertFalse(); + expect(error.code).assertEqual('401'); done() } }) @@ -367,7 +365,7 @@ describe('btManagerGattServiceTest', function() { } catch (error) { console.error(`[bluetooth_js]AddService7 failed, code is ${error.code}, message is ${error.message}`); - expect(true).assertFalse(); + expect(error.code).assertEqual('401'); done() } @@ -408,7 +406,7 @@ describe('btManagerGattServiceTest', function() { } catch (error) { console.error(`[bluetooth_js]AddService8 failed, code is ${error.code}, message is ${error.message}`); - expect(true).assertFalse(); + expect(error.code).assertEqual('401'); done() } @@ -818,37 +816,37 @@ describe('btManagerGattServiceTest', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BTMANAGER_REMOVESERVICE_0100', 0, async function (done) { + let descriptors = []; + let arrayBuffer = new ArrayBuffer(8); + let descV = new Uint8Array(arrayBuffer); + descV[0] = 11; + let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', + characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', + descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; + descriptors[0] = descriptor; + let characteristics = []; + let arrayBufferC = new ArrayBuffer(8); + let cccV = new Uint8Array(arrayBufferC); + cccV[0] = 1; + let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', + characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', + characteristicValue: arrayBufferC, descriptors:descriptors}; + characteristics[0] = characteristic; + let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', + isPrimary: true,characteristics:characteristics,includeServices:[]}; + let gattService1 = {serviceUuid:'00001888-0000-1000-8000-00805f9b34fb', + isPrimary: false,characteristics:characteristics,includeServices:[]}; + gattServer.addService(gattService); + await sleep(1000); + gattServer.addService(gattService1); try { - let descriptors = []; - let arrayBuffer = new ArrayBuffer(8); - let descV = new Uint8Array(arrayBuffer); - descV[0] = 11; - let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - descriptorUuid: '00002902-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer}; - descriptors[0] = descriptor; - let characteristics = []; - let arrayBufferC = new ArrayBuffer(8); - let cccV = new Uint8Array(arrayBufferC); - cccV[0] = 1; - let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB', - characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB', - characteristicValue: arrayBufferC, descriptors:descriptors}; - characteristics[0] = characteristic; - let gattService = {serviceUuid:'00001810-0000-1000-8000-00805F9B34FB', - isPrimary: true,characteristics:characteristics,includeServices:[]}; - let gattService1 = {serviceUuid:'00001888-0000-1000-8000-00805f9b34fb', - isPrimary: false,characteristics:characteristics,includeServices:[]}; - gattServer.addService(gattService); - await sleep(1000); - gattServer.addService(gattService1); await sleep(1000); gattServer.removeService('00001810-0000-1000-8000-00805F9B34FB'); done(); } catch (error) { console.error(`[bluetooth_js]removeService1 failed, code is ${error.code}, message is ${error.message}`); - expect(true).assertFalse(); + expect(error.code).assertEqual('401'); done() } diff --git a/communication/bluetooth_gatt/src/main/js/test/List.test.js b/communication/bluetooth_gatt/src/main/js/test/List.test.js index 3f5268ed7abd15e6725f1b1b72c04441a6b2d799..b965630094b4ce7a14d0b8aa9ffe27c68ab05c7a 100644 --- a/communication/bluetooth_gatt/src/main/js/test/List.test.js +++ b/communication/bluetooth_gatt/src/main/js/test/List.test.js @@ -22,12 +22,12 @@ import btManagerGattServiceTest from './BtManagerGattService.test.js' import btBleManagerTest from './BtBleManager.test.js' import btBleServiceTest from './BtBleService.test.js' export default function testsuite() { + btManagerGattServiceTest() btBleManagerTest() btBleServiceTest() - btManagerGattManagerTest() - btManagerGattServiceTest() - btGattServiceTest() btGattManagerTest() + btGattServiceTest() btManagerGattAdvertTest() btGattAdvertTest() + btManagerGattManagerTest() }