From cb1354300731741b7bd019dc3eccb1a93f99b316 Mon Sep 17 00:00:00 2001 From: quanli Date: Wed, 1 Mar 2023 09:53:57 +0800 Subject: [PATCH] quanli1@huawei.com Signed-off-by: quanli --- .../main/js/test/WifiManagerP2PEvent.test.js | 12 +- .../js/test/WifiManagerP2PFunction.test.js | 140 ++++++++++-------- .../src/main/js/test/WifiP2PFunction.test.js | 10 +- .../main/js/test/WifiCandidateNetWork.test.js | 1 - .../test/WifiManagerCandidateNetWork.test.js | 2 - .../js/test/WifiManagerStationEvent.test.js | 1 - .../test/WifiManagerStationFunctions.test.js | 90 ++++------- .../src/main/js/test/WifiStationEvent.test.js | 3 +- .../main/js/test/WifiStationFunctions.test.js | 3 - 9 files changed, 121 insertions(+), 141 deletions(-) diff --git a/communication/wifi_p2p/src/main/js/test/WifiManagerP2PEvent.test.js b/communication/wifi_p2p/src/main/js/test/WifiManagerP2PEvent.test.js index fce841954..fee1f3127 100644 --- a/communication/wifi_p2p/src/main/js/test/WifiManagerP2PEvent.test.js +++ b/communication/wifi_p2p/src/main/js/test/WifiManagerP2PEvent.test.js @@ -87,7 +87,7 @@ export default function actsWifiManagerEventTest() { }); await sleep(2000); wifiMg.off(p2pConnectionState, p2pConnectionChangeCallback); - let removeGroupResult = wifiMg.removeGroup(); + let removeP2pGroupResult = wifiMg.removeP2pGroup(); done(); }) @@ -122,9 +122,9 @@ export default function actsWifiManagerEventTest() { console.info("[wifi_test]p2pPeerDeviceChange callback, result: " + JSON.stringify(result)); } wifiMg.on(p2pPeerDeviceState, p2pPeerDeviceChangeCallback); - let startDiscover = wifiMg.startDiscoverDevices(); + let startDiscover = wifiMg.startDiscoverP2pDevices(); await sleep(3000); - let stopDiscover = wifiMg.stopDiscoverDevices(); + let stopDiscover = wifiMg.stopDiscoverP2pDevices(); wifiMg.off(p2pPeerDeviceState, p2pPeerDeviceChangeCallback); done(); }) @@ -149,7 +149,7 @@ export default function actsWifiManagerEventTest() { groupName : "AAAZZZ123", goBand : wifiMg.GroupOwnerBand.GO_BAND_AUTO, }; - let createGroupResult = wifiMg.createGroup(WifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(WifiP2PConfig); await (2000); try { await wifiMg.getCurrentP2pGroup() @@ -182,9 +182,9 @@ export default function actsWifiManagerEventTest() { console.info("[wifi_test]p2pDiscoveryChange callback, result: " + JSON.stringify(result)); } wifiMg.on(p2pPeerDeviceState, p2pDiscoveryChangeCallback); - let startDiscover = wifiMg.startDiscoverDevices(); + let startDiscover = wifiMg.startDiscoverP2pDevices(); await sleep(3000); - let stopDiscover = wifiMg.stopDiscoverDevices(); + let stopDiscover = wifiMg.stopDiscoverP2pDevices(); wifiMg.off(p2pPeerDeviceState, p2pDiscoveryChangeCallback); done(); }) diff --git a/communication/wifi_p2p/src/main/js/test/WifiManagerP2PFunction.test.js b/communication/wifi_p2p/src/main/js/test/WifiManagerP2PFunction.test.js index 6c0225771..befa875fb 100644 --- a/communication/wifi_p2p/src/main/js/test/WifiManagerP2PFunction.test.js +++ b/communication/wifi_p2p/src/main/js/test/WifiManagerP2PFunction.test.js @@ -37,8 +37,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0003 - * @tc.name testCreateGroup - * @tc.desc Test createGroup and getCurrentP2pGroup API Function + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup and getCurrentP2pGroup API Function * @tc.type Function * @tc.level Level 3 */ @@ -52,7 +52,7 @@ export default function actsWifiManagerFunctionTest() { }; console.log("[wifi_test]check the state of wifi: " + wifiMg.isWifiActive()); expect(wifiMg.isWifiActive()).assertTrue(); - let createGroupResult = wifiMg.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { @@ -84,7 +84,7 @@ export default function actsWifiManagerFunctionTest() { }); } await getCurrentP2pGroupResult(); - let removeGroupResult = wifiMg.removeGroup(); + let removeP2pGroupResult = wifiMg.removeP2pGroup(); await sleep(2000); try { await wifiMg.getCurrentP2pGroup() @@ -104,8 +104,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0004 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-Setting a 7-bit Key Function. + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-Setting a 7-bit Key Function. * @tc.type Function * @tc.level Level 3 */ @@ -119,14 +119,17 @@ export default function actsWifiManagerFunctionTest() { groupName: "test_pass", goBand: wifiMg.GroupOwnerBand.GO_BAND_2GHZ, }; - let createGroupResult = wifiMg.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { console.info("[wifi_test] getCurrentP2pGroup promise result :" + JSON.stringify(data)); expect(true).assertEqual(data.networkId == -999); + }).catch((error) => { + console.error('[wifi_test] getCurrentP2pGroup promise failed :' + JSON.stringify(error)); + expect(true).assertEqual(error !=null); }); - let removeGroupResult = wifiMg.removeGroup(); + let removeP2pGroupResult = wifiMg.removeP2pGroup(); await sleep(2000); try { await wifiMg.getCurrentP2pGroup() @@ -134,7 +137,7 @@ export default function actsWifiManagerFunctionTest() { console.info("[wifi_test] getCurrentP2pGroup promise result1 :" + JSON.stringify(data)); expect(true).assertEqual(data.deviceName == null); }).catch((error) => { - console.error('[wifi_test] getCurrentP2pGroup promise failed :' + JSON.stringify(error)); + console.error('[wifi_test] getCurrentP2pGroup promise failed1 :' + JSON.stringify(error)); expect(true).assertEqual(error !=null); }); }catch(error){ @@ -146,8 +149,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0104 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-Key setting: Chinese, English, and characters Function. + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-Key setting: Chinese, English, and characters Function. * @tc.type Function * @tc.level Level 3 */ @@ -161,14 +164,14 @@ export default function actsWifiManagerFunctionTest() { groupName: "test_pass1", goBand: wifiMg.GroupOwnerBand.GO_BAND_2GHZ, }; - let createGroupResult = wifiMg.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { console.info("[wifi_test]getCurrentP2pGroup promise result : " + JSON.stringify(data)); expect(true).assertEqual(data.passphrase == wifiP2PConfig.passphrase); }); - let removeGroupResult = wifiMg.removeGroup(); + let removeP2pGroupResult = wifiMg.removeP2pGroup(); await sleep(2000); try { await wifiMg.getCurrentP2pGroup() @@ -188,8 +191,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0204 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-Key setting 64 bit Function. + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-Key setting 64 bit Function. * @tc.type Function * @tc.level Level 3 */ @@ -203,14 +206,14 @@ export default function actsWifiManagerFunctionTest() { groupName: "test_pass2", goBand: wifiMg.GroupOwnerBand.GO_BAND_2GHZ, }; - let createGroupResult = wifiMg.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { console.info("[wifi_test]getCurrentP2pGroup promise result : " + JSON.stringify(data)); expect(true).assertEqual(data.passphrase == wifiP2PConfig.passphrase); }); - let removeGroupResult = wifiMg.removeGroup(); + let removeP2pGroupResult = wifiMg.removeP2pGroup(); await sleep(2000); try { await wifiMg.getCurrentP2pGroup() @@ -230,8 +233,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0304 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-Key setting 65 bitsFunction. + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-Key setting 65 bitsFunction. * @tc.type Function * @tc.level Level 3 */ @@ -245,14 +248,17 @@ export default function actsWifiManagerFunctionTest() { groupName: "test_pass3", goBand: wifiMg.GroupOwnerBand.GO_BAND_2GHZ, }; - let createGroupResult = wifiMg.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { console.info("[wifi_test]getCurrentP2pGroup promise result :" + JSON.stringify(data)); expect(true).assertEqual(data.passphrase != wifiP2PConfig.passphrase); + }).catch((error) => { + console.error('[wifi_test] getCurrentP2pGroup promise failed :' + JSON.stringify(error)); + expect(true).assertEqual(error !=null); }); - let removeGroupResult = wifiMg.removeGroup(); + let removeP2pGroupResult = wifiMg.removeP2pGroup(); await sleep(2000); try { await wifiMg.getCurrentP2pGroup() @@ -260,7 +266,7 @@ export default function actsWifiManagerFunctionTest() { console.info("[wifi_test] getCurrentP2pGroup promise result1 :" + JSON.stringify(data)); expect(true).assertEqual(data.deviceName == null); }).catch((error) => { - console.error('[wifi_test] getCurrentP2pGroup promise failed :' + JSON.stringify(error)); + console.error('[wifi_test] getCurrentP2pGroup promise failed1 :' + JSON.stringify(error)); expect(true).assertEqual(error !=null); }); }catch(error){ @@ -272,8 +278,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0007 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-2.4 GHz frequency band setting Function + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-2.4 GHz frequency band setting Function * @tc.type Function * @tc.level Level 0 */ @@ -287,14 +293,14 @@ export default function actsWifiManagerFunctionTest() { groupName : "test_band1", goBand : wifiMg.GroupOwnerBand.GO_BAND_2GHZ, }; - let createGroupResult = wifiMg.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { console.info("[wifi_test]getCurrentP2pGroup promise result :" + JSON.stringify(data)); expect(true).assertEqual(2412 < data.frequency < 2484 ); }); - let removeGroupResult = wifiMg.removeGroup(); + let removeP2pGroupResult = wifiMg.removeP2pGroup(); await sleep(2000); try { await wifiMg.getCurrentP2pGroup() @@ -314,8 +320,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0107 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-5 GHz frequency band setting Function + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-5 GHz frequency band setting Function * @tc.type Function * @tc.level Level 0 */ @@ -330,14 +336,14 @@ export default function actsWifiManagerFunctionTest() { groupName : "test_band2", goBand : wifiMg.GroupOwnerBand.GO_BAND_5GHZ, }; - let createGroupResult = wifiMg.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { console.info("[wifi_test] getCurrentP2pGroup promise result :" + JSON.stringify(data)); expect(true).assertEqual(5160 < data.frequency < 5865); }); - let removeGroupResult = await wifiMg.removeGroup(); + let removeP2pGroupResult = await wifiMg.removeP2pGroup(); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { @@ -348,7 +354,7 @@ export default function actsWifiManagerFunctionTest() { expect(true).assertEqual(error !=null); }); }catch(error){ - console.info("[wifi_test]createGroup 5G goBand result : " + JSON.stringify(error.message)); + console.info("[wifi_test]createP2pGroup 5G goBand result : " + JSON.stringify(error.message)); expect(true).assertEqual( (JSON.stringify(error.message)) !=null); } done(); @@ -356,8 +362,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0207 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-Auto frequency band setting Function + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-Auto frequency band setting Function * @tc.type Function * @tc.level Level 0 */ @@ -372,14 +378,14 @@ export default function actsWifiManagerFunctionTest() { groupName : "test_band3", goBand : wifiMg.GroupOwnerBand.GO_BAND_AUTO, }; - let createGroupResult = wifiMg.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifiMg.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { console.info("[wifi_test]getCurrentP2pGroup promise result : " + JSON.stringify(data)); expect(true).assertEqual(data.frequency != null ); }); - let removeGroupResult = await wifiMg.removeGroup(); + let removeP2pGroupResult = await wifiMg.removeP2pGroup(); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { @@ -390,7 +396,7 @@ export default function actsWifiManagerFunctionTest() { expect(true).assertEqual(error !=null); }); }catch(error){ - console.info("[wifi_test]createGroup auto goBand result : " + JSON.stringify(error.message)); + console.info("[wifi_test]createP2pGroup auto goBand result : " + JSON.stringify(error.message)); expect(true).assertEqual( (JSON.stringify(error.message)) !=null); } done(); @@ -398,8 +404,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0008 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-SSID is an empty string Function. + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-SSID is an empty string Function. * @tc.type Function * @tc.level Level 0 */ @@ -414,13 +420,13 @@ export default function actsWifiManagerFunctionTest() { groupName: "", goBand: wifiMg.GroupOwnerBand.GO_BAND_2GHZ, }; - let createGroupResult = wifi.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifi.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifi.getCurrentP2pGroup() .then(data => { console.info("[wifi_test]getCurrentP2pGroup promise result : " + JSON.stringify(data)); }); - let removeGroupResult = wifi.removeGroup(); + let removeP2pGroupResult = wifi.removeP2pGroup(); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { @@ -431,7 +437,7 @@ export default function actsWifiManagerFunctionTest() { expect(true).assertEqual(error !=null); }); }catch(error){ - console.info("[wifi_test]createGroup error passphrase result : " + JSON.stringify(error.message)); + console.info("[wifi_test]createP2pGroup error passphrase result : " + JSON.stringify(error.message)); expect(true).assertEqual( (JSON.stringify(error.message)) !=null); } done(); @@ -439,8 +445,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0108 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-SSID is a space Function. + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-SSID is a space Function. * @tc.type Function * @tc.level Level 0 */ @@ -455,13 +461,13 @@ export default function actsWifiManagerFunctionTest() { groupName: " ", goBand: wifiMg.GroupOwnerBand.GO_BAND_2GHZ, }; - let createGroupResult = wifi.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifi.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifi.getCurrentP2pGroup() .then(data => { console.info("[wifi_test]getCurrentP2pGroup promise result :" + JSON.stringify(data)); }); - let removeGroupResult = wifi.removeGroup(); + let removeP2pGroupResult = wifi.removeP2pGroup(); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { @@ -472,7 +478,7 @@ export default function actsWifiManagerFunctionTest() { expect(true).assertEqual(error !=null); }); }catch(error){ - console.info("[wifi_test]createGroup error passphrase result : " + JSON.stringify(error.message)); + console.info("[wifi_test]createP2pGroup error passphrase result : " + JSON.stringify(error.message)); expect(true).assertEqual( (JSON.stringify(error.message)) !=null); } done(); @@ -480,8 +486,8 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0308 - * @tc.name testCreateGroup - * @tc.desc Test createGroup-the password must be a space. + * @tc.name testcreateP2pGroup + * @tc.desc Test createP2pGroup-the password must be a space. * @tc.type Function * @tc.level Level 0 */ @@ -496,13 +502,13 @@ export default function actsWifiManagerFunctionTest() { groupName: "testpassword", goBand: wifiMg.GroupOwnerBand.GO_BAND_2GHZ, }; - let createGroupResult = wifi.createGroup(wifiP2PConfig); + let createP2pGroupResult = wifi.createP2pGroup(wifiP2PConfig); await sleep(2000); await wifi.getCurrentP2pGroup() .then(data => { console.info("[wifi_test] getCurrentP2pGroup promise result :" + JSON.stringify(data)); }); - let removeGroupResult = wifi.removeGroup(); + let removeP2pGroupResult = wifi.removeP2pGroup(); await sleep(2000); await wifiMg.getCurrentP2pGroup() .then(data => { @@ -513,7 +519,7 @@ export default function actsWifiManagerFunctionTest() { expect(true).assertEqual(error !=null); }); }catch(error){ - console.info("[wifi_test]createGroup error passphrase result : " + JSON.stringify(error.message)); + console.info("[wifi_test]createP2pGroup error passphrase result : " + JSON.stringify(error.message)); expect(true).assertEqual( (JSON.stringify(error.message)) !=null); } done(); @@ -539,8 +545,8 @@ export default function actsWifiManagerFunctionTest() { let p2pCancelResult = wifiMg.p2pCancelConnect(); await sleep(2000); console.info("[wifi_test]test p2pCancelConnect successful." ); - let removeGroupResult = wifiMg.removeGroup(); - console.info("[wifi_test]test removeGroup successful " ); + let removeP2pGroupResult = wifiMg.removeP2pGroup(); + console.info("[wifi_test]test removeP2pGroup successful " ); try { await wifiMg.getCurrentP2pGroup() .then(data => { @@ -559,18 +565,26 @@ export default function actsWifiManagerFunctionTest() { /** * @tc.number SUB_Communication_WiFi_XTS_P2P_0011 - * @tc.name testRemoveGroup + * @tc.name testremoveP2pGroup * @tc.desc Test remove a nonexistent group. * @tc.type Function * @tc.level Level 3 */ it('SUB_Communication_WiFi_XTS_P2P_0011', 0, async function (done) { - let removeGroupResult = wifiMg.removeGroup(10000); - await wifiMg.getCurrentP2pGroup() - .then(data => { - console.info("[wifi_test] getCurrentP2pGroup promise result1 :" + JSON.stringify(data)); - expect(true).assertEqual(data.deviceName == null); - }); + let removeP2pGroupResult = wifiMg.removeP2pGroup(10000); + try { + await wifiMg.getCurrentP2pGroup() + .then(data => { + console.info("[wifi_test] getCurrentP2pGroup promise result1 :" + JSON.stringify(data)); + expect(true).assertEqual(data.deviceName == null); + }).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); + } done(); }) @@ -662,7 +676,7 @@ export default function actsWifiManagerFunctionTest() { it('SUB_Communication_WiFi_XTS_P2P_0001', 0, async function(done){ console.log("[wifi_test]check the state of wifi: " + wifiMg.isWifiActive()); expect(wifiMg.isWifiActive()).assertTrue(); - let startDiscover = wifiMg.startDiscoverDevices(); + let startDiscover = wifiMg.startDiscoverP2pDevices(); await sleep(2000); await wifiMg.getP2pPeerDevices() .then((data) => { @@ -673,7 +687,7 @@ export default function actsWifiManagerFunctionTest() { console.info("[wifi_test]getP2pPeerDevices promise then error." + JSON.stringify(error)); expect().assertFail(); }); - let stopDiscover = wifiMg.stopDiscoverDevices(); + let stopDiscover = wifiMg.stopDiscoverP2pDevices(); done(); }) @@ -687,7 +701,7 @@ export default function actsWifiManagerFunctionTest() { it('SUB_Communication_WiFi_XTS_P2P_0101', 0, async function(done){ console.log("[wifi_test]check the state of wifi: " + wifiMg.isWifiActive()); expect(wifiMg.isWifiActive()).assertTrue(); - let startDiscover = wifiMg.startDiscoverDevices(); + let startDiscover = wifiMg.startDiscoverP2pDevices(); await sleep(2000); function getP2pPeerDevicesResult(){ return new Promise((resolve, reject) => { diff --git a/communication/wifi_p2p/src/main/js/test/WifiP2PFunction.test.js b/communication/wifi_p2p/src/main/js/test/WifiP2PFunction.test.js index 3b7071c43..85d4b8b86 100644 --- a/communication/wifi_p2p/src/main/js/test/WifiP2PFunction.test.js +++ b/communication/wifi_p2p/src/main/js/test/WifiP2PFunction.test.js @@ -130,6 +130,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); }); let removeGroupResult = wifi.removeGroup(); await sleep(2000); @@ -140,7 +143,7 @@ export default function actsWifiFunctionTest() { 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)); + console.error('[wifi_test] getCurrentGroup promise failed1 :' + JSON.stringify(error)); expect(true).assertEqual(error !=null); }); }catch(error){ @@ -265,6 +268,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); }); let removeGroupResult = wifi.removeGroup(); await sleep(2000); @@ -275,7 +281,7 @@ export default function actsWifiFunctionTest() { 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)); + console.error('[wifi_test] getCurrentGroup promise failed1 :' + JSON.stringify(error)); expect(true).assertEqual(error !=null); }); }catch(error){ diff --git a/communication/wifi_standard/src/main/js/test/WifiCandidateNetWork.test.js b/communication/wifi_standard/src/main/js/test/WifiCandidateNetWork.test.js index 9e893e5b2..f73e7ee7b 100644 --- a/communication/wifi_standard/src/main/js/test/WifiCandidateNetWork.test.js +++ b/communication/wifi_standard/src/main/js/test/WifiCandidateNetWork.test.js @@ -125,4 +125,3 @@ export default function actsWifiCandidateNetWorkTest() { }) } - diff --git a/communication/wifi_standard/src/main/js/test/WifiManagerCandidateNetWork.test.js b/communication/wifi_standard/src/main/js/test/WifiManagerCandidateNetWork.test.js index e7d6b480d..33c224cba 100644 --- a/communication/wifi_standard/src/main/js/test/WifiManagerCandidateNetWork.test.js +++ b/communication/wifi_standard/src/main/js/test/WifiManagerCandidateNetWork.test.js @@ -78,7 +78,6 @@ export default function actsWifiManagerCandidateNetWorkTest() { "isHiddenSsid": false, "securityType": wifiMg.WifiSecurityType.WIFI_SEC_TYPE_WEP, }; - await wifiMg.addCandidateConfig(wifiDeviceConfig1) .then(netWorkId => { console.info("[wifi_test]add WEP CandidateConfig promise : " + JSON.stringify(netWorkId)); @@ -343,4 +342,3 @@ export default function actsWifiManagerCandidateNetWorkTest() { }) } - diff --git a/communication/wifi_standard/src/main/js/test/WifiManagerStationEvent.test.js b/communication/wifi_standard/src/main/js/test/WifiManagerStationEvent.test.js index d1c52ac28..66f0e96b1 100644 --- a/communication/wifi_standard/src/main/js/test/WifiManagerStationEvent.test.js +++ b/communication/wifi_standard/src/main/js/test/WifiManagerStationEvent.test.js @@ -332,4 +332,3 @@ export default function actsWifiManagerEventTest() { }) } - diff --git a/communication/wifi_standard/src/main/js/test/WifiManagerStationFunctions.test.js b/communication/wifi_standard/src/main/js/test/WifiManagerStationFunctions.test.js index aabe73178..6285572ed 100644 --- a/communication/wifi_standard/src/main/js/test/WifiManagerStationFunctions.test.js +++ b/communication/wifi_standard/src/main/js/test/WifiManagerStationFunctions.test.js @@ -46,52 +46,6 @@ export default function actsWifiManagerFunctionsTest() { afterEach(function () { }) - /** - * @tc.number SUB_Communication_WiFi_XTS_Sta_0002 - * @tc.name testgetScanResults - * @tc.desc Test getScanResults promise and callback API functionality. - * @tc.type Function - * @tc.level Level 0 - */ - it('SUB_Communication_WiFi_XTS_Sta_0002', 0, async function (done) { - let scanResult = wifiMg.scan(); - await sleep(3000); - await wifiMg.getScanResults() - .then(result => { - let clen = Object.keys(result).length; - expect(true).assertEqual(clen >= 0); - console.info("[wifi_test]getScanInfos promise result:" + JSON.stringify(result)); - }); - function getScan() { - return new Promise((resolve, reject) => { - wifiMg.getScanResults( - (err, result) => { - if (err) { - console.log("[wifi_test] wifi getScanInfos failed:" + err); - } - let clen = Object.keys(result).length; - if (!(clen == 0)) { - expect(clen).assertLarger(0); - console.info("[wifi_test] getScanInfos callback result: " + JSON.stringify(result)); - for (let j = 0; j < clen; ++j) { - console.info("ssid: " + result[j].ssid + "bssid: " + result[j].bssid + - "securityType: " + result[j].securityType + - "rssi: " + result[j].rssi + "band: " + result[j].band + - "frequency: " + result[j].frequency + "channelWidth: " + result[j].channelWidth + - "timestamp" + result[j].timestamp + "capabilities" + result[j].capabilities - + "centerFrequency0: " + result[j].centerFrequency0 - + "centerFrequency1: " + result[j].centerFrequency1 - + "eid: " + result[j].infoElems.eid + "content: " + result[j].infoElems.content); - } - } - resolve(); - }); - }); - } - await getScan(); - done(); - }) - /** * @tc.number SUB_Communication_WiFi_XTS_Sta_0021 * @tc.name testGetSignalLevel @@ -230,7 +184,7 @@ export default function actsWifiManagerFunctionsTest() { function getLinked(){ return new Promise((resolve, reject) => { wifiMg.getLinkedInfo( - (err, result) => { + (err, result) => { if(err) { console.log("[wifi_test]wifi getLinkedInfo failed " + err); } @@ -246,28 +200,28 @@ export default function actsWifiManagerFunctionsTest() { "suppState: " + result.suppState + "connState: " + result.connState + "macType: " + result.macType); let state = wifiMg.getLinkedInfo().ConnState; - if (state == wifiMg.connState.SCANNING) { + if (state == wifiMg.ConnState.SCANNING) { expect(true).assertEqual(state == 0); } - if (state == wifiMg.connState.CONNECTING) { + if (state == wifiMg.ConnState.CONNECTING) { expect(true).assertEqual(state == 1); } - if (state == wifiMg.connState.AUTHENTICATING) { + if (state == wifiMg.ConnState.AUTHENTICATING) { expect(true).assertEqual(state == 2); } - if (state == wifiMg.connState.OBTAINING_IPADDR) { + if (state == wifiMg.ConnState.OBTAINING_IPADDR) { expect(true).assertEqual(state == 3); } - if (state == wifiMg.connState.CONNECTED) { + if (state == wifiMg.ConnState.CONNECTED) { expect(true).assertEqual(state == 4); } - if (state == wifiMg.connState.DISCONNECTING) { + if (state == wifiMg.ConnState.DISCONNECTING) { expect(true).assertEqual(state == 5); } - if (state == wifiMg.connState.DISCONNECTED) { + if (state == wifiMg.ConnState.DISCONNECTED) { expect(true).assertEqual(state == 6); } - if (state == wifiMg.connState.UNKNOWN) { + if (state == wifiMg.ConnState.UNKNOWN) { expect(true).assertEqual(state == 7); } resolve(); @@ -286,15 +240,29 @@ export default function actsWifiManagerFunctionsTest() { * @tc.level Level 0 */ it('SUB_Communication_WiFi_XTS_Sta_0034', 0, async function (done) { - let getScanResultsResult = wifiMg.getScanResultsSync(); - console.info("[wifi_test]wifi getScanResultsSync result : " + JSON.stringify(getScanResultsResult)); - let scanInfolenth = Object.keys(getScanResultsResult).length; - console.info("[wifi_test]wifi ScanInfosSync length result : " + JSON.stringify(scanInfolenth)); - expect(true).assertEqual(scanInfolenth >= 0); + let scanResult = wifiMg.scan(); + await sleep(3000); + let getScanInfoListResult = wifiMg.getScanInfoList(); + console.info("[wifi_test]wifi getScanInfoList result : " + JSON.stringify(getScanInfoListResult)); + let clen = Object.keys(getScanInfoListResult).length; + console.info("[wifi_test]wifi getScanInfoList length result : " + JSON.stringify(clen)); + let result = getScanInfoListResult; + if (clen >= 0) { + expect(true).assertEqual(clen >= 0); + for (let j = 0; j < clen; ++j) { + console.info("ssid: " + result[j].ssid + "bssid: " + result[j].bssid + + "securityType: " + result[j].securityType + + "rssi: " + result[j].rssi + "band: " + result[j].band + + "frequency: " + result[j].frequency + "channelWidth: " + result[j].channelWidth + + "timestamp" + result[j].timestamp + "capabilities" + result[j].capabilities + + "centerFrequency0: " + result[j].centerFrequency0 + + "centerFrequency1: " + result[j].centerFrequency1 + + "eid: " + result[j].infoElems.eid + "content: " + result[j].infoElems.content); + } + } done(); }) console.log("*************[wifi_test] start wifi js unit test end*************"); }) } - diff --git a/communication/wifi_standard/src/main/js/test/WifiStationEvent.test.js b/communication/wifi_standard/src/main/js/test/WifiStationEvent.test.js index 737831b7f..790334076 100644 --- a/communication/wifi_standard/src/main/js/test/WifiStationEvent.test.js +++ b/communication/wifi_standard/src/main/js/test/WifiStationEvent.test.js @@ -31,7 +31,7 @@ function resolveIP(ip) { return (ip>>24 & 0xFF) + "." + (ip>>16 & 0xFF) + "." + (ip>>8 & 0xFF) + "." + (ip & 0xFF); } -let powerModel = { +let PowerModel = { SLEEPING : 0, GENERAL : 1, THROUGH_WALL : 2, @@ -339,4 +339,3 @@ export default function actsWifiEventTest() { }) } - diff --git a/communication/wifi_standard/src/main/js/test/WifiStationFunctions.test.js b/communication/wifi_standard/src/main/js/test/WifiStationFunctions.test.js index 3be034b34..4177de380 100644 --- a/communication/wifi_standard/src/main/js/test/WifiStationFunctions.test.js +++ b/communication/wifi_standard/src/main/js/test/WifiStationFunctions.test.js @@ -44,8 +44,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; @@ -268,4 +266,3 @@ export default function actsWifiFunctionsTest() { }) } - -- GitLab