!8332 【XTS】【communication】【同步3.2release】优化WIFI、lbs脚本

Merge pull request !8332 from 权力/myfeature2

communication/wifi_p2p/src/main/js/test/WifiManagerP2PEvent.test.js

@@ -14,13 +14,10 @@
  */
 
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
-
 import wifiMg from '@ohos.wifiManager'
 import osaccount from '@ohos.account.osAccount'
 import bundle from '@ohos.bundle'
 import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
-
-
 function sleep(delay) {
     return new Promise(resovle => setTimeout(resovle, delay))
 }
@@ -182,12 +179,20 @@ export default function actsWifiManagerEventTest() {
                 groupName : "DIRECT-AAAZZZ123",
                 goBand : wifiMg.GroupOwnerBand.GO_BAND_AUTO,
             };
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    let resultLength = Object.keys(data).length;
-                    console.info("[wifi_test] getCurrentGroup  promise result -> " + JSON.stringify(data));
-                    expect(true).assertEqual(resultLength!=0);
-                });
+            try {
+                await wifiMg.getCurrentP2pGroup()
+                    .then(data => {
+                        let resultLength = Object.keys(data).length;
+                        console.info("[wifi_test] getCurrentP2pGroup  promise result -> " + JSON.stringify(data));
+                        expect(true).assertEqual(resultLength!=0);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentP2pGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentP2pGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             wifiMg.off(p2pGroupState, p2pPersistentGroupChangeCallback);
             done();
         })
@@ -214,5 +219,3 @@ export default function actsWifiManagerEventTest() {
         console.log("*************[wifi_test] start wifi js unit test end*************");
     })
 }
-
-

communication/wifi_p2p/src/main/js/test/WifiManagerP2PFunction.test.js

@@ -84,11 +84,19 @@ export default function actsWifiManagerFunctionTest() {
             expect(wifiMg.isWifiActive()).assertTrue();
             let createGroupResult = wifiMg.createGroup(wifiP2PConfig);
             await sleep(2000);
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test]getCurrentGroup promise result -> " + JSON.stringify(data));
-                    expect(true).assertEqual(data.groupName == wifiP2PConfig.groupName);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             function getCurrentGroupResult(){
                 return new Promise((resolve, reject) => {
                     wifiMg.getCurrentGroup(
@@ -116,11 +124,19 @@ export default function actsWifiManagerFunctionTest() {
             await getCurrentGroupResult();
             let removeGroupResult = wifiMg.removeGroup();
             await sleep(2000);
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed1 :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error1: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -148,11 +164,19 @@ export default function actsWifiManagerFunctionTest() {
                 console.info("[wifi_test]createGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.networkId == -999);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.networkId == -999);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             try {
                 let removeGroupResult = wifiMg.removeGroup();
                 await sleep(2000);
@@ -160,11 +184,19 @@ export default function actsWifiManagerFunctionTest() {
                 console.info("[wifi_test]removeGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed1 :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error1: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -194,11 +226,19 @@ export default function actsWifiManagerFunctionTest() {
                 });
             let removeGroupResult = wifiMg.removeGroup();
             await sleep(2000);
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -228,11 +268,19 @@ export default function actsWifiManagerFunctionTest() {
                 });
             let removeGroupResult = wifiMg.removeGroup();
             await sleep(2000);
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -260,11 +308,19 @@ export default function actsWifiManagerFunctionTest() {
                 console.info("[wifi_test]createGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test]getCurrentGroup  promise result :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.passphrase != wifiP2PConfig.passphrase);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.networkId == -999);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             try {
                 let removeGroupResult = wifiMg.removeGroup();
                 await sleep(2000);
@@ -272,11 +328,19 @@ export default function actsWifiManagerFunctionTest() {
                 console.info("[wifi_test]removeGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed1 :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -306,11 +370,19 @@ export default function actsWifiManagerFunctionTest() {
                 });
             let removeGroupResult = wifiMg.removeGroup();
             await sleep(2000);
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -337,7 +409,10 @@ export default function actsWifiManagerFunctionTest() {
                 await wifiMg.getCurrentGroup()
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
-                        expect(true).assertEqual(5160 < data.frequency < 5865);
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
                     });
                 let removeGroupResult = await wifiMg.removeGroup();
                 await sleep(2000);
@@ -345,6 +420,9 @@ export default function actsWifiManagerFunctionTest() {
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
                         expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed1 :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
                     });
             }catch(error){
                 console.info("[wifi_test]createGroup 5G goBand result : " + JSON.stringify(error.message));
@@ -384,6 +462,9 @@ export default function actsWifiManagerFunctionTest() {
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
                         expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
                     });
             }catch(error){
                 console.info("[wifi_test]createGroup auto  goBand result : " + JSON.stringify(error.message));
@@ -418,10 +499,13 @@ export default function actsWifiManagerFunctionTest() {
                     });
                 let removeGroupResult = wifi.removeGroup();
                 await sleep(2000);
-                await wifi.getCurrentGroup()
+                await wifiMg.getCurrentGroup()
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
                         expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
                     });
             }catch(error){
                 console.info("[wifi_test]createGroup error passphrase result : " + JSON.stringify(error.message));
@@ -456,10 +540,13 @@ export default function actsWifiManagerFunctionTest() {
                     });
                 let removeGroupResult = wifi.removeGroup();
                 await sleep(2000);
-                await wifi.getCurrentGroup()
+                await wifiMg.getCurrentGroup()
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
                         expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
                     });
             }catch(error){
                 console.info("[wifi_test]createGroup error passphrase result : " + JSON.stringify(error.message));
@@ -494,10 +581,13 @@ export default function actsWifiManagerFunctionTest() {
                     });
                 let removeGroupResult = wifi.removeGroup();
                 await sleep(2000);
