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 7e8201116b6b40e3298d3f4cf23ba94db0f53e97..1a45f559d6c46e22cf91f5794ab661b3c87308bd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -17,7 +17,6 @@ import bluetooth from '@ohos.bluetooth';
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 
 
-
 var SppType = {
     SPP_RFCOMM : 0
 }
@@ -48,10 +47,7 @@ describe('bluetoothhostTest', function() {
     beforeAll(function () {
         console.info('beforeAll called')
         gattServer = bluetooth.BLE.createGattServer();
-        console.info('[bluetooth_js] gattServer beforeAll is:' + JSON.stringify(gattServer));
-
         gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
-        console.info('[bluetooth_js] GattClientDevice beforeAll is:' + JSON.stringify(gattClient));
     })
     beforeEach(function () {
         console.info('beforeEach called')
@@ -68,27 +64,18 @@ describe('bluetoothhostTest', function() {
         return new Promise(resovle => setTimeout(resovle, delay))
     }
 
-
-    /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_ENABLE_0001
-     * @tc.name testEnableBluetooth
-     * @tc.desc Test EnableBluetooth api by promise.
-     * @tc.author quanli 00313334
-     * @tc.size MEDIUM
-     * @tc.type Function
-     * @tc.level Level 2
-     */
-    it('bluetooth_classic_enable_bluetooth_001', 0, async function (done) {
-        console.info('[bluetooth_js] enable start');
+    async function tryToEnableBt() {
         var sta = bluetooth.getState();
         switch(sta){
             case 0:
                 var enable = bluetooth.enableBluetooth();
-                console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
-                expect(enable).assertEqual(true);
+                expect(enable).assertTrue();
+                await sleep(3000);
                 break;
             case 1:
+                expect(JSON.stringify(sta)).assertTrue(1);
                 console.info('[bluetooth_js] bt turning on:'+ JSON.stringify(sta));
+                await sleep(3000);
                 break;
             case 2:
                 console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
@@ -96,11 +83,25 @@ describe('bluetoothhostTest', function() {
             case 3:
                 var enable = bluetooth.enableBluetooth();
                 console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                await sleep(3000);
                 break;
             default:
                 console.info('[bluetooth_js] enable success');
-            }
-        await sleep(3000);
+        }
+    }
+
+    /**
+     * @tc.number SUB_COMMUNACATION_bluetooth_ENABLE_0001
+     * @tc.name testEnableBluetooth
+     * @tc.desc Test EnableBluetooth api by promise.
+     * @tc.author zhangyujie zwx1079266
+     * @tc.size MEDIUM
+     * @tc.type Function
+     * @tc.level Level 2
+     */
+    it('SUB_COMMUNACATION_bluetooth_ENABLE_0001', 0, async function (done) {
+        console.info('[bluetooth_js] enable start');
+        await tryToEnableBt();
         var state = bluetooth.getState();
         console.info('[bluetooth_js] getState On = '+ JSON.stringify(state));
         expect(state).assertEqual(2);
@@ -109,7 +110,7 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetoothble_DEVICE_JS_GET_CONNECTED_BLEDEVICES_0001
+     * @tc.number SUB_COMMUNACATION_bluetoothble_GET_CONNECTED_BLEDEVICES_0001
      * @tc.name testGetConnectedBLEDevices
      * @tc.desc Test getConnectedBLEDevices api .
      * @tc.author zhangyujie zwx1079266
@@ -117,18 +118,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_getConnectedBLEDevices_test_001', 0, function () {
+    it('SUB_COMMUNACATION_bluetoothble_GET_CONNECTED_BLEDEVICES_0001', 0, async function (done) {
         console.info('[bluetooth_js] getConnectedBLEDevices test start ...');
+        await tryToEnableBt();
         var result = bluetooth.BLE.getConnectedBLEDevices();
-        console.info("[bluetooth_js] getConnectedBLEDevices:" + JSON.stringify(result));
-        console.info("[bluetooth_js] getConnectedBLEDevices length:" + result.length);
+        console.info("[bluetooth_js] getConnDev:" + JSON.stringify(result)+ "length:" +result.length);
         expect(result.length).assertEqual(0);
-        console.info('[bluetooth_js] getConnectedBLEDevices end');
+        done();
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetoothble_DEVICE_JS_CREATE_GATT_SERVER_0002
+     * @tc.number SUB_COMMUNACATION_bluetoothble_CREATE_GATT_SERVER_0001
      * @tc.name testCreateGattServer
      * @tc.desc Test CreateGattServer api .
      * @tc.author zhangyujie zwx1079266
@@ -136,68 +137,68 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_createGattServer_test_001', 0, function () {
+    it('SUB_COMMUNACATION_bluetoothble_CREATE_GATT_SERVER_0001', 0, async function (done) {
         console.info('[bluetooth_js] createGattServer test start ...');
+        await tryToEnableBt();
         var result = bluetooth.BLE.createGattServer();
-        console.info("[bluetooth_js] createGattServer:" + JSON.stringify(result));
         var resultLength = Object.keys(result).length;
-        console.info("[bluetooth_js] createGattServer length:" + resultLength);
+        console.info("[bluetooth_js] createGattServer:" + JSON.stringify(result) + "length:" + resultLength);
         expect(resultLength).assertEqual(1);
-        console.info('[bluetooth_js] createGattServer end');
+        done();
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_START_ADVERTISING_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_START_ADVERTISING_0001
      * @tc.name testStartAdvertising
      * @tc.desc Test StartAdvertising api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_ble_start_advertising', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_START_ADVERTISING_0001', 0, async function (done) {
         console.info('[bluetooth_js] BLE advertising start');
+        await tryToEnableBt();
         var manufactureValueBuffer = new Uint8Array(4);
         manufactureValueBuffer[0] = 1;
         manufactureValueBuffer[1] = 2;
         manufactureValueBuffer[2] = 3;
         manufactureValueBuffer[3] = 4;
-
         var serviceValueBuffer = new Uint8Array(4);
         serviceValueBuffer[0] = 4;
         serviceValueBuffer[1] = 6;
         serviceValueBuffer[2] = 7;
         serviceValueBuffer[3] = 8;
-        console.info('manufactureValueBuffer = '+ JSON.stringify(manufactureValueBuffer))
-        console.info('serviceValueBuffer = '+ JSON.stringify(serviceValueBuffer))
         let promise = new Promise((resolve) => {
-        var gattServer = bluetooth.BLE.createGattServer()
-            gattServer.startAdvertising({
+            var gattServer = bluetooth.BLE.createGattServer()
+            var start = gattServer.startAdvertising({
                 interval:150,
                 txPower:60,
                 connectable:true,
             },{
                 serviceUuids:["12"],
                 manufactureData:[{
-                    manufactureId:4567,
-                    manufactureValue:manufactureValueBuffer.buffer
-                }],
+                                     manufactureId:4567,
+                                     manufactureValue:manufactureValueBuffer.buffer
+                                 }],
                 serviceData:[{
-                    serviceUuid:"1234",
-                    serviceValue:serviceValueBuffer.buffer
-                }],
+                                 serviceUuid:"1234",
+                                 serviceValue:serviceValueBuffer.buffer
+                             }],
             },{
                 serviceUuids:["12"],
                 manufactureData:[{
-                    manufactureId:1789,
-                    manufactureValue:manufactureValueBuffer.buffer
-                }],
+                                     manufactureId:1789,
+                                     manufactureValue:manufactureValueBuffer.buffer
+                                 }],
                 serviceData:[{
-                    serviceUuid:"1794",
-                    serviceValue:serviceValueBuffer.buffer
-                }],
+                                 serviceUuid:"1794",
+                                 serviceValue:serviceValueBuffer.buffer
+                             }],
             });
+            console.info('[bluetooth_js] startAdv res: ' + JSON.stringify(start));
+            expect(start).assertNull();
             resolve()
         })
         await promise.then(done)
@@ -205,78 +206,59 @@ describe('bluetoothhostTest', function() {
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_STOP_ADVERTISING_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_STOP_ADVERTISING_0001
      * @tc.name testStopAdvertising
      * @tc.desc Test StopAdvertising api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_ble_stop_advertising', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_STOP_ADVERTISING_0001', 0, async function (done) {
         console.info('[bluetooth_js] BLE stop advertising start');
+        await tryToEnableBt();
         var gattServer = bluetooth.BLE.createGattServer();
-        gattServer.stopAdvertising();
-        console.info('[bluetooth_js] BLE stop advertising end');
+        var stop = gattServer.stopAdvertising();
+        expect(stop).assertNull();
+        done();
     })
 
-
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_CONNRCT_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_CONNRCT_0001
      * @tc.name testConnect
      * @tc.desc Test Connect api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_connect', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_CONNRCT_0001', 0, async function (done) {
         console.info('[bluetooth_js] gatt connect start');
+        await tryToEnableBt();
         gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
         let ret = gattClient.connect();
-        console.info('[bluetooth_js] gatt connect ret : ' + ret);
-        expect(ret).assertEqual(true);
-        console.info('[bluetooth_js] gatt connect end');
+        expect(ret).assertTrue();
+        done();
     })
 
-    /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_DEVICE_NAME_PROMISE_0001
-     * @tc.name testGetDeviceName
-     * @tc.desc Test GetDeviceName api by promise.
-     * @tc.author quanli 00313334
-     * @tc.size MEDIUM
-     * @tc.type Function
-     * @tc.level Level 2
-     */
-    it('bluetooth_ble_get_device_name_promise', 0, async function (done) {
-        console.info('BLE get device name promise start');
-        var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
-        await gattClient.getDeviceName().then((data) => {
-            console.info('[bluetooth_js] device name' + JSON.stringify(data))
-            done();
-        })
-        console.info('BLE get device name promise end')
-    })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_RSSI_VALUE_CALLBACK
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_RSSI_VALUE_CALLBACK
      * @tc.name testGetRssiValue
      * @tc.desc Test GetRssiValue api by callback.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_ble_read_rssi', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_GET_RSSI_VALUE_CALLBACK', 0, async function (done) {
         console.info('[bluetooth_js] BLE get rssi1 start');
+        await tryToEnableBt();
         let promise = new Promise((resolve) => {
             var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
             gattClient.getRssiValue((err, data)=> {
-                console.info('[bluetooth_js] rssi err:' + JSON.stringify(err));
-                console.info('[bluetooth_js] rssi value:' + JSON.stringify(data));
+                console.info('[bluetooth_js] rssi err:' + JSON.stringify(err)+'value:'+JSON.stringify(data));
                 expect(data).assertNull();
-                console.info('[bluetooth_js] BLE read rssi1 end');
-                done();
             });
             resolve()
         })
@@ -286,34 +268,30 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_RSSI_VALUE_PROMISE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_RSSI_VALUE_PROMISE_0001
      * @tc.name testGetRssiValue
      * @tc.desc Test GetRssiValue api by promise.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_ble_read_rssi_promise', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_GET_RSSI_VALUE_PROMISE_0001', 0, async function (done) {
         console.info('[bluetooth_js] BLE get rssi start');
+        await tryToEnableBt();
         let promise = new Promise((resolve) => {
             var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
             gattClient.getRssiValue().then((data) => {
                 if (data != null) {
-                    console.info('[bluetooth_js] rssi' + JSON.stringify(data));
-                    done();
                     expect(true).assertEqual(true);
                 } else {
                     console.info('[bluetooth_js] BLE read rssi ' + JSON.stringify(data));
                     var rssiLength = Object.keys(data).length;
-                    console.info("[bluetooth_js] ble rssi_length -> " + rssiLength);
                     expect(rssiLength).assertEqual(0);
-                    done();
                 }
             }).catch(err => {
                 console.error(`bluetooth getRssiValue has error: ${err}`);
                 expect(true).assertEqual(true);
-                done();
             });
             resolve()
         })
@@ -323,44 +301,68 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_GETSERVICES_CALLBACK_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_DEVICE_NAME_PROMISE_0001
+     * @tc.name testGetDeviceName
+     * @tc.desc Test GetDeviceName api by promise.
+     * @tc.author zhangyujie zwx1079266
+     * @tc.size MEDIUM
+     * @tc.type Function
+     * @tc.level Level 2
+     */
+    it('SUB_COMMUNACATION_bluetooth_GET_DEVICE_NAME_PROMISE_0001', 0, async function (done) {
+        console.info('[bluetooth_js] BLE get device name promise start');
+        await tryToEnableBt();
+        let promise = new Promise((resolve) => {
+            var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
+            gattClient.getDeviceName().then((data) => {
+                console.info('[bluetooth_js] device name' + JSON.stringify(data))
+                expect(data).assertNull();
+                done();
+            })
+            resolve()
+        })
+        await promise.then(done)
+        done();
+    })
+
+    /**
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_GETSERVICES_CALLBACK_0001
      * @tc.name testGetServices
      * @tc.desc Test GetServices api by callback.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_ble_get_services_callback_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_GATT_GETSERVICES_CALLBACK_0001', 0, async function (done) {
         console.info('[bluetooth_js] getServices callback start');
+        await tryToEnableBt();
         var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
         gattClient.getServices((err, data)=> {
-            console.info('[bluetooth_js] device name err1 ' + JSON.stringify(err));
-            console.info('[bluetooth_js] device name1' + JSON.stringify(data));
+            console.info('[bluetooth_js] device name err1 ' + JSON.stringify(err) +'name1' + JSON.stringify(data));
+            expect(true).assertEqual(err.code == -1);
             done();
         })
-        console.info('[bluetooth_js] getServices callback end');
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_GETSERVICES_PROMISE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_GETSERVICES_PROMISE_0001
      * @tc.name testGetServices
      * @tc.desc Test GetServices api by promise.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_getServices_promise', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_GATT_GETSERVICES_PROMISE_0001', 0, async function (done) {
         console.info('[bluetooth_js] getServices promise start');
+        await tryToEnableBt();
         var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
         await gattClient.getServices().then((object) => {
             if (object != null) {
-                console.info('[bluetooth_js] getServices is null');
                 expect(true).assertEqual(true);
             } else {
-                console.info('[bluetooth_js] getServices is successfully');
-                console.info('[bluetooth_js] getServices data:' + JSON.stringify(object));
+                console.info('[bluetooth_js] getServices successfully:'+JSON.stringify(object));
                 expect(null).assertFail();
             }
             done();
@@ -372,41 +374,34 @@ describe('bluetoothhostTest', function() {
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_READ_CHARA_VALUE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_READ_CHARA_VALUE_0001
      * @tc.name testReadCharacteristicValue
      * @tc.desc Test ReadCharacteristicValue api by promise.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_readCharacteristicValue', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_GATT_READ_CHARA_VALUE_0001', 0, async function (done) {
         console.info('[bluetooth_js] readCharacteristicValue start');
-
+        await tryToEnableBt();
         let descriptors = [];
         let arrayBuffer = new ArrayBuffer(8);
         let desValue =  new Uint8Array(arrayBuffer);
         desValue[0] = 11;
-
         let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB',
             descriptorUuid: '00001830-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer};
         descriptors[0] = descriptor;
-
         let arrayBufferCCC = new ArrayBuffer(8);
         let cccValue = new Uint8Array(arrayBufferCCC);
         cccValue[0] = 32;
         let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB',
             characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB',
             characteristicValue: arrayBufferCCC, descriptors:descriptors};
-        for (var key in characteristic ){
-            console.info('[bluetooth_js] readCharValue:' +characteristic[key]);
-        }
         gattClient.readCharacteristicValue(characteristic).then((object) => {
             if (object != null) {
-                console.info('[bluetooth_js] bluetooth BLECharacteristic is null');
                 expect(true).assertEqual(true);
             } else {
-                console.info('[bluetooth_js] BLECharacteristic uuid is successfully');
                 console.info('[bluetooth_js] readCharacValue data:' + JSON.stringify(data));
                 expect(null).assertFail();
             }
@@ -419,16 +414,17 @@ describe('bluetoothhostTest', function() {
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_READ_DESCRI_VALUE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_READ_DESCRI_VALUE_0001
      * @tc.name testReadDescriptorValue
      * @tc.desc Test ReadDescriptorValue api by promise.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_readDescriptorValue', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_GATT_READ_DESCRI_VALUE_0001', 0, async function (done) {
         console.info('[bluetooth_js] readDescriptorValue start');
+        await tryToEnableBt();
         let arrayBuffer = new ArrayBuffer(8);
         let desValue =  new Uint8Array(arrayBuffer);
         desValue[0] = 11;
@@ -436,10 +432,8 @@ describe('bluetoothhostTest', function() {
             descriptorUuid: '00001830-0000-1000-8000-00805F9B34FB', descriptorValue: arrayBuffer};
         gattClient.readDescriptorValue(descriptor).then((object) => {
             if (object != null) {
-                console.info('[bluetooth_js] BLEDescriptor is null');
                 expect(true).assertEqual(true);
             } else {
-                console.info('[bluetooth_js] BLEDescriptor uuid is successfully');
                 console.info('[bluetooth_js] BLEDescriptor data:' + JSON.stringify(object));
                 expect(null).assertFail();
             }
@@ -452,16 +446,17 @@ describe('bluetoothhostTest', function() {
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_WRITE_CHARACT_VALUE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_WRITE_CHARACT_VALUE_0001
      * @tc.name testWriteCharacteristicValue
      * @tc.desc Test WriteCharacteristicValue api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_writeCharacteristicValue', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_WRITE_CHARACT_VALUE_0001', 0, async function (done) {
         console.info('[bluetooth_js] writeCharacteristicValue start');
+        await tryToEnableBt();
         let descriptors = [];
         let arrayBuffer = new ArrayBuffer(8);
         let desValue =  new Uint8Array(arrayBuffer);
@@ -475,27 +470,24 @@ describe('bluetoothhostTest', function() {
         let characteristic = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB',
             characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB',
             characteristicValue: arrayBufferCCC, descriptors:descriptors};
-        for (var key in characteristic ){
-            console.info('[bluetooth_js] writeCharValue:' +characteristic[key]);
-        }
-
         let ret = gattClient.writeCharacteristicValue(characteristic);
-        console.info('[bluetooth_js] bluetooth writeCharacteristicValue ret : ' + ret);
+        console.info('[bluetooth_js] writeCharacteristicValue ret : ' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] writeCharacteristicValue end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_WRITE_DESC_VALUE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_WRITE_DESC_VALUE_0001
      * @tc.name testWriteDescriptorValue
      * @tc.desc Test WriteDescriptorValue api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_writeDescriptorValue', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_WRITE_DESC_VALUE_0001', 0, async function (done) {
         console.info('[bluetooth_js] writeDescriptorValue start');
+        await tryToEnableBt();
         let arrayBuffer = new ArrayBuffer(8);
         let desValue =  new Uint8Array(arrayBuffer);
         desValue[0] = 11;
@@ -504,37 +496,39 @@ describe('bluetoothhostTest', function() {
         let ret = gattClient.writeDescriptorValue(descriptor);
         console.info('[bluetooth_js] bluetooth writeDescriptorValue ret : ' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] writeDescriptorValue end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_SET_BLE_MTUSIZE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_SET_BLE_MTUSIZE_0001
      * @tc.name testSetBLEMtuSize
      * @tc.desc Test SetBLEMtuSize api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_setBLEMtuSize', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_SET_BLE_MTUSIZE_0001', 0, async function (done) {
         console.info('[bluetooth_js] setBLEMtuSize start');
+        await tryToEnableBt();
         let ret = gattClient.setBLEMtuSize(128);
-        console.info('[bluetooth_js] bluetooth setBLEMtuSize ret : ' + ret);
+        console.info('[bluetooth_js] bluetooth setBLEMtuSize ret:' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] setBLEMtuSize end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_SET_NOTIFY_CHARA_CHANGED_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_SET_NOTIFY_CHARA_CHANGED_0001
      * @tc.name testSetNotifyCharacteristicChanged
      * @tc.desc Test SetNotifyCharacteristicChanged api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_setNotifyCharacteristicChanged', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_SET_NOTIFY_CHARA_CHANGED_0001', 0, async function (done) {
         console.info('[bluetooth_js] setNotifyCharacteristicChanged start');
+        await tryToEnableBt();
         let descriptors = [];
         let arrayBuffer = new ArrayBuffer(8);
         let desValue =  new Uint8Array(arrayBuffer);
@@ -559,33 +553,31 @@ describe('bluetoothhostTest', function() {
         let ret = gattClient.setNotifyCharacteristicChanged(characteristic, false);
         console.info('[bluetooth_js] setNotifyCharacteristicChanged ret:' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] setNotifyCharacteristicChanged end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_ADD_SERVICE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_ADD_SERVICE_0001
      * @tc.name testAddService
      * @tc.desc Test AddService api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_addService', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_ADD_SERVICE_0001', 0, async function (done) {
         console.info('[bluetooth_js] addService start');
+        await tryToEnableBt();
         gattServer = bluetooth.BLE.createGattServer();
-
         let descriptors = [];
         let arrayBuffer = new ArrayBuffer(8);
         let desValue =  new Uint8Array(arrayBuffer);
         desValue[0] = 11;
-
         let descriptor = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB',
             characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB',
             descriptorUuid: '00001830-0000-1000-8000-00805F9B34FB',
             descriptorValue: arrayBuffer};
         descriptors[0] = descriptor;
-
         let characteristics = [];
         let arrayBufferCCC = new ArrayBuffer(8);
         let cccValue = new Uint8Array(arrayBufferCCC);
@@ -594,47 +586,45 @@ describe('bluetoothhostTest', function() {
             characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB',
             characteristicValue: arrayBufferCCC, descriptors:descriptors};
         characteristics[0] = characteristic;
-
         let service = {serviceUuid: '00001810-0000-1000-8000-00805F9B34FB',
             isPrimary: true, characteristics: characteristics, includeServices: []};
-        for (var key in service ){
-            console.info('[bluetooth_js] addService:' +service[key]);
-        }
         let ret = gattServer.addService(service);
         console.info('[bluetooth_js] bluetooth addService ret : ' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] addService end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_REMOVE_SERVICE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_REMOVE_SERVICE_0001
      * @tc.name testRemoveService
      * @tc.desc Test RemoveService api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_removeService', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_REMOVE_SERVICE_0001', 0, async function (done) {
         console.info('[bluetooth_js] removeService start');
+        await tryToEnableBt();
         gattServer = bluetooth.BLE.createGattServer();
         let ret = gattServer.removeService('00001810-0000-1000-8000-008000000000');
         console.info('[bluetooth_js] removeService ret : ' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] removeService end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_NOTIFY_CHARA_CHANGED_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_NOTIFY_CHARA_CHANGED_0001
      * @tc.name testNotifyCharacteristicChanged
      * @tc.desc Test NotifyCharacteristicChanged api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_notifyCharacteristicChanged', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_NOTIFY_CHARA_CHANGED_0001', 0, async function (done) {
         console.info('[bluetooth_js] notifyCharacteristicChanged start');
+        await tryToEnableBt();
         let descriptors = [];
         let arrayBufferDesc = new ArrayBuffer(8);
         let desValue =  new Uint8Array(arrayBufferDesc);
@@ -650,7 +640,6 @@ describe('bluetoothhostTest', function() {
             descriptorValue: descNotifyValue};
         descriptors[0] = descriptor;
         descriptors[1] = descriptorNotify;
-
         let arrayBufferCCC = new ArrayBuffer(8);
         let cccValue = new Uint8Array(arrayBufferCCC);
         cccValue[0] = 1;
@@ -658,43 +647,39 @@ describe('bluetoothhostTest', function() {
             characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB',
             characteristicValue: cccValue,
             descriptors:descriptors,confirm:'false'};
-        for (var key in characteristic ){
-            console.info('[bluetooth_js] notifyCharChanged:' + characteristic[key]);
-        }
         let ret = gattServer.notifyCharacteristicChanged('00:00:00:00:00:00', characteristic);
         console.info('[bluetooth_js] notifyCharacteristicChanged ret : ' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] notifyCharacteristicChanged end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_SEND_RESPONSE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_SEND_RESPONSE_0001
      * @tc.name testSendResponse
      * @tc.desc Test SendResponse api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_sendResponse', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_SEND_RESPONSE_0001', 0, async function (done) {
         console.info('[bluetooth_js] sendResponse start');
+        await tryToEnableBt();
         let arrayBuffer = new ArrayBuffer(8);
         let value =  new Uint8Array(arrayBuffer);
         value[0] = 1;
         let serverResponse = {deviceId: '00:00:00:00:00', transId: 1,
             status: 0, offset: 0, value: arrayBuffer};
-        for (var key in serverResponse ){
-            console.info('[bluetooth_js] serverResponse:'+ serverResponse[key]);
-        }
         let ret = gattServer.sendResponse(serverResponse);
         console.info('[bluetooth_js] sendResponse ret : ' + ret);
+
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] sendResponse end');
+        done();
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetoothble_DEVICE_JS_BLE_PERIPHERA_MANAGER_CLOSE_0001
+     * @tc.number SUB_COMMUNACATION_bluetoothble_GATTSERVER_CLOSE_0001
      * @tc.name testBlePeripheralManagerClose
      * @tc.desc Test BlePeripheralManagerClose api .
      * @tc.author zhangyujie zwx1079266
@@ -702,42 +687,40 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetoothble_gattserver_close_test_001', 0, function () {
+    it('SUB_COMMUNACATION_bluetoothble_GATTSERVER_CLOSE_0001', 0, async function (done) {
         console.info('[bluetooth_js] GattserverClose test start ...');
-        if (gattServer == null) {
-            console.info("[bluetooth_js] GattserverClose: please CreateGattServer first!");
-        }
-        console.info('[bluetooth_js] gattclose_server is:' + JSON.stringify(gattServer));
+        await tryToEnableBt();
         try{
             var result = gattServer.close();
             console.info("[bluetooth_js] GattserverClose res:"+ JSON.stringify(result));
             expect(result).assertTrue();
-            console.info("[bluetooth_js] GattserverClose end.");
         }catch(error){
             console.info("[bluetooth_js] GattserverClose err:" + JSON.stringify(error));
             expect(null).assertFail();
         }
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_DISCONNRCT_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_DISCONNRCT_0001
      * @tc.name testDisConnect
      * @tc.desc Test DisConnect api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gatt_disconnect', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_DISCONNRCT_0001', 0, async function (done) {
         console.info('[bluetooth_js] gatt disconnect start');
+        await tryToEnableBt();
         let ret = gattClient.disconnect();
         console.info('[bluetooth_js] gatt disconnect ret:' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] gatt disconnect end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GATT_CLIENT_CLOSE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GATT_CLIENT_CLOSE_0001
      * @tc.name testGattClientClose
      * @tc.desc Test GattClientClose api .
      * @tc.author zhangyujie zwx1079266
@@ -745,22 +728,19 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_gattclient_close_test_001', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GATT_CLIENT_CLOSE_0001', 0, async function (done) {
         console.info('[bluetooth_js] GattclientClose test start ...');
-        if (gattClient == null) {
-            console.info("[bluetooth_js] GattclientClose: please CreateGatt first!");
-        }
-        console.info('[bluetooth_js] gattClient is:' + JSON.stringify(gattServer));
+        await tryToEnableBt();
         try{
             var result = gattClient.close();
-            console.info("[bluetooth_js] GattclientClose result: " + result);
-            console.info("[bluetooth_js] GattclientClose json_result:" + JSON.stringify(result));
+            console.info("[bluetooth_js] GattclientClose result:" + JSON.stringify(result));
             expect(result).assertTrue();
-            console.info("[bluetooth_js] GattclientClose end.");
         }catch(error){
             console.info("[bluetooth_js] GattclientClose err:" + JSON.stringify(error));
             expect(null).assertFail();
         }
+        done();
     })
 
 })
+
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 519953d4842d5d908108347f807b8123f99c4279..80022a2439451822ea7a802a3f29da362fb41d41 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
@@ -16,7 +16,95 @@
 import bluetooth from '@ohos.bluetooth';
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 
-
+var MajorMinorClass = {
+    COMPUTER_UNCATEGORIZED : 0x0100,
+    COMPUTER_DESKTOP : 0x0104,
+    COMPUTER_SERVER : 0x0108,
+    COMPUTER_LAPTOP : 0x010C,
+    COMPUTER_HANDHELD_PC_PDA : 0x0110,
+    COMPUTER_PALM_SIZE_PC_PDA : 0x0114,
+    COMPUTER_WEARABLE : 0x0118,
+    COMPUTER_TABLET : 0x011C,
+    PHONE_UNCATEGORIZED : 0x0200,
+    PHONE_CELLULAR : 0x0204,
+    PHONE_CORDLESS : 0x0208,
+    PHONE_SMART : 0x020C,
+    PHONE_MODEM_OR_GATEWAY : 0x0210,
+    PHONE_ISDN : 0x0214,
+    NETWORK_FULLY_AVAILABLE : 0x0300,
+    NETWORK_1_TO_17_UTILIZED : 0x0320,
+    NETWORK_17_TO_33_UTILIZED : 0x0340,
+    NETWORK_33_TO_50_UTILIZED : 0x0360,
+    NETWORK_60_TO_67_UTILIZED : 0x0380,
+    NETWORK_67_TO_83_UTILIZED : 0x03A0,
+    NETWORK_83_TO_99_UTILIZED : 0x03C0,
+    NETWORK_NO_SERVICE : 0x03E0,
+    AUDIO_VIDEO_UNCATEGORIZED : 0x0400,
+    AUDIO_VIDEO_WEARABLE_HEADSET : 0x0404,
+    AUDIO_VIDEO_HANDSFREE : 0x0408,
+    AUDIO_VIDEO_MICROPHONE : 0x0410,
+    AUDIO_VIDEO_LOUDSPEAKER : 0x0414,
+    AUDIO_VIDEO_HEADPHONES : 0x0418,
+    AUDIO_VIDEO_PORTABLE_AUDIO : 0x041C,
+    AUDIO_VIDEO_CAR_AUDIO : 0x0420,
+    AUDIO_VIDEO_SET_TOP_BOX : 0x0424,
+    AUDIO_VIDEO_HIFI_AUDIO : 0x0428,
+    AUDIO_VIDEO_VCR : 0x042C,
+    AUDIO_VIDEO_VIDEO_CAMERA : 0x0430,
+    AUDIO_VIDEO_CAMCORDER : 0x0434,
+    AUDIO_VIDEO_VIDEO_MONITOR : 0x0438,
+    AUDIO_VIDEO_VIDEO_DISPLAY_AND_LOUDSPEAKER : 0x043C,
+    AUDIO_VIDEO_VIDEO_CONFERENCING : 0x0440,
+    AUDIO_VIDEO_VIDEO_GAMING_TOY : 0x0448,
+    PERIPHERAL_NON_KEYBOARD_NON_POINTING : 0x0500,
+    PERIPHERAL_KEYBOARD : 0x0540,
+    PERIPHERAL_POINTING_DEVICE : 0x0580,
+    PERIPHERAL_KEYBOARD_POINTING : 0x05C0,
+    PERIPHERAL_UNCATEGORIZED : 0x0500,
+    PERIPHERAL_JOYSTICK : 0x0504,
+    PERIPHERAL_GAMEPAD : 0x0508,
+    PERIPHERAL_REMOTE_CONTROL : 0x05C0,
+    PERIPHERAL_SENSING_DEVICE : 0x0510,
+    PERIPHERAL_DIGITIZER_TABLET : 0x0514,
+    PERIPHERAL_CARD_READER : 0x0518,
+    PERIPHERAL_DIGITAL_PEN : 0x051C,
+    PERIPHERAL_SCANNER_RFID : 0x0520,
+    PERIPHERAL_GESTURAL_INPUT : 0x0522,
+    IMAGING_UNCATEGORIZED : 0x0600,
+    IMAGING_DISPLAY : 0x0610,
+    IMAGING_CAMERA : 0x0620,
+    IMAGING_SCANNER : 0x0640,
+    IMAGING_PRINTER : 0x0680,
+    WEARABLE_UNCATEGORIZED : 0x0700,
+    WEARABLE_WRIST_WATCH : 0x0704,
+    WEARABLE_PAGER : 0x0708,
+    WEARABLE_JACKET : 0x070C,
+    WEARABLE_HELMET : 0x0710,
+    WEARABLE_GLASSES : 0x0714,
+    TOY_UNCATEGORIZED : 0x0800,
+    TOY_ROBOT : 0x0804,
+    TOY_VEHICLE : 0x0808,
+    TOY_DOLL_ACTION_FIGURE : 0x080C,
+    TOY_CONTROLLER : 0x0810,
+    TOY_GAME : 0x0814,
+    HEALTH_UNCATEGORIZED : 0x0900,
+    HEALTH_BLOOD_PRESSURE : 0x0904,
+    HEALTH_THERMOMETER : 0x0908,
+    HEALTH_WEIGHING : 0x090C,
+    HEALTH_GLUCOSE : 0x0910,
+    HEALTH_PULSE_OXIMETER : 0x0914,
+    HEALTH_PULSE_RATE : 0x0918,
+    HEALTH_DATA_DISPLAY : 0x091C,
+    HEALTH_STEP_COUNTER : 0x0920,
+    HEALTH_BODY_COMPOSITION_ANALYZER : 0x0924,
+    HEALTH_PEAK_FLOW_MOITOR : 0x0928,
+    HEALTH_MEDICATION_MONITOR : 0x092C,
+    HEALTH_KNEE_PROSTHESIS : 0x0930,
+    HEALTH_ANKLE_PROSTHESIS : 0x0934,
+    HEALTH_GENERIC_HEALTH_MANAGER : 0x0938,
+    HEALTH_PERSONAL_MOBILITY_DEVICE : 0x093C,
+    HEALTH_PERSONAL_MOBILITY_DEVICE : 0x093C
+};
 
 describe('bluetoothhostTest', function() {
 
@@ -25,10 +113,7 @@ describe('bluetoothhostTest', function() {
     beforeAll(function () {
         console.info('beforeAll called')
         gattServer = bluetooth.BLE.createGattServer();
-        console.info('[bluetooth_js] gattServer beforeAll is:' + JSON.stringify(gattServer));
-
         gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00");
-        console.info('[bluetooth_js] GattClientDevice beforeAll is:' + JSON.stringify(gattClient));
     })
     beforeEach(function () {
         console.info('beforeEach called')
@@ -45,36 +130,17 @@ describe('bluetoothhostTest', function() {
         return new Promise(resovle => setTimeout(resovle, delay))
     }
 
-
-    /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_ENABLE_0001
-     * @tc.name testEnableBluetooth
-     * @tc.desc Test EnableBluetooth api by promise.
-     * @tc.author quanli 00313334
-     * @tc.size MEDIUM
-     * @tc.type Function
-     * @tc.level Level 2
-     */
-    it('bluetooth_classic_enable_bluetooth_001', 0, async function (done) {
-        console.info('[bluetooth_js] enable start');
-        console.info('[bluetooth_js] enable register');
-        await bluetooth.on("stateChange", onReceiveEvent);
-        function onReceiveEvent(data) {
-            console.info('[bluetooth_js] enable data = '+ JSON.stringify(data));
-            if (data == bluetooth.BluetoothState.STATE_ON) {
-                console.info('enable bluetooth');
-                done();
-            }
-        }
+    async function tryToEnableBt() {
         var sta = bluetooth.getState();
         switch(sta){
             case 0:
                 var enable = bluetooth.enableBluetooth();
                 console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
-                expect(enable).assertEqual(true);
+                await sleep(3000);
                 break;
             case 1:
                 console.info('[bluetooth_js] bt turning on:'+ JSON.stringify(sta));
+                await sleep(3000);
                 break;
             case 2:
                 console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
@@ -82,68 +148,81 @@ describe('bluetoothhostTest', function() {
             case 3:
                 var enable = bluetooth.enableBluetooth();
                 console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                await sleep(3000);
                 break;
             default:
                 console.info('[bluetooth_js] enable success');
+        }
+    }
+
+    /**
+     * @tc.number SUB_COMMUNACATION_bluetooth_ENABLE_0001
+     * @tc.name testEnableBluetooth
+     * @tc.desc Test EnableBluetooth api by promise.
+     * @tc.author zhangyujie zwx1079266
+     * @tc.size MEDIUM
+     * @tc.type Function
+     * @tc.level Level 2
+     */
+    it('SUB_COMMUNACATION_bluetooth_ENABLE_0001', 0, async function (done) {
+        console.info('[bluetooth_js] enable start');
+        await bluetooth.on("stateChange", onReceiveEvent);
+        function onReceiveEvent(data) {
+            if (data == bluetooth.BluetoothState.STATE_ON) {
+                console.info('enable bluetooth');
+                done();
             }
-        await sleep(3000);
+        }
+        await tryToEnableBt();
         var state = bluetooth.getState();
-        console.info('[bluetooth_js] getState On = '+ JSON.stringify(state));
         expect(state).assertEqual(2);
         await bluetooth.off('stateChange', result => {
-            console.info("stateChange off:" + JSON.stringify(result));
             expect(true).assertEqual(result ==null);
             done();
         });
-        console.info('bluetooth enable done');
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_START_BLUETOOTH_DISCOVERY_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_START_BLUETOOTH_DISCOVERY_0001
      * @tc.name testClassicStartBluetoothDiscovery
      * @tc.desc Test ClassicStartBluetoothDiscovery api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_start_discovery', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_START_BLUETOOTH_DISCOVERY_0001', 0, async function (done) {
         console.info('[bluetooth_js] discovery start');
+        await tryToEnableBt();
         await bluetooth.on("bluetoothDeviceFind", onReceiveEvent)
-        console.info('[bluetooth_js] DeviceFind register');
         function onReceiveEvent(data) {
-            console.info('[bluetooth_js] start discovery bluetoothDeviceFind '+ JSON.stringify(data))
-            console.info("[bluetooth_js] bluetooth discovery length -> " + data.length);
+            console.info('[bluetooth_js] Device' + JSON.stringify(data)+ 'length' + data.length)
             expect(data.length).assertLarger(0);
             done();
         }
         await bluetooth.startBluetoothDiscovery();
-
         await bluetooth.off('bluetoothDeviceFind', result => {
             console.info("[bluetooth_js] bluetoothDeviceFind off:" + JSON.stringify(result));
             expect(true).assertEqual(result ==null);
             done();
         });
-        console.info('[bluetooth_js] discovery end');
         done();
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_START_BLESCAN_WITHOUT_PARAM_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_START_BLESCAN_WITHOUT_PARAM_0001
      * @tc.name testClassicStartBLEScan
      * @tc.desc Test ClassicStartBLEScan api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_ble_start_scan_without_param_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_START_BLESCAN_WITHOUT_PARAM_0001', 0, async function (done) {
         console.info('[bluetooth_js] BLE scan start without scan options start');
-        var state = bluetooth.getState();
-        console.info('[bluetooth_js] getState On1 = '+ JSON.stringify(state));
-
+        await tryToEnableBt();
         let promise = new Promise((resolve) => {
             bluetooth.BLE.on("BLEDeviceFind", onReceiveEvent)
             function onReceiveEvent(data) {
@@ -168,16 +247,17 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_PAIR_DEVICE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_PAIR_DEVICE_0001
      * @tc.name testClassicPairDevice
      * @tc.desc Test ClassicPairDevice api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_pair_device_0001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_PAIR_DEVICE_0001', 0, async function (done) {
         console.info('[bluetooth_js] pair device start');
+        await tryToEnableBt();
         await bluetooth.BLE.on('pinRequired', result => {
             console.info("[bluetooth_js] pinRequired on:" + JSON.stringify(result));
             bluetooth.setDevicePairingConfirmation(result,false);
@@ -193,70 +273,63 @@ describe('bluetoothhostTest', function() {
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_PAIR_DEVICE_0002
+     * @tc.number SUB_COMMUNACATION_bluetooth_PAIR_DEVICE_0002
      * @tc.name testClassicPairDevice
      * @tc.desc Test ClassicPairDevice api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_pair_device_0002', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_PAIR_DEVICE_0002', 0, async function (done) {
         console.info('[bluetooth_js] pair device start');
+        await tryToEnableBt();
         await bluetooth.BLE.on('bondStateChange', result => {
-            console.info("[bluetooth_js] bondStateChange on:" + JSON.stringify(result));
-            console.info('[bluetooth_js] bondStateChange deviceId: ' + data.deviceId);
-            console.info('[bluetooth_js] bondStateChange state: ' + data.state);
+            console.info("[bluetooth_js] bondStateChange on:" + JSON.stringify(result)
+            +'bondStateChange deviceId:' + data.deviceId + 'bondStateChange state:' +  data.state);
             expect(true).assertEqual(result !=null);
             done();
         });
         var enable = bluetooth.pairDevice("00:00:00:00:00:00")
+        expect(bluetooth.BondState.BOND_STATE_INVALID == 0).assertTrue();
+        expect(bluetooth.BondState.BOND_STATE_BONDING == 1).assertTrue();
+        expect(bluetooth.BondState.BOND_STATE_BONDED == 2).assertTrue();
         bluetooth.BLE.off('bondStateChange', result => {
-            console.info("[bluetooth_js] bondStateChange off:" + JSON.stringify(result));
             expect(true).assertEqual(result ==null);
             done();
         });
-        console.info('[bluetooth_js]INVALID' + JSON.stringify(bluetooth.BondState.BOND_STATE_INVALID));
-        console.info('[bluetooth_js]BONDING' + JSON.stringify(bluetooth.BondState.BOND_STATE_BONDING));
-        console.info('[bluetooth_js]BONDED' + JSON.stringify(bluetooth.BondState.BOND_STATE_BONDED));
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SPP_LISTEN_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SPP_LISTEN_0001
      * @tc.name testSppListen
      * @tc.desc Test SppListen api by callback.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_spp_listen', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_SPP_LISTEN_0001', 0, async function (done) {
         console.log("[bluetooth_js]: spp listen start");
+        await tryToEnableBt();
         let sppOption = {uuid: '00001810-0000-1000-8000-00805F9B34FB',
             secure: false, type: 0};
-        for (var key in sppOption ){
-            console.info('[bluetooth_js] sppListen:'+ sppOption[key]);
-        }
         bluetooth.sppListen('server1', sppOption, function(code, serverSocketNumber) {
+            console.info('[bluetooth_js] code is: ' + code.code);
             if (code.code == 0) {
-                console.info('[bluetooth_js] code is success');
-                console.info('[bluetooth_js] code is: ' + code.code);
                 expect(true).assertEqual(true);
                 done();
             } else {
-                console.info('[bluetooth_js] code is failed');
-                console.info('[bluetooth_js] code is: ' + code.code);
                 expect(true).assertEqual(false);
                 done();
             }
         });
-        console.log("[bluetooth_js] spp listen end");
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetoothble_DEVICE_JS_CHARAC_READ_ON_0001
+     * @tc.number SUB_COMMUNACATION_bluetoothble_CHARAC_READ_ON_0001
      * @tc.name testonCharacteristicReadOn
      * @tc.desc Test CharacteristicReadOn api .
      * @tc.author zhangyujie zwx1079266
@@ -264,19 +337,14 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetoothble_CharacteristicReadOn_test_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetoothble_CHARAC_READ_ON_0001', 0, async function (done) {
         try {
+            await tryToEnableBt();
             console.info('[bluetooth_js] CharacteristicReadOn test start');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] : click onCreateGattServer first!");
-            }
             await gattServer.on('characteristicRead', function (data) {
-                console.info('[bluetooth_js] charRead callback data ->');
-                console.info('[bluetooth_js] CharRedReq deviceId: ' + data.deviceId);
-                console.info('[bluetooth_js] CharRedReq transId: ' + data.transId);
-                console.info('[bluetooth_js] CharRedReq offset: ' + data.offset);
-                console.info('[bluetooth_js] CharRedReq charUuid: ' + data.characteristicUuid);
-                console.info('[bluetooth_js] CharRedReq serviceUuid: ' + data.serviceUuid);
+                console.info('[bluetooth_js] CharRedReq deviceId: ' + data.deviceId +
+                'transId:' + data.transId + 'offset:' + data.offset + 'charUuid:' +
+                data.characteristicUuid + 'serviceUuid:' + data.serviceUuid);
                 var serverResponse = {
                     "deviceId": data.deviceId,
                     "transId": data.transId,
@@ -285,9 +353,7 @@ describe('bluetoothhostTest', function() {
                     "value": str2ab("characteristic read response", data.offset),
                 };
                 var result = gattServer.sendResponse(serverResponse);
-                console.info("[bluetooth_js] sendResponse  -> " + JSON.stringify(result));
                 expect(JSON.stringify(result)).assertContain("true");
-                console.info("[bluetooth_js] onBlePeripheralManagerClose .");
             });
         }catch(e) {
             expect(null).assertFail();
@@ -295,12 +361,8 @@ describe('bluetoothhostTest', function() {
 
         try {
             console.info('[bluetooth_js] characteristicRead test1 start');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] :plese CreateGattServer first!");
-            }
             await gattServer.off('characteristicRead', function (data) {
-                console.info("[bluetooth_js] charaRead off jsdata1:" + JSON.stringify(data));
-                console.info("[bluetooth_js] charaRead off data1:" + data);
+                console.info("[bluetooth_js] charaRead off data:" + JSON.stringify(data));
                 expect(true).assertEqual(data ==null);
             });
         }catch(e) {
@@ -310,7 +372,7 @@ describe('bluetoothhostTest', function() {
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetoothble_DEVICE_JS_CHARAC_WRITE_ON_0001
+     * @tc.number SUB_COMMUNACATION_bluetoothble_CHARAC_WRITE_ON_0001
      * @tc.name testonCharacteristicwriteOn
      * @tc.desc Test CharacteristicwriteOn api .
      * @tc.author zhangyujie zwx1079266
@@ -318,27 +380,19 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetoothble_CharacteristicwriteOn_test_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetoothble_CHARAC_WRITE_ON_0001', 0, async function (done) {
         try {
+            await tryToEnableBt();
             console.info('[bluetooth_js] CharacteristicwriteOn test start');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] : click onCreateGattServer first!");
-            }
             await gattServer.on('characteristicWrite', function (data) {
-                console.info('[bluetooth_js] characteristicWrite callback data ->');
-                console.info('[bluetooth_js] CharWriReq deviceId: ' + data.deviceId);
-                console.info('[bluetooth_js] CharWriReq transId: ' + data.transId);
-                console.info('[bluetooth_js] CharWriReq offset: ' + data.offset);
-                console.info('[bluetooth_js] CharWriReq isPrep: ' + data.isPrep);
-                console.info('[bluetooth_js] CharWriReq chaticUuid: ' + data.characteristicUuid);
-                console.info('[bluetooth_js] CharWriReq serviceUuid: ' + data.serviceUuid);
-                console.info('[bluetooth_js] CharWriReq value: ' + data.value);
-                console.info('[bluetooth_js] CharWriReq needRsp: ' + data.needRsp);
+
+                console.info('[bluetooth_js] CharWriReq deviceId: ' + data.deviceId +
+                'transId:' + data.transId + 'offset:' + data.offset + 'isPrep:' + data.isPrep +
+                'charUuid:' + data.characteristicUuid + 'serviceUuid:' + data.serviceUuid +
+                'value:' + data.value + 'needRsp' + data.needRsp);
                 if (data.value instanceof ArrayBuffer) {
                     console.log(`[bluetooth_js] value: ${ab2hex(data.value)}`)
                 }
-                console.info('[bluetooth_js]  characteristicUuid: ' + data.characteristicUuid);
-                console.info('[bluetooth_js]  serviceUuid: ' + data.serviceUuid);
                 if (data.needRsp == false) {
                     return;
                 }
@@ -351,9 +405,7 @@ describe('bluetoothhostTest', function() {
                     "value": data.value,
                 };
                 var result = gattServer.sendResponse(serverResponse);
-                console.info("[bluetooth_js] sendResponse:" + JSON.stringify(result));
                 expect(JSON.stringify(result)).assertContain("true");
-                console.info("[bluetooth_js] characteristicWrite end");
             });
         }catch(e) {
             expect(null).assertFail();
@@ -361,12 +413,8 @@ describe('bluetoothhostTest', function() {
 
         try {
             console.info('[bluetooth_js] characteristicWrite test1 start');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] :plese CreateGattServer first!");
-            }
             await gattServer.off('characteristicWrite', function (data) {
-                console.info("[bluetooth_js] charaWrite off jsdata2:" + JSON.stringify(data));
-                console.info("[bluetooth_js] charaWrite off data2:" + data);
+                console.info("[bluetooth_js] charaWrite off data2:" + JSON.stringify(data));
                 expect(true).assertEqual(data ==null);
             });
         }catch(e) {
@@ -376,7 +424,7 @@ describe('bluetoothhostTest', function() {
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_DESC_READ_ON_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_DESC_READ_ON_0001
      * @tc.name testDescriptorReadOn
      * @tc.desc Test DescriptorReadOn api .
      * @tc.author zhangyujie zwx1079266
@@ -384,23 +432,17 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_descriptorRead_On_test_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_DESC_READ_ON_0001', 0, async function (done) {
         try {
+            await tryToEnableBt();
             console.info('[bluetooth_js] descriptorReadOn test start ...');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] onAddServiceHelper: click onCreateGattServer first!");
-            }
             await gattServer.on('descriptorRead', function (data) {
-                console.info("[bluetooth_js] DesRedon jsondata:" + JSON.stringify(data));
-                console.info("[bluetooth_js] DesRedon data:" + data);
+                console.info("[bluetooth_js] DesRedon jsondata:" + JSON.stringify(data) +
+                'deviceId:' + data.deviceId + 'transId:' + data.transId + 'offset:' + 
+                data.offset +'descriptorUuid:' + data.descriptorUuid + 'characteristicUuid:' + 
+                data.characteristicUuid + 'serviceUuid:' + data.serviceUuid);
                 expect(true).assertEqual(data !=null);
-                console.info('[bluetooth_js] desRead callback data ->');
-                console.info('[bluetooth_js] DesRedReq deviceId:' + data.deviceId);
-                console.info('[bluetooth_js] DesRedReq transId:' + data.transId);
-                console.info('[bluetooth_js] DesRedReq offset:' + data.offset);
-                console.info('[bluetooth_js] DesRedReq desUuid:' + data.descriptorUuid);
-                console.info('[bluetooth_js] DesRedReq charUuid:' + data.characteristicUuid);
-                console.info('[bluetooth_js] DesRedReq serUuid:' + data.serviceUuid);
+
             });
         }catch(e) {
             expect(null).assertFail();
@@ -408,12 +450,7 @@ describe('bluetoothhostTest', function() {
 
         try {
             console.info('[bluetooth_js] descriptorReadOff test start ...');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] onAddServiceHelper:click onCreateGattServer first!");
-            }
             await gattServer.off('descriptorRead', function (data) {
-                console.info("[bluetooth_js] descriptorRead_off json_data-> " + JSON.stringify(data));
-                console.info("[bluetooth_js] descriptorRead_off data -> " + data);
                 expect(true).assertEqual(data ==null);
             });
         }catch(e) {
@@ -424,7 +461,7 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_DESC_WRITE_ON_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_DESC_WRITE_ON_0001
      * @tc.name testDescriptorWriteOn
      * @tc.desc Test DescriptorWriteOn api .
      * @tc.author zhangyujie zwx1079266
@@ -432,26 +469,17 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_descriptorWrite_On_test_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_DESC_WRITE_ON_0001', 0, async function (done) {
         try {
+            await tryToEnableBt();
             console.info('[bluetooth_js] descriptorWriteOn test start ...');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] onAddServiceHelper: click onCreateGattServer first!");
-            }
             await gattServer.on('descriptorWrite', function (data) {
-                console.info("[bluetooth_js] desWriOn jsondata: " + JSON.stringify(data));
-                console.info("[bluetooth_js] desWriOn data:" + data);
+                console.info("[bluetooth_js] desWriOn jsondata: " + JSON.stringify(data) +
+                'deviceId: ' + data.deviceId + 'transId:' + data.transId + 'offset:' + 
+                data.offset +'descriptorUuid:' + data.descriptorUuid + 
+                'charUuid:' + data.characteristicUuid +'serviceUuid:' + data.serviceUuid +
+                'value:' + data.value + 'needRsp' + data.needRsp + 'isPrep:' + data.isPrep );
                 expect(true).assertEqual(data !=null);
-                console.info('[bluetooth_js] desWrite callback data ->');
-                console.info('[bluetooth_js] desWriOn deviceId: ' + data.deviceId);
-                console.info('[bluetooth_js] desWriOn transId: ' + data.transId);
-                console.info('[bluetooth_js] desWriOn offset: ' + data.offset);
-                console.info('[bluetooth_js] desWriOn desUuid: ' + data.descriptorUuid);
-                console.info('[bluetooth_js] desWriOn serUuid: ' + data.serviceUuid);
-                console.info('[bluetooth_js] desWriOn charUuid: ' + data.characteristicUuid);
-                console.info('[bluetooth_js] desWriOn value: ' + data.value);
-                console.info('[bluetooth_js] desWriOn needRsp: ' + data.needRsp);
-                console.info('[bluetooth_js] desWriOn isPrep: ' + data.isPrep);
             });
         }catch(e) {
             expect(null).assertFail();
@@ -459,12 +487,7 @@ describe('bluetoothhostTest', function() {
 
         try {
             console.info('[bluetooth_js] descriptorWriteOff test start ...');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] onAddServiceHelper: please click CreateGattServer first!");
-            }
             await gattServer.off('descriptorWrite', function (data) {
-                console.info("[bluetooth_js] desWriOff jsonData-> " + JSON.stringify(data));
-                console.info("[bluetooth_js] desWriOff data -> " + data);
                 expect(true).assertEqual(data ==null);
             });
         }catch(e) {
@@ -475,7 +498,7 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_CONNE_STATE_CHANGE_ON_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_CONNE_STATE_CHANGE_ON_0001
      * @tc.name testConnectStateChangeOn
      * @tc.desc Test ConnectStateChangeOn api .
      * @tc.author zhangyujie zwx1079266
@@ -483,19 +506,14 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_connectStateChange_On_test_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_CONNE_STATE_CHANGE_ON_0001', 0, async function (done) {
         try {
+            await tryToEnableBt();
             console.info('[bluetooth_js] ConnectStateChangeOn test start ...');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] on: click CreateGattServer first!");
-            }
             await gattServer.on('connectStateChange', function (data) {
-                console.info("[bluetooth_js] connectStaOn jsonData -> " + JSON.stringify(data));
-                console.info("[bluetooth_js] connectStaOn data -> " + data);
+                console.info("[bluetooth_js] connectStaOn jsonData -> " + JSON.stringify(data) +
+                'deviceId: ' + data.deviceId + 'state:'+ data.state);
                 expect(true).assertEqual(data !=null);
-                console.info('[bluetooth_js] connectStaOn callback data ->');
-                console.info('[bluetooth_js] connectStaOn deviceId: ' + data.deviceId);
-                console.info('[bluetooth_js] connectStaOn state: ' + data.state);
             });
         }catch(e) {
             expect(null).assertFail();
@@ -503,12 +521,8 @@ describe('bluetoothhostTest', function() {
 
         try {
             console.info('[bluetooth_js] ConnectStateChangeOff test start ...');
-            if (gattServer == null) {
-                console.info("[bluetooth_js] on: please click onCreateGattServer first!");
-            }
             await gattServer.off('connectStateChange', function (data) {
-                console.info("[bluetooth_js] connectStateChange_off jsonData-> " + JSON.stringify(data));
-                console.info("[bluetooth_js] connectStateChange_off data -> " + data);
+                console.info("[bluetooth_js] connectStateChange_off Data:" + JSON.stringify(data));
                 expect(true).assertEqual(data ==null);
             });
         }catch(e) {
@@ -519,7 +533,7 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_BLE_CHAR_CHANGE_ON_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_BLE_CHAR_CHANGE_ON_0001
      * @tc.name testBLECharacteristicChangeOn
      * @tc.desc Test BLECharacteristicChangeOn api .
      * @tc.author zhangyujie zwx1079266
@@ -527,15 +541,12 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_BLECharacteristicChange_On_test_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_BLE_CHAR_CHANGE_ON_0001', 0, async function (done) {
         try {
+            await tryToEnableBt();
             console.info('[bluetooth_js] BLECharacteristicChangeOn test start ...');
-            if (gattClient == null) {
-                console.info("[bluetooth_js] OnGattclientClose:click onCreateGattClientDevice first!");
-            }
             await gattClient.on('BLECharacteristicChange', function (data) {
                 console.info("[bluetooth_js] BLECharacteristicChange data " + JSON.stringify(data));
-                console.info("[bluetooth_js] BLECharacteristicChange_on data -> " + data);
                 expect(true).assertEqual(data !=null);
             });
         }catch(e) {
@@ -544,12 +555,8 @@ describe('bluetoothhostTest', function() {
 
         try {
             console.info('[bluetooth_js] BLECharacteristicChangeOff test start');
-            if (gattClient == null) {
-                console.info("[bluetooth_js] OnGattclientClose: CreateGattClientDevice first!");
-            }
             await gattClient.off('BLECharacteristicChange', function (data) {
-                console.info("[bluetooth_js] BLECharcChange_off json_data-> " + JSON.stringify(data));
-                console.info("[bluetooth_js] BLECharcChange_off data -> " + data);
+                console.info("[bluetooth_js] BLECharcChange_off data-> " + JSON.stringify(data));
                 expect(true).assertEqual(data ==null);
             });
         }catch(e) {
@@ -560,7 +567,7 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_BLE_CONNE_STATE_CHANGE_ON_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_BLE_CONNE_STATE_CHANGE_ON_0001
      * @tc.name testBLEConnectionStateChangeOn
      * @tc.desc Test BLEConnectionStateChangeOn api .
      * @tc.author zhangyujie zwx1079266
@@ -568,19 +575,14 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_BLEConnectionStateChange_On_test_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_BLE_CONNE_STATE_CHANGE_ON_0001', 0, async function (done) {
         try {
+            await tryToEnableBt();
             console.info('[bluetooth_js] BLEConnectionStateChangeOn test start');
-            if (gattClient == null) {
-                console.info("[bluetooth_js] GattclientClose:CreateGattClientDevice first!");
-            }
             await gattClient.on('BLEConnectionStateChange', function (data) {
-                console.info("[bluetooth_js] BLEConnecStateChange_on data " + JSON.stringify(data));
-                console.info("[bluetooth_js] BLEConneStateChange_on data -> " + data);
+                console.info("[bluetooth_js] BLEConnecStateChange_on data " + JSON.stringify(data)
+                +'deviceId: ' + data.deviceId + 'state:'+ data.state);
                 expect(true).assertEqual(data !=null);
-
-                console.info('[bluetooth_js] BLEConneStateChange deviceId : ' + data.deviceId);
-                console.info('[bluetooth_js] BLEConneStateChange state : ' + data.state);
             });
         }catch(e) {
             expect(null).assertFail();
@@ -588,16 +590,11 @@ describe('bluetoothhostTest', function() {
 
         try {
             console.info('[bluetooth_js] BLEConnectionStateChangeOff test start');
-            if (gattClient == null) {
-                console.info("[bluetooth_js] GattclientClose:click CreateGattClientDevice first!");
-            }
             await gattClient.off('BLEConnectionStateChange', function (data) {
                 console.info("[bluetooth_js] BLEConneStateChange_off data-> " + JSON.stringify(data));
-                console.info("[bluetooth_js] BLEConneStateChange_off data -> " + data);
                 expect(true).assertEqual(data ==null);
             });
         }catch(e) {
-
             expect(null).assertFail();
         }
         done();
@@ -605,7 +602,7 @@ describe('bluetoothhostTest', function() {
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetoothble_DEVICE_JS_SPP_READ_ON_0001
+     * @tc.number SUB_COMMUNACATION_bluetoothble_SPP_READ_ON_0001
      * @tc.name testonsppReadOn
      * @tc.desc Test sppReadOn api .
      * @tc.author zhangyujie zwx1079266
@@ -613,13 +610,12 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_sppReadOn_test_001', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetoothble_SPP_READ_ON_0001', 0, async function (done) {
         try {
+            await tryToEnableBt();
             console.info('[bluetooth_js] sppReadOn test start');
-            console.info('bluetooth sppReadOn test start ...');
             await bluetooth.on("sppRead",-1, (result) => {
                 console.info("[bluetooth_js] sppReadOn json_result -> " + JSON.stringify(result));
-                console.info("[bluetooth_js] sppReadOn result -> " + result);
                 expect(true).assertEqual(result !=null);
             });
         }catch(e) {
@@ -630,7 +626,6 @@ describe('bluetoothhostTest', function() {
             console.info('[bluetooth_js] sppReadOff test start ...');
             await bluetooth.off("sppRead",-1, (result) => {
                 console.info("[bluetooth_js] sppReadOff json_result -> " + JSON.stringify(result));
-                console.info("[bluetooth_js] sppReadOff result -> " + result);
                 expect(true).assertEqual(result ==null);
             });
         }catch(e) {
@@ -639,5 +634,5 @@ describe('bluetoothhostTest', function() {
         done();
     })
 
-
 })
+
diff --git a/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js b/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js
index 4be76344f413b13380273e1ffa55c700c2143b03..aed7662fe8637208e4311e2b12add595b6de2e84 100644
--- a/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js
+++ b/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js
@@ -17,28 +17,25 @@ import bluetooth from '@ohos.bluetooth';
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 
 
-
-var SppType = {
-    SPP_RFCOMM : 0
-}
-
-var MatchMode = {
-    MATCH_MODE_AGGRESSIVE : 1,
-    MATCH_MODE_STICKY : 2
-}
-
-var MajorClass = {
-    MAJOR_MISC : 0x0000,
-    MAJOR_COMPUTER : 0x0100,
-    MAJOR_PHONE : 0x0200,
-    MAJOR_NETWORKING : 0x0300,
-    MAJOR_AUDIO_VIDEO : 0x0400,
-    MAJOR_PERIPHERAL : 0x0500,
-    MAJOR_IMAGING : 0x0600,
-    MAJOR_WEARABLE : 0x0700,
-    MAJOR_TOY : 0x0800,
-    MAJOR_HEALTH : 0x0900,
-    MAJOR_UNCATEGORIZED : 0x1F00
+var Btname = {
+    NUM_TEST :'012345678901234567890123456789012345678901234567890123'+
+    '45678901234567890123456789012345678901234567890123456789012345678901234567',
+    NUM_TEST1 :'01234567890123456789012345678901234567890123456'
+    +'7890123456789012345678901234567890123456789012345678901234567890123456789012345678',
+    LETTERS_TEST :'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+    CHINESES_TEST :'测试蓝牙名称是否正常测试蓝牙名称是否试蓝牙',
+    SYMBOL_TEST:'*^_^* 、。·ˉˇ¨〃々—～‖·‘’“”「『』〖❂【±×'
+    +'÷∶∧∨∑∏∪∩∈∷√⊥‖∠⌒⊙∫∮≡≌≈∽∝≠♂♀°℃＄¤￠￡‰§№☆★○●◎◇□■△※→←↑↓〓',
+    MIXES:'测试蓝牙名称是否正试蓝牙\'名称是否[666]aaw',
+    MIXES2:'——◎◇◆□■△▲测试蓝牙',
+    MIXES3:'78453-、、。。◎◇◆□■△▲',
+    MIXES4:'hhhfdf-、、。。◎◇◆□■△▲',
+    MIXES5:'#01-5@<?;:!@$%^&*(1[]{【+-；：‘’“”测试=》《\'[6]',
+    MIXES6:'#01-567890@<>?/;:5675ASDF012345678!@'
+    +'$%^&*()9012378901[]{}【】566~·67890blue',
+    MIXES7:'0123456789012345678901234567890123456789012345678901'
+    +'23456789012345678901234567890123456789012345678901234567890123456789012345678012'
+    +'345678901234567890123456789012345678901234567890123456789012367890123456789012345568'
 }
 
 describe('bluetoothhostTest', function() {
@@ -61,27 +58,17 @@ describe('bluetoothhostTest', function() {
         return new Promise(resovle => setTimeout(resovle, delay))
     }
 
-
-    /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_ENABLE_0001
-     * @tc.name testEnableBluetooth
-     * @tc.desc Test EnableBluetooth api by promise.
-     * @tc.author quanli 00313334
-     * @tc.size MEDIUM
-     * @tc.type Function
-     * @tc.level Level 2
-     */
-    it('bluetooth_classic_enable_bluetooth_001', 0, async function (done) {
-        console.info('[bluetooth_js] enable start');
+    async function tryToEnableBt() {
         var sta = bluetooth.getState();
         switch(sta){
             case 0:
                 var enable = bluetooth.enableBluetooth();
                 console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
-                expect(enable).assertEqual(true);
+                await sleep(3000);
                 break;
             case 1:
                 console.info('[bluetooth_js] bt turning on:'+ JSON.stringify(sta));
+                await sleep(3000);
                 break;
             case 2:
                 console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
@@ -89,503 +76,404 @@ describe('bluetoothhostTest', function() {
             case 3:
                 var enable = bluetooth.enableBluetooth();
                 console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                await sleep(3000);
                 break;
             default:
                 console.info('[bluetooth_js] enable success');
-            }
-        await sleep(3000);
+        }
+    }
+
+
+    /**
+     * @tc.number SUB_COMMUNACATION_bluetooth_ENABLE_0001
+     * @tc.name testEnableBluetooth
+     * @tc.desc Test EnableBluetooth api by promise.
+     * @tc.author zhangyujie zwx1079266
+     * @tc.size MEDIUM
+     * @tc.type Function
+     * @tc.level Level 2
+     */
+    it('SUB_COMMUNACATION_bluetooth_ENABLE_0001', 0, async function (done) {
+        console.info('[bluetooth_js] enable start');
+        await tryToEnableBt();
         var state = bluetooth.getState();
-        console.info('[bluetooth_js] getState On = '+ JSON.stringify(state));
-        expect(state).assertEqual(2);
-        console.info('[bluetooth_js]state on:' + JSON.stringify(bluetooth.BluetoothState.STATE_ON));
-        console.info('[bluetooth_js]off :' + JSON.stringify(bluetooth.BluetoothState.STATE_OFF));
-        console.info('[bluetooth_js] turning on :'
-        + JSON.stringify(bluetooth.BluetoothState.STATE_TURNING_ON));
-        console.info('[bluetooth_js] turning off :'
-        + JSON.stringify(bluetooth.BluetoothState.STATE_TURNING_OFF));
-        console.info('[bluetooth_js] ble turning on :'
-        + JSON.stringify(bluetooth.BluetoothState.STATE_BLE_TURNING_ON));
-        console.info('[bluetooth_js] ble on:'
-        + JSON.stringify(bluetooth.BluetoothState.STATE_BLE_ON));
-        console.info('[bluetooth_js] ble turning off :'
-        + JSON.stringify(bluetooth.BluetoothState.STATE_BLE_TURNING_OFF));
-        console.info('bluetooth enable done');
-        done();
-    })
-
-    /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_STATE_0001
+        expect(state).assertEqual(bluetooth.BluetoothState.STATE_ON);
+        expect(bluetooth.BluetoothState.STATE_OFF == 0).assertTrue();
+        expect(bluetooth.BluetoothState.STATE_TURNING_ON == 1).assertTrue();
+        expect(bluetooth.BluetoothState.STATE_TURNING_OFF == 3).assertTrue();
+        expect(bluetooth.BluetoothState.STATE_BLE_TURNING_ON == 4).assertTrue();
+        expect(bluetooth.BluetoothState.STATE_BLE_ON == 5).assertTrue();
+        expect(bluetooth.BluetoothState.STATE_BLE_TURNING_OFF == 6).assertTrue();
+        done();
+    })
+
+    /**
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_STATE_0001
      * @tc.name testGetState
      * @tc.desc Test GetState api by promise.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_get_state', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GET_STATE_0001', 0, async function (done) {
         console.info('[bluetooth_js] get state start');
+        await tryToEnableBt();
         var state = bluetooth.getState();
         console.info('get bluetooth state end');
         console.info('[bluetooth_js] get bluetooth state result = '+ JSON.stringify(state));
         expect(state).assertEqual(bluetooth.BluetoothState.STATE_ON);
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCALNAME_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCALNAME_0001
      * @tc.name testClassicSetLocalName
      * @tc.desc Test ClassicSetLocalName api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCALNAME_0001', 0, async function (done) {
         console.info('[bluetooth_js] set localname start');
+        await tryToEnableBt();
         var name = bluetooth.setLocalName('bluetooth_test');
         console.info('[bluetooth_js] appInfoTest enable bluetooth result = '+ JSON.stringify(name));
         expect(name).assertEqual(true);
-        console.info('[bluetooth_js] set localname end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_START_PAIR_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_START_PAIR_0001
      * @tc.name testStartpair
      * @tc.desc Test Startpair api by promise.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_Startpair_test_001', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_START_PAIR_0001', 0, async function (done) {
         console.info('[bluetooth_js] Startpair test start ...');
+        await tryToEnableBt();
         var result = bluetooth.pairDevice("00:00:00:00:00:00");
         console.info("[bluetooth_js] onStartpair -> " + JSON.stringify(result));
         expect(result).assertFalse();
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_LOCALNAME_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_LOCALNAME_0001
      * @tc.name testClassicGetLocalName
      * @tc.desc Test ClassicGetLocalName api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_get_local_name', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GET_LOCALNAME_0001', 0, async function (done) {
         console.info('[bluetooth_js] get localName start');
+        await tryToEnableBt();
         var localName = bluetooth.getLocalName();
         console.info('[bluetooth_js] get local Name result = ' + JSON.stringify(localName));
         expect(localName).assertEqual('bluetooth_test');
-        console.info('[bluetooth_js] get localName end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_BLUETOOTH_SCAN_MODE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_BLUETOOTH_SCAN_MODE_0001
      * @tc.name testClassicSetBluetoothScanMode
      * @tc.desc Test ClassicSetBluetoothScanMode api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_scan_mode', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_SET_BLUETOOTH_SCAN_MODE_0001', 0, async function (done) {
         console.info('[bluetooth_js] set scan mode start');
+        await tryToEnableBt();
         var result = bluetooth.setBluetoothScanMode(1,10000);
-        console.info('[bluetooth_js] set bluetooth scan mode result ' + JSON.stringify(result));
-        console.info('[bluetooth_js] low power :'
-        + JSON.stringify(bluetooth.ScanDuty.SCAN_MODE_LOW_POWER));
-        console.info('[bluetooth_js] balanced :'
-        + JSON.stringify(bluetooth.ScanDuty.SCAN_MODE_BALANCED));
-        console.info('[bluetooth_js] low latency:'
-        + JSON.stringify(bluetooth.ScanDuty.SCAN_MODE_LOW_LATENCY));
+        expect(true).assertTrue(JSON.stringify(bluetooth.ScanDuty.SCAN_MODE_LOW_POWER) !=result );
+        expect(true).assertTrue(JSON.stringify(bluetooth.ScanDuty.SCAN_MODE_BALANCED) != result);
+        expect(true).assertTrue(JSON.stringify(bluetooth.ScanDuty.SCAN_MODE_BALANCED) != result );
         expect(result).assertEqual(true);
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_BLUETOOTH_SCAN_MODE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_BLUETOOTH_SCAN_MODE_0001
      * @tc.name testClassicGetBluetoothScanMode
      * @tc.desc Test ClassicGetBluetoothScanMode api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_get_scan_mode', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GET_BLUETOOTH_SCAN_MODE_0001', 0, async function (done) {
         console.info('[bluetooth_js] get scan mode start');
+        await tryToEnableBt();
         var result = bluetooth.setBluetoothScanMode(1,10000);
-
-        console.info('[bluetooth_js] get scan mode result1 = ' + JSON.stringify(result));
         expect(result).assertEqual(true);
         var scanMode = bluetooth.getBluetoothScanMode();
         console.info('[bluetooth_js] get scan mode result2 = ' + JSON.stringify(scanMode));
         expect(scanMode).assertEqual(1);
-        console.info('[bluetooth_js] mode1:' + JSON.stringify(bluetooth.ScanMode.SCAN_MODE_NONE));
-        console.info('[bluetooth_js] mode2:'
-        + JSON.stringify(bluetooth.ScanMode.SCAN_MODE_CONNECTABLE));
-        console.info('[bluetooth_js] mode3:'
-        + JSON.stringify(bluetooth.ScanMode.SCAN_MODE_GENERAL_DISCOVERABLE));
-        console.info('[bluetooth_js] mode4:'
-        + JSON.stringify(bluetooth.ScanMode.SCAN_MODE_LIMITED_DISCOVERABLE));
-        console.info('[bluetooth_js] mode5:'
-        + JSON.stringify(bluetooth.ScanMode.SCAN_MODE_CONNECTABLE_GENERAL_DISCOVERABLE));
-        console.info('[bluetooth_js] mode6:'
-        + JSON.stringify(bluetooth.ScanMode.SCAN_MODE_CONNECTABLE_LIMITED_DISCOVERABLE));
-        console.info('[bluetooth_js] get scan mode end');
-    })
-
-    /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_BT_CONNECT_STATE_0001
+        expect(true).assertTrue(bluetooth.ScanMode.SCAN_MODE_NONE != scanMode);
+        expect(true).assertTrue(bluetooth.ScanMode.SCAN_MODE_CONNECTABLE != scanMode);
+        expect(true).assertTrue(bluetooth.ScanMode.SCAN_MODE_GENERAL_DISCOVERABLE != scanMode);
+        expect(true).assertTrue(bluetooth.ScanMode.SCAN_MODE_LIMITED_DISCOVERABLE != scanMode);
+        expect(true).assertTrue(bluetooth.ScanMode.SCAN_MODE_CONNECTABLE_GENERAL_DISCOVERABLE != scanMode);
+        expect(true).assertTrue(bluetooth.ScanMode.SCAN_MODE_CONNECTABLE_LIMITED_DISCOVERABLE != scanMode);
+        done();
+    })
+
+    /**
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_BT_CONNECT_STATE_0001
      * @tc.name testClassicGetBtConnectionState
      * @tc.desc Test ClassicGetBtConnectionState api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_get_connection', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GET_BT_CONNECT_STATE_0001', 0, async function (done) {
         console.info('[bluetooth_js] get connection state start');
+        await tryToEnableBt();
         var connState = bluetooth.getBtConnectionState();
         console.info('[bluetooth_js] get bt connection state result' + JSON.stringify(connState));
         expect(connState).assertEqual(bluetooth.ProfileConnectionState.STATE_DISCONNECTED);
-        console.info('[bluetooth_js] pr1:'
-        + JSON.stringify(bluetooth.ProfileConnectionState.STATE_DISCONNECTED));
-        console.info('[bluetooth_js] pr2:'
-        + JSON.stringify(bluetooth.ProfileConnectionState.STATE_CONNECTING));
-        console.info('[bluetooth_js] pr3:'
-        + JSON.stringify(bluetooth.ProfileConnectionState.STATE_CONNECTED));
-        console.info('[bluetooth_js] pr4:'
-        + JSON.stringify(bluetooth.ProfileConnectionState.STATE_DISCONNECTING));
-        console.info('[bluetooth_js] get connection end');
+        expect(true).assertTrue(bluetooth.ProfileConnectionState.STATE_CONNECTING!= connState );
+        expect(true).assertTrue(bluetooth.ProfileConnectionState.STATE_CONNECTED!= connState );
+        expect(true).assertTrue(bluetooth.ProfileConnectionState.STATE_DISCONNECTING!= connState );
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_START_BLUETOOTH_DISCOVERY_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_START_BLUETOOTH_DISCOVERY_0001
      * @tc.name testClassicStartBluetoothDiscovery
      * @tc.desc Test ClassicStartBluetoothDiscovery api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_start_discovery', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_START_BLUETOOTH_DISCOVERY_0001', 0, async function (done) {
         console.info('[bluetooth_js] discovery start');
+        await tryToEnableBt();
         let result = bluetooth.startBluetoothDiscovery();
         console.info('[bluetooth_js] get bt connection state result' + JSON.stringify(result));
         expect(result).assertEqual(true);
-        console.info('[bluetooth_js] discovery end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_STOP_BLUETOOTH_DISCOVERY_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_STOP_BLUETOOTH_DISCOVERY_0001
      * @tc.name testClassicStopBluetoothDiscovery
      * @tc.desc Test ClassicStopBluetoothDiscovery api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_stop_discovery', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_STOP_BLUETOOTH_DISCOVERY_0001', 0, async function (done) {
         console.info('[bluetooth_js] stop discovery start');
+        await tryToEnableBt();
         let result = bluetooth.stopBluetoothDiscovery();
         console.info("stopBluetoothDiscovery :" + JSON.stringify(result));
         expect(result).assertTrue();
-        console.info('[bluetooth_js] stop discovery end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_PAIRED_DEVICES_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_PAIRED_DEVICES_0001
      * @tc.name testClassicGetPairedDevices
      * @tc.desc Test ClassicGetPairedDevices api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_get_paired_devices', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GET_PAIRED_DEVICES_0001', 0, async function (done) {
         console.info('[bluetooth_js] get paired devices start');
+        await tryToEnableBt();
         var devices = bluetooth.getPairedDevices();
-        console.info('[bluetooth_js] get paired devices result:' + JSON.stringify(devices));
-        console.info("[bluetooth_js] getConnectedDevices length:" + devices.length);
+        console.info('[bluetooth_js] get paired devices:' + JSON.stringify(devices) +'length:' + devices.length);
         expect(devices.length).assertEqual(0);
-        console.info('[bluetooth_js] get paired devices end');
+        done();
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SPP_LISTEN_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SPP_LISTEN_0001
      * @tc.name testSppListen
      * @tc.desc Test SppListen api by callback.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_spp_listen', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_SPP_LISTEN_0001', 0, async function (done) {
         console.log("[bluetooth_js]: spp listen start");
+        await tryToEnableBt();
         let sppOption = {uuid: '00001810-0000-1000-8000-00805F9B34FB',
             secure: false, type: 0};
-        for (var key in sppOption ){
-            console.info('[bluetooth_js] sppListen:'+ sppOption[key]);
-        }
         bluetooth.sppListen('server1', sppOption, function(code, serverSocketNumber) {
+            console.info('[bluetooth_js] code is: ' + code.code);
             if (code.code == 0) {
-                console.info('[bluetooth_js] code is success');
-                console.info('[bluetooth_js] code is: ' + code.code);
                 expect(true).assertEqual(true);
                 done();
             } else {
-                console.info('[bluetooth_js] code is failed');
-                console.info('[bluetooth_js] code is: ' + code.code);
                 expect(true).assertEqual(false);
                 done();
             }
         });
-        console.log("[bluetooth_js] spp listen end");
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SPP_ACCEPT_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SPP_ACCEPT_0001
      * @tc.name testSppAccept
      * @tc.desc Test SppAccept api by callbck.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_spp_Accept', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_SPP_ACCEPT_0001', 0, async function (done) {
         console.log("[bluetooth_js] spp accept start");
+        await tryToEnableBt();
         bluetooth.sppAccept(-1, function(code, clientSocketNumber) {
+            console.info('[bluetooth_js] code is: ' + code.code);
             if (code.code == 0) {
-                console.info('[bluetooth_js] code is success');
-                console.info('[bluetooth_js] code is: ' + code.code);
                 expect(true).assertEqual(true);
             } else {
-                console.info('[bluetooth_js] code is failed');
-                console.info('[bluetooth_js] code is: ' + code.code);
                 expect(true).assertEqual(false);
             }
         });
         done();
-        console.log("[bluetooth_js] spp accept end");
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SPP_CLOSE_SERVER_SOCKET_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SPP_CLOSE_SERVER_SOCKET_0001
      * @tc.name testSppCloseServerSocket
      * @tc.desc Test SppCloseServerSocket api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_spp_closeServerSocket', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_SPP_CLOSE_SERVER_SOCKET_0001', 0, async function (done) {
         console.log("[bluetooth_js] spp closeServerSocket start");
+        await tryToEnableBt();
         let ret = bluetooth.sppCloseServerSocket(-1);
         console.info('[bluetooth_js] bluetooth sppCloseServerSocket ret : ' + ret);
         expect(ret).assertEqual(false);
-        console.log("[bluetooth_js] spp closeServerSocket end");
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SPP_CONNECT_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SPP_CONNECT_0001
      * @tc.name testSppConnect
      * @tc.desc Test SppConnect api by callback.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_spp_connect', 0, async function (done) {
+    it('SUB_COMMUNACATION_bluetooth_SPP_CONNECT_0001', 0, async function (done) {
         console.info('[bluetooth_js] spp_connect start');
+        await tryToEnableBt();
         let sppOption = {uuid: '00001810-0000-1000-8000-00805F9B34FB',
             secure: true, type: 0};
         bluetooth.sppConnect(55, sppOption, function(code, clientSocketNumber) {
+            console.info('[bluetooth_js] code is: ' + code.code);
             if (code.code == 0) {
-                console.info('bluetooth code is success');
                 expect(true).assertEqual(true);
             } else {
-                console.info('bluetooth code is failed');
                 expect(true).assertEqual(false);
             }
         });
-        console.info('[bluetooth_js] spp_connect end');
         done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SPP_WRITE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SPP_WRITE_0001
      * @tc.name testSppWrite
      * @tc.desc Test SppWrite api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_spp_write', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_SPP_WRITE_0001', 0, async function (done) {
         console.info('[bluetooth_js] spp write start');
+        await tryToEnableBt();
         let arrayBuffer = new ArrayBuffer(8);
         let data =  new Uint8Array(arrayBuffer);
         data[0] = 123;
         let ret = bluetooth.sppWrite(-1, arrayBuffer);
         console.info('[bluetooth_js] bluetooth sppWrite ret : ' + ret);
         expect(ret).assertEqual(false);
-        console.info('[bluetooth_js] spp write end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_REMO_DEV_NAME_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_REMO_DEV_NAME_0001
      * @tc.name testGetRemoteDeviceName
      * @tc.desc Test GetRemoteDeviceName api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_getRemoteDeviceName_test', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GET_REMO_DEV_NAME_0001', 0, async function (done) {
         console.info('[bluetooth_js] getRemoteDeviceName start');
+        await tryToEnableBt();
         let ret = bluetooth.getRemoteDeviceName("00:00:00:00:00:00");
-        console.info('[bluetooth_js] getRemoteDeviceName ret : ' + ret);
         console.info('[bluetooth_js] getRemoteDeviceName ret2 : ' + JSON.stringify(ret));
         expect(ret.length).assertEqual(0);
-        console.info('[bluetooth_js] getRemoteDeviceName end.');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_REMO_DEV_CLASS_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_GET_REMO_DEV_CLASS_0001
      * @tc.name testGetRemoteDeviceClass
      * @tc.desc Test GetRemoteDeviceClass api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_getRemoteDeviceClass_test', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_GET_REMO_DEV_CLASS_0001', 0, async function (done) {
         console.info('[bluetooth_js] getRemoteDeviceClass start');
-        var MajorMinorClass = {
-            COMPUTER_UNCATEGORIZED : 0x0100,
-            COMPUTER_DESKTOP : 0x0104,
-            COMPUTER_SERVER : 0x0108,
-            COMPUTER_LAPTOP : 0x010C,
-            COMPUTER_HANDHELD_PC_PDA : 0x0110,
-            COMPUTER_PALM_SIZE_PC_PDA : 0x0114,
-            COMPUTER_WEARABLE : 0x0118,
-            COMPUTER_TABLET : 0x011C,
-            PHONE_UNCATEGORIZED : 0x0200,
-            PHONE_CELLULAR : 0x0204,
-            PHONE_CORDLESS : 0x0208,
-            PHONE_SMART : 0x020C,
-            PHONE_MODEM_OR_GATEWAY : 0x0210,
-            PHONE_ISDN : 0x0214,
-            NETWORK_FULLY_AVAILABLE : 0x0300,
-            NETWORK_1_TO_17_UTILIZED : 0x0320,
-            NETWORK_17_TO_33_UTILIZED : 0x0340,
-            NETWORK_33_TO_50_UTILIZED : 0x0360,
-            NETWORK_60_TO_67_UTILIZED : 0x0380,
-            NETWORK_67_TO_83_UTILIZED : 0x03A0,
-            NETWORK_83_TO_99_UTILIZED : 0x03C0,
-            NETWORK_NO_SERVICE : 0x03E0,
-            AUDIO_VIDEO_UNCATEGORIZED : 0x0400,
-            AUDIO_VIDEO_WEARABLE_HEADSET : 0x0404,
-            AUDIO_VIDEO_HANDSFREE : 0x0408,
-            AUDIO_VIDEO_MICROPHONE : 0x0410,
-            AUDIO_VIDEO_LOUDSPEAKER : 0x0414,
-            AUDIO_VIDEO_HEADPHONES : 0x0418,
-            AUDIO_VIDEO_PORTABLE_AUDIO : 0x041C,
-            AUDIO_VIDEO_CAR_AUDIO : 0x0420,
-            AUDIO_VIDEO_SET_TOP_BOX : 0x0424,
-            AUDIO_VIDEO_HIFI_AUDIO : 0x0428,
-            AUDIO_VIDEO_VCR : 0x042C,
-            AUDIO_VIDEO_VIDEO_CAMERA : 0x0430,
-            AUDIO_VIDEO_CAMCORDER : 0x0434,
-            AUDIO_VIDEO_VIDEO_MONITOR : 0x0438,
-            AUDIO_VIDEO_VIDEO_DISPLAY_AND_LOUDSPEAKER : 0x043C,
-            AUDIO_VIDEO_VIDEO_CONFERENCING : 0x0440,
-            AUDIO_VIDEO_VIDEO_GAMING_TOY : 0x0448,
-            PERIPHERAL_NON_KEYBOARD_NON_POINTING : 0x0500,
-            PERIPHERAL_KEYBOARD : 0x0540,
-            PERIPHERAL_POINTING_DEVICE : 0x0580,
-            PERIPHERAL_KEYBOARD_POINTING : 0x05C0,
-            PERIPHERAL_UNCATEGORIZED : 0x0500,
-            PERIPHERAL_JOYSTICK : 0x0504,
-            PERIPHERAL_GAMEPAD : 0x0508,
-            PERIPHERAL_REMOTE_CONTROL : 0x05C0,
-            PERIPHERAL_SENSING_DEVICE : 0x0510,
-            PERIPHERAL_DIGITIZER_TABLET : 0x0514,
-            PERIPHERAL_CARD_READER : 0x0518,
-            PERIPHERAL_DIGITAL_PEN : 0x051C,
-            PERIPHERAL_SCANNER_RFID : 0x0520,
-            PERIPHERAL_GESTURAL_INPUT : 0x0522,
-
-            IMAGING_UNCATEGORIZED : 0x0600,
-            IMAGING_DISPLAY : 0x0610,
-            IMAGING_CAMERA : 0x0620,
-            IMAGING_SCANNER : 0x0640,
-            IMAGING_PRINTER : 0x0680,
-
-            WEARABLE_UNCATEGORIZED : 0x0700,
-            WEARABLE_WRIST_WATCH : 0x0704,
-            WEARABLE_PAGER : 0x0708,
-            WEARABLE_JACKET : 0x070C,
-            WEARABLE_HELMET : 0x0710,
-            WEARABLE_GLASSES : 0x0714,
-
-            TOY_UNCATEGORIZED : 0x0800,
-            TOY_ROBOT : 0x0804,
-            TOY_VEHICLE : 0x0808,
-            TOY_DOLL_ACTION_FIGURE : 0x080C,
-            TOY_CONTROLLER : 0x0810,
-            TOY_GAME : 0x0814,
-
-            HEALTH_UNCATEGORIZED : 0x0900,
-            HEALTH_BLOOD_PRESSURE : 0x0904,
-            HEALTH_THERMOMETER : 0x0908,
-            HEALTH_WEIGHING : 0x090C,
-            HEALTH_GLUCOSE : 0x0910,
-            HEALTH_PULSE_OXIMETER : 0x0914,
-            HEALTH_PULSE_RATE : 0x0918,
-            HEALTH_DATA_DISPLAY : 0x091C,
-            HEALTH_STEP_COUNTER : 0x0920,
-            HEALTH_BODY_COMPOSITION_ANALYZER : 0x0924,
-            HEALTH_PEAK_FLOW_MOITOR : 0x0928,
-            HEALTH_MEDICATION_MONITOR : 0x092C,
-            HEALTH_KNEE_PROSTHESIS : 0x0930,
-            HEALTH_ANKLE_PROSTHESIS : 0x0934,
-            HEALTH_GENERIC_HEALTH_MANAGER : 0x0938,
-            HEALTH_PERSONAL_MOBILITY_DEVICE : 0x093C,
-            HEALTH_PERSONAL_MOBILITY_DEVICE : 0x093C
-        };
+        await tryToEnableBt();
         let ret = bluetooth.getRemoteDeviceClass("00:00:00:00:00:00");
-        console.info('[bluetooth_js] getRemoteDeviceClass ret : ' + ret);
-        console.info('[bluetooth_js] getRemoteDeviceClass ret2 : ' + JSON.stringify(ret));
+        console.info('[bluetooth_js] getRemoteDeviceClass ret2 :' + JSON.stringify(ret) + 'majorClass:' +
+        ret.majorClass + 'majorMinorClass:'+ ret.majorMinorClass + 'classOfDevice:' + ret.classOfDevice);
         expect(ret.majorClass).assertEqual(0);
-        console.info('[bluetooth_js] majorClass : ' + ret.majorClass);
-        console.info('[bluetooth_js] majorMinorClass : ' + ret.majorMinorClass);
-        console.info('[bluetooth_js] classOfDevice : ' + ret.classOfDevice);
-        console.info('[bluetooth_js] getRemoteDeviceClass end.');
+        done();
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_CANCEL_PAIRED_DEV_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_CANCEL_PAIRED_DEV_0001
      * @tc.name testCancelPairedDevice
      * @tc.desc Test CancelPairedDevice api.
-     * @tc.author quanli 00313334
+     * @tc.author zhangyujie zwx1079266
      * @tc.size MEDIUM
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_cancelPairedDevice_test', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_CANCEL_PAIRED_DEV_0001', 0, async function (done) {
         console.info('[bluetooth_js] cancelPairedDevice start');
+        await tryToEnableBt();
         let ret = bluetooth.cancelPairedDevice("00:00:00:00:00:00");
-        console.info('[bluetooth_js] cancelPairedDevice ret : ' + ret);
         console.info('[bluetooth_js] cancelPairedDevice ret2 : ' + JSON.stringify(ret));
         expect(ret).assertFalse();
-        console.info('bluetooth cancelPairedDevice end.');
+        done();
     })
 
+
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0001
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -593,21 +481,21 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name1', 0, async function () {
-        console.info('[bluetooth_js] set localname start');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0001', 0, async function (done) {
+        await tryToEnableBt();
         var state = bluetooth.getState();
-        console.info('[bluetooth_js] getState step1 = '+ JSON.stringify(state));
+        expect(true).assertTrue(JSON.stringify(bluetooth.BluetoothState.STATE_ON)==state);
         var name = bluetooth.setLocalName('');
-        console.info('[bluetooth_js] setLocalName result1 = '+ JSON.stringify(name));
         expect(name).assertFalse();
         var localName = bluetooth.getLocalName();
+        expect(true).assertTrue(localName==name);
         console.info('[bluetooth_js] getLocalName result1 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        done();
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0002
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0002
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -615,18 +503,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name2', 0, function () {
-        console.info('[bluetooth_js] set localname start');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0002', 0, async function (done) {
+        await tryToEnableBt();
+        var localName = bluetooth.getLocalName();
         var name = bluetooth.setLocalName();
-        console.info('[bluetooth_js] setLocalName result2 = '+ JSON.stringify(name));
+        console.info('[bluetooth_js] getName result2 = '+ JSON.stringify(localName) +
+        'setName result2 =' + JSON.stringify(name));
         expect(name).assertNull();
-        var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result2 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0003
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0003
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -634,19 +522,17 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name3', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('012345678901234567890123456789012345678901234567890123'
-        +'45678901234567890123456789012345678901234567890123456789012345678901234567');
-        console.info('[bluetooth_js] setLocalName result3 = '+ JSON.stringify(name));
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0003', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.NUM_TEST);
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result3 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.NUM_TEST == JSON.stringify(localName));
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0004
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0004
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -654,19 +540,17 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name4', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('01234567890123456789012345678901234567890123456'
-        +'7890123456789012345678901234567890123456789012345678901234567890123456789012345678');
-        console.info('[bluetooth_js] setLocalName result4 = '+ JSON.stringify(name));
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0004', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.NUM_TEST1);
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result4 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.NUM_TEST1 == JSON.stringify(localName));
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0005
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0005
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -674,18 +558,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name5', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
-        console.info('[bluetooth_js] setLocalName result5 = '+ JSON.stringify(name));
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0005', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.LETTERS_TEST);
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result5 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.LETTERS_TEST == JSON.stringify(localName));
+        done();
     })
 
+
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0006
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0006
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -693,18 +577,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name6', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('测试蓝牙名称是否正常测试蓝牙名称是否试蓝牙');
-        console.info('[bluetooth_js] setLocalName result6 = '+ JSON.stringify(name));
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0006', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.CHINESES_TEST);
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result6 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.CHINESES_TEST == JSON.stringify(localName));
+        done();
     })
 
+
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0007
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0007
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -712,19 +596,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name7', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('*^_^* 、。·ˉˇ¨〃々—～‖·‘’“”「『』〖❂【±×'
-        +'÷∶∧∨∑∏∪∩∈∷√⊥‖∠⌒⊙∫∮≡≌≈∽∝≠♂♀°℃＄¤￠￡‰§№☆★○●◎◇□■△※→←↑↓〓');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0007', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.SYMBOL_TEST);
         console.info('[bluetooth_js] setLocalName result7 = '+ JSON.stringify(name));
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result7 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.SYMBOL_TEST == JSON.stringify(localName));
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0008
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0008
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -732,18 +615,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name8', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('测试蓝牙名称是否正试蓝牙\'名称是否[666]aaw');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0008', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.MIXES);
         console.info('[bluetooth_js] setLocalName result8 = '+ JSON.stringify(name));
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result8 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.MIXES == JSON.stringify(localName));
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_0009
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0009
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -751,18 +634,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name9', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('——◎◇◆□■△▲测试蓝牙');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_0009', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.MIXES2);
         console.info('[bluetooth_js] setLocalName result9 = '+ JSON.stringify(name));
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result9 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.MIXES2 == JSON.stringify(localName));
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_00010
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00010
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -770,18 +653,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name10', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('78453-、、。。◎◇◆□■△▲');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00010', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.MIXES3);
         console.info('[bluetooth_js] setLocalName result10 = '+ JSON.stringify(name));
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result10 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.MIXES3 == JSON.stringify(localName));
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_00011
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00011
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -789,18 +672,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name11', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('hhhfdf-、、。。◎◇◆□■△▲');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00011', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.MIXES4);
         console.info('[bluetooth_js] setLocalName result11 = '+ JSON.stringify(name));
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result11 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.MIXES4 == JSON.stringify(localName));
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_00012
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00012
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -808,18 +691,18 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name12', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('#01-5@<?;:!@$%^&*(1[]{【+-；：‘’“”测试=》《\'[6]');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00012', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.MIXES5);
         console.info('[bluetooth_js] setLocalName result12 = '+ JSON.stringify(name));
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result12 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.MIXES5 == JSON.stringify(localName));
+        done();
     })
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_00013
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00013
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -827,20 +710,19 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name13', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('#01-567890@<>?/;:5675ASDF012345678!@'
-        +'$%^&*()9012378901[]{}【】566~·67890blue');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00013', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.MIXES6);
         console.info('[bluetooth_js] setLocalName result13 = '+ JSON.stringify(name));
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result13 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.MIXES6 == JSON.stringify(localName));
+        done();
     })
 
 
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_SET_LOCAL_NAME_00014
+     * @tc.number SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00014
      * @tc.name testsetLocalName
      * @tc.desc Test setLocalName api.
      * @tc.author zhangyujie zwx1079266
@@ -848,21 +730,20 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_set_local_name14', 0, function () {
-        console.info('[bluetooth_js] set localname start');
-        var name = bluetooth.setLocalName('0123456789012345678901234567890123456789012345678901'
-        +'23456789012345678901234567890123456789012345678901234567890123456789012345678012'
-        +'345678901234567890123456789012345678901234567890123456789012367890123456789012345568');
+    it('SUB_COMMUNACATION_bluetooth_SET_LOCAL_NAME_00014', 0, async function (done) {
+        await tryToEnableBt();
+        var name = bluetooth.setLocalName(Btname.MIXES7);
         console.info('[bluetooth_js] setLocalName result14 = '+ JSON.stringify(name));
         expect(name).assertTrue();
         var localName = bluetooth.getLocalName();
-        console.info('[bluetooth_js] getLocalName result14 = ' + JSON.stringify(localName));
-        console.info('[bluetooth_js] setLocalName end');
+        expect(true).assertTrue(Btname.MIXES7 == JSON.stringify(localName));
+        done();
     })
 
 
+
     /**
-     * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_DISABLE_0001
+     * @tc.number SUB_COMMUNACATION_bluetooth_DISABLE_0001
      * @tc.name testdisablebluetooth
      * @tc.desc Test disablebluetooth api.
      * @tc.author zhangyujie zwx1079266
@@ -870,14 +751,16 @@ describe('bluetoothhostTest', function() {
      * @tc.type Function
      * @tc.level Level 2
      */
-    it('bluetooth_classic_disable_bluetooth', 0, function () {
+    it('SUB_COMMUNACATION_bluetooth_DISABLE_0001', 0, async function (done) {
+        await tryToEnableBt();
         console.info('[bluetooth_js] disable test start');
         let disable = bluetooth.disableBluetooth();
         console.info('[bluetooth_js] disable:' + JSON.stringify(disable));
         expect(disable).assertTrue();
         var state = bluetooth.getState();
         console.info('[bluetooth_js] bt state:' + JSON.stringify(state));
-        console.info('[bluetooth_js] disable end');
+        done();
     })
 
 })
+
diff --git a/communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js b/communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js
index c2d29726e1137a5aed07fcaf5ae49c1283331410..c216faa0dec4f3cee043fd6644014c3402dc6fbd 100644
--- a/communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js
+++ b/communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js
@@ -85,6 +85,7 @@ describe('ACTS_WifiTest', function () {
             console.info("[wifi_js]getCurrentGroup promise then error." + JSON.stringify(error));
             expect().assertFail();
         });
+        done();
        
     })
 
@@ -93,7 +94,7 @@ describe('ACTS_WifiTest', function () {
     * @tc.name       SUB_Communication_WiFi_P2P_Config_0002
     * @tc.desc       Test getCurrentGroup callback infos
     */
-    it('SUB_Communication_WiFi_P2P_Config_0001', 0, async function(done) {
+    it('SUB_Communication_WiFi_P2P_Config_0002', 0, async function(done) {
         await tryToEnableWifi();
         var WifiP2PConfig = {
             deviceAddress : "00:00:00:00:00:00",
diff --git a/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js b/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js
index fa6c684d9ab35dfdce9c1232f1bcd74d377dcdad..5f6b2cac99d4c1aac03a18bbaccd9c18e12db2b5 100644
--- a/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js
+++ b/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js
@@ -806,11 +806,8 @@ describe('ACTS_WifiTest', function() {
                  + result.frequency +"snr:" + result.snr+
                 "macAddress: " + result.macAddress + "ipAddress: " + result.ipAddress + 
                 "suppState: " + result.suppState + "connState: " + result.connState);
-                expect(true).assertEqual(result.connState==ConnState.CONNECTING);
-                expect(false).assertEqual(result.suppState==suppState.DISCONNECTED);
                 done();
-            });
-        await sleep(2000);    
+            });   
     })
 
    /**