!9629 【XTS】【communication】【beta2】wifi覆盖率上库

Merge pull request !9629 from 权力/myfeature3

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

@@ -138,6 +138,44 @@ export default function actsWifiManagerCandidateNetWorkTest() {
          * @tc.level Level 2
          */
         it('SUB_Communication_WiFi_XTS_CandidateNetWork_0002', 0, async function (done) {
+            let EapMethod = {
+                "EAP_NONE": 0,
+                "EAP_PEAP": 1,
+                "EAP_TLS": 2,
+                "EAP_TTLS": 3,
+                "EAP_PWD": 4,
+                "EAP_SIM": 5,
+                "EAP_AKA": 6,
+                "EAP_AKA_PRIME": 7,
+                "EAP_UNAUTH_TLS": 8,
+            };
+            let Phase2Method = {
+                "PHASE2_NONE": 0,
+                "PHASE2_PAP": 1,
+                "PHASE2_MSCHAP": 2,
+                "PHASE2_MSCHAPV2": 3,
+                "PHASE2_GTC": 4,
+                "PHASE2_SIM": 5,
+                "PHASE2_AKA": 6,
+                "PHASE2_AKA_PRIME": 7,
+            };
+            let WifiEapConfig = {
+                "eapMethod": wifiMg.EapMethod.EAP_NONE,
+                "phase2Method": wifiMg.Phase2Method.PHASE2_NONE,
+                "identity": "aaa",
+                "anonymousIdentity": "bbb",
+                "password": "12345678",
+                "caCertAliases": "ddd",
+                "caPath": "eee",
+                "clientCertAliases": "fff",
+                "certEntry": new Uint8Array(),
+                "certPassword": "12345678",
+                "altSubjectMatch": "ggg",
+                "domainSuffixMatch": "hhh",
+                "realm": "iii",
+                "plmn": "jjj",
+                "eapSubId": "kkk",
+            };
             let wifiDeviceConfig = {
                 "ssid": "TEST_PSK",
                 "bssid": "22:9b:e6:48:1f:5c",
@@ -151,6 +189,7 @@ export default function actsWifiManagerCandidateNetWorkTest() {
                 "randomMacType": 0,
                 "randomMacAddr": "11:22:33:44:55:66",
                 "staticIp": {"ipAddress": 1284752956,"gateway": 1284752936},
+                "eapConfig": wifiMg.WifiEapConfig,
             };
             await wifiMg.addCandidateConfig(wifiDeviceConfig)
                 .then(netWorkId => {
@@ -381,4 +420,3 @@ export default function actsWifiManagerCandidateNetWorkTest() {
         })
     })
 }
-

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

@@ -308,7 +308,7 @@ export default function actsWifiManagerFunctionsTest() {
         it('SUB_Communication_WiFi_XTS_Sta_0034', 0, async function(done) {
             let scanResult = wifiMg.scan();
             await sleep(3000);
-           let getScanInfoListResult = wifiMg.getScanInfoList();
+            let getScanInfoListResult = wifiMg.getScanResultsSync();
             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));
@@ -358,7 +358,47 @@ export default function actsWifiManagerFunctionsTest() {
             expect(typeof (isBandTypeSupported4)).assertEqual('boolean');
             done();
         })
+
+        /**
+         * @tc.number SUB_Communication_WiFi_XTS_Sta_0036
+         * @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_0036', 0, async function (done) {
+            await wifiMg.getScanResults()
+                .then(result => {
+                    let clen = Object.keys(result).length;
+                    expect(true).assertEqual(clen >= 0);
+                    console.info("[wifi_test]getScanResults promise result:" + JSON.stringify(result));
+                });
+            function getScan() {
+                return new Promise((resolve, reject) => {
+                    wifiMg.getScanResults(
+                        (err, result) => {
+                            if (err) {
+                                console.log("[wifi_test] wifi getScanResults failed:" + err);
+                            }
+                            let clen = Object.keys(result).length;
+                            if (!(clen == 0)) {
+                                expect(clen).assertLarger(0);
+                                console.info("[wifi_test] getScanResults 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);
+                                }
+                            }
+                            resolve();
+                        });
+                });
+            }
+            await getScan();
+            done();
+        })
         console.log("*************[wifi_test] start wifi js unit test end*************");
     })
 }
-