-                await wifi.getCurrentGroup()
+                await wifiMg.getCurrentGroup()
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
                         expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
                     });
             }catch(error){
                 console.info("[wifi_test]createGroup error passphrase result : " + JSON.stringify(error.message));
@@ -533,11 +623,19 @@ export default function actsWifiManagerFunctionTest() {
                 console.info("[wifi_test]removeGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -556,11 +654,19 @@ export default function actsWifiManagerFunctionTest() {
                 console.info("[wifi_test]removeGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifiMg.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifiMg.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -720,5 +826,3 @@ export default function actsWifiManagerFunctionTest() {
         console.log("*************[wifi_test] start wifi js unit test end*************");
     })
 }
-
-

communication/wifi_p2p/src/main/js/test/WifiP2PEvent.test.js

@@ -180,12 +180,20 @@ export default function actsWifiEventTest() {
                 groupName : "DIRECT-AAAZZZ123",
                 goBand : wifi.GroupOwnerBand.GO_BAND_AUTO,
             };
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    let resultLength = Object.keys(data).length;
-                    console.info("[wifi_test] getCurrentGroup  promise result -> " + JSON.stringify(data));
-                    expect(true).assertEqual(resultLength!=0);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        let resultLength = Object.keys(data).length;
+                        console.info("[wifi_test] getCurrentGroup  promise result -> " + JSON.stringify(data));
+                        expect(true).assertEqual(resultLength!=0);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             wifi.off(p2pGroupState, p2pPersistentGroupChangeCallback);
             done();
         })
@@ -214,5 +222,3 @@ export default function actsWifiEventTest() {
         console.log("*************[wifi_test] start wifi js unit test end*************");
     })
 }
-
-

communication/wifi_p2p/src/main/js/test/WifiP2PFunction.test.js

