fixed 92ffde9b from https://gitee.com/q00313334/xts_acts/pulls/2319

xts 3568 testcase runtime
Signed-off-by: Nq00313334 <quanli1@huawei.com>

communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js

@@ -80,24 +80,29 @@ describe('bluetoothhostTest', function() {
      */
     it('bluetooth_classic_enable_bluetooth_001', 0, async function (done) {
         console.info('[bluetooth_js] enable start');
-        var enable = bluetooth.enableBluetooth();
-        expect(enable).assertEqual(true);
-        console.info('[bluetooth_js] enable On = '+ JSON.stringify(enable));
+        var sta = bluetooth.getState();
+        switch(sta){
+            case 0:
+                var enable = bluetooth.enableBluetooth();
+                console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                expect(enable).assertEqual(true);
+                break;
+            case 1:
+                console.info('[bluetooth_js] bt turning on:'+ JSON.stringify(sta));
+                break;
+            case 2:
+                console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
+                break;
+            case 3:
+                var enable = bluetooth.enableBluetooth();
+                console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                break;
+            default:
+                console.info('[bluetooth_js] enable success');
+            }
         await sleep(2000);
         var state = bluetooth.getState();
         console.info('[bluetooth_js] getState On = '+ JSON.stringify(state));
-        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();
     })

communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js

@@ -66,22 +66,27 @@ describe('bluetoothhostTest', function() {
                 done();
             }
         }
-        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));
-        var enable = bluetooth.enableBluetooth();
-        expect(enable).assertEqual(true);
-        console.info('[bluetooth_js] enable On = '+ JSON.stringify(enable));
-        await sleep(4000);
+        var sta = bluetooth.getState();
+        switch(sta){
+            case 0:
+                var enable = bluetooth.enableBluetooth();
+                console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                expect(enable).assertEqual(true);
+                break;
+            case 1:
+                console.info('[bluetooth_js] bt turning on:'+ JSON.stringify(sta));
+                break;
+            case 2:
+                console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
+                break;
+            case 3:
+                var enable = bluetooth.enableBluetooth();
+                console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                break;
+            default:
+                console.info('[bluetooth_js] enable success');
+            }
+        await sleep(2000);
         var state = bluetooth.getState();
         console.info('[bluetooth_js] getState On = '+ JSON.stringify(state));
         await bluetooth.off('stateChange', result => {

communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js

@@ -73,9 +73,26 @@ describe('bluetoothhostTest', function() {
      */
     it('bluetooth_classic_enable_bluetooth_001', 0, async function (done) {
         console.info('[bluetooth_js] enable start');
-        var enable = bluetooth.enableBluetooth();
-        expect(enable).assertEqual(true);
-        console.info('[bluetooth_js] enable On = '+ JSON.stringify(enable));
+        var sta = bluetooth.getState();
+        switch(sta){
+            case 0:
+                var enable = bluetooth.enableBluetooth();
+                console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                expect(enable).assertEqual(true);
+                break;
+            case 1:
+                console.info('[bluetooth_js] bt turning on:'+ JSON.stringify(sta));
+                break;
+            case 2:
+                console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
+                break;
+            case 3:
+                var enable = bluetooth.enableBluetooth();
+                console.info('[bluetooth_js] enable0 = '+ JSON.stringify(enable));
+                break;
+            default:
+                console.info('[bluetooth_js] enable success');
+            }
         await sleep(2000);
         var state = bluetooth.getState();
         console.info('[bluetooth_js] getState On = '+ JSON.stringify(state));

communication/wifi_hotspot/src/main/js/default/test/WifiSoftAP.test.js

@@ -137,7 +137,7 @@ describe('ACTS_WifiTest', function() {
     /**
     * @tc.number     CONFIG_0003
     * @tc.name       SUB_Communication_WiFi_Hotspot_Config_0003
-    * @tc.desc       Test set a invalid  hotspot config
+    * @tc.desc       Test set a invalid band hotspot config
     * @tc.level Level 2
     */
     it('SUB_Communication_WiFi_Hotspot_Config_0003', 0, async function (done) {
@@ -200,6 +200,10 @@ describe('ACTS_WifiTest', function() {
         var isSuccess1 = wifi.setHotspotConfig(HotspotConfigM1);
         console.log("[wifi_test] set 65 preSharedKey invalid hotspot config  result: " + isSuccess1);
         expect(isSuccess1).assertFalse();
+        console.info("[wifi_test] check band of current band should be 5G.");
+        var hotspotConfigS= wifi.getHotspotConfig();
+        console.log("[wifi_test] getHotspotConfig  result: " + JSON.stringify(hotspotConfigS));
+        expect(hotspotConfigS.preSharedKey.length).assertEqual(63);
         done();
     })
 
@@ -296,7 +300,7 @@ describe('ACTS_WifiTest', function() {
         console.log("[wifi_test] check current hotspot config preSharedKey is 8bit" );
         var config = wifi.getHotspotConfig();
         console.info("[wifi_test] getHotspotConfig result -> " + JSON.stringify(config));
-        console.info("preSharedKey: " + config.ssid);
+        console.info("ssid: " + config.ssid);
         expect(config.ssid.length).assertEqual(32);
         done();
 
@@ -566,10 +570,10 @@ describe('ACTS_WifiTest', function() {
         console.log("[wifi_test] set a psk preSharedKey hotspot config result1: " + isSuccess1);
         expect(isSuccess1).assertTrue();
         console.log("[wifi_test] check current hotspot config preSharedKey is 8bit" );
-        var configs = wifi.getHotspotConfig();
-        console.info("[wifi_test] getHotspotConfig result -> " + JSON.stringify(configs));
-        console.info("ssid: " + configs.ssid);
-        expect(configs.ssid).assertEqual('WIFITEST');
+        var config = wifi.getHotspotConfig();
+        console.info("[wifi_test] getHotspotConfig result -> " + JSON.stringify(config));
+        console.info("ssid: " + config.ssid);
+        expect(config.ssid).assertEqual('WIFITEST');
         done();
 
     })