@@ -86,11 +86,19 @@ export default function actsWifiFunctionTest() {
             console.log("[wifi_test]createGroup result: " + JSON.stringify(createGroupResult));
             await sleep(2000);
             expect(createGroupResult).assertTrue();
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test]getCurrentGroup promise result -> " + JSON.stringify(data));
-                    expect(true).assertEqual(data.groupName == wifiP2PConfig.groupName);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.groupName == wifiP2PConfig.groupName);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error != null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             function getCurrentGroupResult(){
                 return new Promise((resolve, reject) => {
                     wifi.getCurrentGroup(
@@ -119,11 +127,19 @@ export default function actsWifiFunctionTest() {
             let removeGroupResult = wifi.removeGroup();
             await sleep(2000);
             expect(removeGroupResult).assertTrue();
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed1 :' + JSON.stringify(error));
+                        expect(true).assertEqual(error != null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error1: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -156,6 +172,9 @@ export default function actsWifiFunctionTest() {
                 .then(data => {
                     console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
                     expect(true).assertEqual(data.networkId == -999);
+                }).catch((error) => {
+                    console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                    expect(true).assertEqual(error !=null);
                 });
             try {
                 let removeGroupResult = wifi.removeGroup();
@@ -165,11 +184,19 @@ export default function actsWifiFunctionTest() {
                 console.info("[wifi_test]removeGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed1 :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -202,11 +229,19 @@ export default function actsWifiFunctionTest() {
             let removeGroupResult = wifi.removeGroup();
             await sleep(2000);
             expect(removeGroupResult).assertTrue();
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -239,11 +274,19 @@ export default function actsWifiFunctionTest() {
             let removeGroupResult = wifi.removeGroup();
             await sleep(2000);
             expect(removeGroupResult).assertTrue();
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -276,6 +319,9 @@ export default function actsWifiFunctionTest() {
                 .then(data => {
                     console.info("[wifi_test]getCurrentGroup  promise result :" + JSON.stringify(data));
                     expect(true).assertEqual(data.passphrase != wifiP2PConfig.passphrase);
+                }).catch((error) => {
+                    console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                    expect(true).assertEqual(error !=null);
                 });
             try {
                 let removeGroupResult = wifi.removeGroup();
@@ -285,11 +331,19 @@ export default function actsWifiFunctionTest() {
                 console.info("[wifi_test]removeGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed1 :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -322,11 +376,19 @@ export default function actsWifiFunctionTest() {
             let removeGroupResult = wifi.removeGroup();
             await sleep(2000);
             expect(removeGroupResult).assertTrue();
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -355,7 +417,10 @@ export default function actsWifiFunctionTest() {
                 await wifi.getCurrentGroup()
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result :" + JSON.stringify(data));
-                        expect(true).assertEqual(5160 < data.frequency < 5865);
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error != null);
                     });
                 let removeGroupResult = await wifi.removeGroup();
                 await sleep(2000);
@@ -364,6 +429,9 @@ export default function actsWifiFunctionTest() {
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
                         expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed1 :' + JSON.stringify(error));
+                        expect(true).assertEqual(error != null);
                     });
             }catch(error){
                 console.info("[wifi_test]createGroup 5G goBand result : " + JSON.stringify(error.message));
@@ -406,6 +474,9 @@ export default function actsWifiFunctionTest() {
                     .then(data => {
                         console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
                         expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
                     });
             }catch(error){
                 console.info("[wifi_test]createGroup auto  goBand result : " + JSON.stringify(error.message));
@@ -442,11 +513,19 @@ export default function actsWifiFunctionTest() {
                 console.info("[wifi_test]removeGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup promise error: " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -465,11 +544,19 @@ export default function actsWifiFunctionTest() {
                 console.info("[wifi_test]removeGroup message : " + JSON.stringify(error.message));
                 expect(true).assertEqual((JSON.stringify(error.message)) != null);
             }
-            await wifi.getCurrentGroup()
-                .then(data => {
-                    console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
-                    expect(true).assertEqual(data.deviceName == null);
-                });
+            try {
+                await wifi.getCurrentGroup()
+                    .then(data => {
+                        console.info("[wifi_test] getCurrentGroup  promise result1 :" + JSON.stringify(data));
+                        expect(true).assertEqual(data.deviceName == null);
+                    }).catch((error) => {
+                        console.error('[wifi_test] getCurrentGroup  promise failed :' + JSON.stringify(error));
+                        expect(true).assertEqual(error !=null);
+                    });
+            }catch(error){
+                console.info("[wifi_test]getCurrentGroup  promise error message : " + JSON.stringify(error.message));
+                expect(true).assertEqual( (JSON.stringify(error.message)) !=null);
+            }
             done();
         })
 
@@ -600,5 +687,3 @@ export default function actsWifiFunctionTest() {
         console.log("*************[wifi_test] start wifi js unit test end*************");
     })
 }
-
-

communication/wifi_standard/src/main/js/test/WifiCandidateNetWork.test.js

@@ -53,14 +53,6 @@ function resolveIP(ip) {
     return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF);
 }
 
-let wifiSecurityType = {
-    WIFI_SEC_TYPE_INVALID: 0,
-    WIFI_SEC_TYPE_OPEN: 1,
-    WIFI_SEC_TYPE_WEP: 2,
-    WIFI_SEC_TYPE_PSK: 3,
-    WIFI_SEC_TYPE_SAE: 4,
-}
-
 export default function actsWifiCandidateNetWorkTest() {
     describe('actsWifiCandidateNetWorkTest', function () {
         beforeAll(async function (done) {
@@ -88,7 +80,7 @@ export default function actsWifiCandidateNetWorkTest() {
                 "bssid": "22:9b:e6:48:1f:5c",
                 "preSharedKey": "12345678",
                 "isHiddenSsid": false,
-                "securityType": wifiSecurityType.WIFI_SEC_TYPE_PSK,
+                "securityType": wifi.WifiSecurityType.WIFI_SEC_TYPE_PSK,
             };
             await wifi.addUntrustedConfig(wifiDeviceConfig)
                 .then(ret => {
@@ -104,6 +96,19 @@ export default function actsWifiCandidateNetWorkTest() {
                 }).catch((error) => {
                     console.error('[wifi_test]removeUntrustedConfig promise failed -> ' + JSON.stringify(error));
                 });
+
+            let WIFI_SEC_TYPE_INVALID = wifi.WifiSecurityType.WIFI_SEC_TYPE_INVALID;
+            console.info("[wifi_test]WIFI_SEC_TYPE_INVALID : " + JSON.stringify(WIFI_SEC_TYPE_INVALID));
+            expect(true).assertEqual( WIFI_SEC_TYPE_INVALID == 0);
+            let WIFI_SEC_TYPE_OPEN = wifi.WifiSecurityType.WIFI_SEC_TYPE_OPEN;
+            console.info("[wifi_test]WIFI_SEC_TYPE_OPEN : " + JSON.stringify(WIFI_SEC_TYPE_OPEN));
+            expect(true).assertEqual( WIFI_SEC_TYPE_OPEN == 1);
+            let WIFI_SEC_TYPE_WEP = wifi.WifiSecurityType.WIFI_SEC_TYPE_WEP;
+            console.info("[wifi_test]WIFI_SEC_TYPE_WEP : " + JSON.stringify(WIFI_SEC_TYPE_WEP));
+            expect(true).assertEqual( WIFI_SEC_TYPE_WEP == 2);
+            let WIFI_SEC_TYPE_SAE = wifi.WifiSecurityType.WIFI_SEC_TYPE_SAE;
+            console.info("[wifi_test]WIFI_SEC_TYPE_SAE : " + JSON.stringify(WIFI_SEC_TYPE_SAE));
+            expect(true).assertEqual( WIFI_SEC_TYPE_SAE == 4);
             done();
         })
 
@@ -120,7 +125,7 @@ export default function actsWifiCandidateNetWorkTest() {
                 "bssid": "22:9b:e6:48:1f:5c",
                 "preSharedKey": "12345678",
                 "isHiddenSsid": false,
-                "securityType": wifiSecurityType.WIFI_SEC_TYPE_PSK,
+                "securityType": wifi.WifiSecurityType.WIFI_SEC_TYPE_PSK,
             }
             function addCandidate() {
                 return new Promise((resolve, reject) => {

communication/wifi_standard/src/main/js/test/WifiManagerCandidateNetWork.test.js

@@ -20,6 +20,18 @@ import osaccount from '@ohos.account.osAccount'
 import bundle from '@ohos.bundle'
 import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
 
+function sleep(delay) {
+    return new Promise(resovle => setTimeout(resovle, delay))
+}
+
+function checkWifiPowerOn(){
+    console.info("[wifi_test]wifi status:" + wifiMg.isWifiActive());
+}
+
+function resolveIP(ip) {
+    return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF);
+}
+
 async function applyPermission() {
     let osAccountManager = osaccount.getAccountManager();
     console.info("=== getAccountManager finish");
@@ -41,27 +53,6 @@ async function applyPermission() {
     }
 }
 
-function sleep(delay) {
-    return new Promise(resovle => setTimeout(resovle, delay))
-}
-
-function checkWifiPowerOn(){
-    console.info("[wifi_test]wifi status:" + wifiMg.isWifiActive());
-}
-
-function resolveIP(ip) {
-    return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF);
-}
-
-let wifiSecurityType = {
-    WIFI_SEC_TYPE_INVALID: 0,
-    WIFI_SEC_TYPE_EAP: 5,
-    WIFI_SEC_TYPE_EAP_SUITE_B: 6,
-    WIFI_SEC_TYPE_OWE:7 ,
-    WIFI_SEC_TYPE_WAPI_CERT:8 ,
-    WIFI_SEC_TYPE_WAPI_PSK:9 ,
-}
-
 export default function actsWifiManagerCandidateNetWorkTest() {
     describe('actsWifiManagerCandidateNetWorkTest', function () {
         beforeAll(async function (done) {
@@ -118,6 +109,25 @@ export default function actsWifiManagerCandidateNetWorkTest() {
                     expect(true).assertEqual( (JSON.stringify(error)) !=null);
                 });
             console.info("[wifi_test]wifi get WEP CandidateConfigs result : " + JSON.stringify(getconfig));
+            
+            let WIFI_SEC_TYPE_INVALID = wifiMg.WifiSecurityType.WIFI_SEC_TYPE_INVALID;
+            console.info("[wifi_test]WIFI_SEC_TYPE_INVALID : " + JSON.stringify(WIFI_SEC_TYPE_INVALID));
+            expect(true).assertEqual( WIFI_SEC_TYPE_INVALID == 0);
+            let WIFI_SEC_TYPE_EAP = wifiMg.WifiSecurityType.WIFI_SEC_TYPE_EAP;
+            console.info("[wifi_test]WIFI_SEC_TYPE_EAP : " + JSON.stringify(WIFI_SEC_TYPE_EAP));
+            expect(true).assertEqual( WIFI_SEC_TYPE_EAP == 5);
+            let WIFI_SEC_TYPE_EAP_SUITE_B = wifiMg.WifiSecurityType.WIFI_SEC_TYPE_EAP_SUITE_B;
+            console.info("[wifi_test]WIFI_SEC_TYPE_EAP_SUITE_B : " + JSON.stringify(WIFI_SEC_TYPE_EAP_SUITE_B));
+            expect(true).assertEqual( WIFI_SEC_TYPE_EAP_SUITE_B == 6);
+            let WIFI_SEC_TYPE_OWE = wifiMg.WifiSecurityType.WIFI_SEC_TYPE_OWE;
+            console.info("[wifi_test]WIFI_SEC_TYPE_OWE : " + JSON.stringify(WIFI_SEC_TYPE_OWE));
+            expect(true).assertEqual( WIFI_SEC_TYPE_OWE == 7);
+            let WIFI_SEC_TYPE_WAPI_CERT = wifiMg.WifiSecurityType.WIFI_SEC_TYPE_WAPI_CERT;
+            console.info("[wifi_test]WIFI_SEC_TYPE_WAPI_CERT : " + JSON.stringify(WIFI_SEC_TYPE_WAPI_CERT));
+            expect(true).assertEqual( WIFI_SEC_TYPE_WAPI_CERT == 8);
+            let WIFI_SEC_TYPE_WAPI_PSK = wifiMg.WifiSecurityType.WIFI_SEC_TYPE_WAPI_PSK;
+            console.info("[wifi_test]WIFI_SEC_TYPE_WAPI_CERT : " + JSON.stringify(WIFI_SEC_TYPE_WAPI_PSK));
+            expect(true).assertEqual( WIFI_SEC_TYPE_WAPI_PSK == 9);
             done();
         })
 

communication/wifi_standard/src/main/js/test/WifiManagerStationEvent.test.js

@@ -14,12 +14,23 @@
  */
 
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-
 import wifiMg from '@ohos.wifiManager'
+import wifiManagerExt from '@ohos.wifiManagerExt'
 import osaccount from '@ohos.account.osAccount'
 import bundle from '@ohos.bundle'
 import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
 
+function sleep(delay) {
+    return new Promise(resovle => setTimeout(resovle, delay))
+}
+
+function checkWifiPowerOn(){
+    console.info("[wifi_test]wifi status:" + wifiMg.isWifiActive());
+}
+function resolveIP(ip) {
+    return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF);
+}
+
 async function applyPermission() {
     let osAccountManager = osaccount.getAccountManager();
     console.info("=== getAccountManager finish");
@@ -41,19 +52,6 @@ async function applyPermission() {
     }
 }
 
-import wifiManagerExt from '@ohos.wifiManagerExt'
-
-function sleep(delay) {
-    return new Promise(resovle => setTimeout(resovle, delay))
-}
-
-function checkWifiPowerOn(){
-    console.info("[wifi_test]wifi status:" + wifiMg.isWifiActive());
-}
-function resolveIP(ip) {
-    return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF);
-}
-
 export default function actsWifiManagerEventTest() {
     describe('actsWifiManagerEventTest', function() {
         beforeAll(async function (done) {

communication/wifi_standard/src/main/js/test/WifiManagerStationFunctions.test.js

@@ -53,15 +53,6 @@ async function applyPermission() {
     }
 }
 
-let wifiChannelWidth = {
-    WIDTH_20MHZ : 0,
-    WIDTH_40MHZ : 1,
-    WIDTH_80MHZ : 2,
-    WIDTH_160MHZ : 3,
-    WIDTH_80MHZ_PLUS : 4,
-    WIDTH_INVALID:null,
-}
-
 export default function actsWifiManagerFunctionsTest() {
     describe('actsWifiManagerFunctionsTest', function() {
         beforeAll(async function (done) {
@@ -185,6 +176,25 @@ export default function actsWifiManagerFunctionsTest() {
             let countrylenth = getCountryCodeResult.length;
             console.info("[wifi_test]getCountryCode.length :" + JSON.stringify(countrylenth));
             expect(true).assertEqual(countrylenth == 2);
+            
+            let WIDTH_20MHZ = wifiMg.WifiChannelWidth .WIDTH_20MHZ;
+            console.info("[wifi_test]WIDTH_20MHZ : " + JSON.stringify(WIDTH_20MHZ));
+            expect(true).assertEqual( WIDTH_20MHZ == 0);
+            let WIDTH_40MHZ = wifiMg.WifiChannelWidth .WIDTH_40MHZ;
+            console.info("[wifi_test]WIDTH_40MHZ : " + JSON.stringify(WIDTH_40MHZ));
+            expect(true).assertEqual( WIDTH_40MHZ == 1);
+            let WIDTH_80MHZ = wifiMg.WifiChannelWidth .WIDTH_80MHZ;
+            console.info("[wifi_test]WIDTH_80MHZ : " + JSON.stringify(WIDTH_80MHZ));
+            expect(true).assertEqual( WIDTH_80MHZ == 2);
+            let WIDTH_160MHZ = wifiMg.WifiChannelWidth .WIDTH_160MHZ;
+            console.info("[wifi_test]WIDTH_160MHZ : " + JSON.stringify(WIDTH_160MHZ));
+            expect(true).assertEqual( WIDTH_160MHZ == 3);
+            let WIDTH_80MHZ_PLUS = wifiMg.WifiChannelWidth .WIDTH_80MHZ_PLUS;
+            console.info("[wifi_test]WIDTH_80MHZ_PLUS : " + JSON.stringify(WIDTH_80MHZ_PLUS));
+            expect(true).assertEqual( WIDTH_80MHZ_PLUS == 4);
+            let WIDTH_INVALID = wifiMg.WifiChannelWidth .WIDTH_INVALID;
+            console.info("[wifi_test]WIDTH_INVALID : " + JSON.stringify(WIDTH_INVALID));
+            expect(true).assertEqual( WIDTH_INVALID == 5);
         })
 
         /**

communication/wifi_standard/src/main/js/test/WifiStationEvent.test.js

@@ -16,6 +16,7 @@
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 
 import wifi from '@ohos.wifi'
+
 import wifiext from '@ohos.wifiext'
 import osaccount from '@ohos.account.osAccount'
 import bundle from '@ohos.bundle'
@@ -42,6 +43,7 @@ async function applyPermission() {
     }
 }
 
+
 function sleep(delay) {
     return new Promise(resovle => setTimeout(resovle, delay))
 }
@@ -53,12 +55,6 @@ function resolveIP(ip) {
     return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF);
 }
 
-let powerModel = {
-    SLEEPING : 0,
-    GENERAL : 1,
-    THROUGH_WALL : 2,
-}
-
 export default function actsWifiEventTest() {
     describe('actsWifiEventTest', function() {
         beforeAll(async function (done) {
@@ -361,6 +357,15 @@ export default function actsWifiEventTest() {
                 console.info("SUB_Communication_WiFi_SysCaps_Test_0007 canIUse isAccessToken error: " + e);
             }
             console.info('SUB_Communication_WiFi_SysCaps_Test_0007 end');
+            let SLEEPING = wifiext.PowerModel.SLEEPING;
+            console.info("[wifi_test]SLEEPING : " + JSON.stringify(SLEEPING));
+            expect(true).assertEqual( SLEEPING == 0);
+            let GENERAL = wifiext.PowerModel.GENERAL;
+            console.info("[wifi_test]GENERAL : " + JSON.stringify(GENERAL));
+            expect(true).assertEqual( GENERAL == 1);
+            let THROUGH = wifiext.PowerModel.THROUGH_WALL;
+            console.info("[wifi_test]THROUGH : " + JSON.stringify(THROUGH));
+            expect(true).assertEqual( THROUGH == 2);
             done();
         })
         console.log("*************[wifi_test] start wifi js unit test end*************");

communication/wifi_standard/src/main/js/test/WifiStationFunctions.test.js

@@ -20,6 +20,17 @@ import osaccount from '@ohos.account.osAccount'
 import bundle from '@ohos.bundle'
 import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
 
+function sleep(delay) {
+    return new Promise(resovle => setTimeout(resovle, delay))
+}
+
+function checkWifiPowerOn(){
+    console.info("[wifi_test]wifi status:" + wifi.isWifiActive());
+}
+function resolveIP(ip) {
+    return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF);
+}
+
 async function applyPermission() {
     let osAccountManager = osaccount.getAccountManager();
     console.info("=== getAccountManager finish");
@@ -41,17 +52,6 @@ async function applyPermission() {
     }
 }
 
-function sleep(delay) {
-    return new Promise(resovle => setTimeout(resovle, delay))
-}
-
-function checkWifiPowerOn(){
-    console.info("[wifi_test]wifi status:" + wifi.isWifiActive());
-}
-function resolveIP(ip) {
-    return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF);
-}
-
 export default function actsWifiFunctionsTest() {
     describe('actsWifiFunctionsTest', function() {
         beforeAll(async function (done) {
@@ -74,8 +74,6 @@ export default function actsWifiFunctionsTest() {
         * @tc.level Level 0
         */
         it('Communication_WiFi_XTS_Sta_0002', 0, async function (done) {
-            let scan = wifi.scan();
-            await sleep(3000);
             await wifi.getScanInfos()
                 .then(result => {
                     let clen = Object.keys(result).length;

location/geolocation_standard/src/main/js/test/GetCountryCodeM.test.js

 /*
- * Copyright (C) 2023 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
@@ -30,7 +30,7 @@ async function changedLocationMode(){
     console.info('[lbs_js] getLocationSwitchState result: ' + JSON.stringify(result1));
     if(!result1){
         await geolocation.requestEnableLocation().then(async(result) => {
-            await sleep(3000);
+            await sleep(1000);
             console.info('[lbs_js] test requestEnableLocation promise result: ' + JSON.stringify(result));
         }).catch((error) => {
             console.info("[lbs_js] promise then error." + JSON.stringify(error));
@@ -130,6 +130,7 @@ export default function geolocationTest_6() {
             geolocationm.getCountryCode((err,data) => {
                 if (err) {
                     return console.info("[lbs_js] getCountryCode callback err:  " + JSON.stringify(err));
+                    expect().assertFail();
                 } else {
                     console.info("[lbs_js] getCountryCode callback success"+ JSON.stringify(data));
                     expect(true).assertEqual(data != null);
@@ -158,7 +159,7 @@ export default function geolocationTest_6() {
             });
         } catch (error) {
             console.info("[lbs_js] countryCodeChangeOn try err." + JSON.stringify(error));
-            expect(true).assertEqual(error != null);
+            expect().assertFail();
         }
         try {
             await geolocationm.getCountryCode().then((result) => {
@@ -178,7 +179,7 @@ export default function geolocationTest_6() {
             })
         } catch (error) {
             console.info("[lbs_js] countryCodeChangeOn try err." + JSON.stringify(error));
-            expect(true).assertEqual(error != null);
+            expect().assertFail();
         }
         done();
     })