!7769 【Openharmony4.0.3.5】【monthly】【短距】【XTS】WIFI接口修改+用例适配

Merge pull request !7769 from 权力/myfeature1

!7769 【Openharmony4.0.3.5】【monthly】【短距】【XTS】WIFI接口修改+用例适配
Merge pull request !7769 from 权力/myfeature1
c701d921 · openharmony_ci · Gitee · c3345e26 · 9c63cd4c · c701d921
5 changed file
--- a/communication/wifi_p2p/src/main/js/test/WifiManagerP2PEvent.test.js
+++ b/communication/wifi_p2p/src/main/js/test/WifiManagerP2PEvent.test.js
 /*
 * 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
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
 import wifiMg from '@ohos.wifiManager'
 function sleep(delay) {
    return new Promise(resovle => setTimeout(resovle, delay))
 }
 function checkWifiPowerOn(){
    console.info("[wifi_test]wifi status:" + wifiMg.isWifiActive());
 }
 export default function actsWifiManagerEventTest() {
    describe('actsWifiManagerEventTest', function () {
        beforeEach(function () {
            console.info("[wifi_test]beforeEach start" );
            checkWifiPowerOn();
        })
        afterEach(async function () {
            console.info("[wifi_test]afterEach start" );
        })
        /**
        * @tc.number SUB_Communication_WiFi_Event_Test_0008
        * @tc.name testp2pStateChange
        * @tc.desc Test p2pStateChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('SUB_Communication_WiFi_Event_Test_0008', 0, async function (done) {
            let p2pState = "p2pStateChange";
            let p2pStateChangeCallback = result => {
                console.info("[wifi_test]p2pStateChange callback, result: " + JSON.stringify(result));
            }
            wifiMg.on(p2pState, p2pStateChangeCallback);
            await sleep(3000);
            wifiMg.off(p2pState, p2pStateChangeCallback);
            done();
        })
        /**
        * @tc.number SUB_Communication_WiFi_Event_Test_0009
        * @tc.name testp2pConnectionChange
        * @tc.desc Test p2pConnectionChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('SUB_Communication_WiFi_Event_Test_0009', 0, async function (done) {
            let p2pConnectionState = "p2pConnectionChange";
            let p2pConnectionChangeCallback = result => {
                console.info("[wifi_test]p2pConnectionChange callback, result: " + JSON.stringify(result));
            }
            wifiMg.on(p2pConnectionState, p2pConnectionChangeCallback);
            let p2pConnectState = {
                DISCONNECTED :0,
                CONNECTED : 1,
            };
            let wifiP2PConfig = {
                deviceAddress : "00:00:00:00:00:00",
                netId : -1,
                passphrase : "12345678",
                groupName : "AAAZZZ456",
                goBand : wifiMg.GroupOwnerBand.GO_BAND_AUTO,
            };
            let connectResult = wifiMg.p2pConnect(wifiP2PConfig);
            await wifiMg.getP2pLinkedInfo()
                .then(data => {
                    let resultLength = Object.keys(data).length;
                    console.info("[wifi_test]getP2pLinkedInfo  promise result : " + JSON.stringify(data));
                    expect(true).assertEqual(resultLength!=0);
                    done()
                });
            await sleep(2000);
            wifiMg.off(p2pConnectionState, p2pConnectionChangeCallback);
            let removeGroupResult = wifiMg.removeGroup();
            done();
        })
        /**
        * @tc.number SUB_Communication_WiFi_Event_Test_0012
        * @tc.name testp2pDeviceChange
        * @tc.desc Test p2pDeviceChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('SUB_Communication_WiFi_Event_Test_0012', 0, async function (done) {
            let p2pDeviceState = "p2pDeviceChange";
            let p2pDeviceChangeCallback = result => {
                console.info("[wifi_test]p2pDeviceChange callback, result: " + JSON.stringify(result));
            }
            wifiMg.on(p2pDeviceState, p2pDeviceChangeCallback);
            await sleep(3000);
            wifiMg.off(p2pDeviceState, p2pDeviceChangeCallback);
            done();
        })
        /**
        * @tc.number SUB_Communication_WiFi_Event_Test_0010
        * @tc.name testp2pPeerDeviceChange
        * @tc.desc Test p2pPeerDeviceChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('SUB_Communication_WiFi_Event_Test_0010', 0, async function (done) {
            let p2pPeerDeviceState = "p2pPeerDeviceChange";
            let p2pPeerDeviceChangeCallback = result => {
                console.info("[wifi_test]p2pPeerDeviceChange callback, result: " + JSON.stringify(result));
            }
            wifiMg.on(p2pPeerDeviceState, p2pPeerDeviceChangeCallback);
            let startDiscover = wifiMg.startDiscoverDevices();
            await sleep(3000);
            let stopDiscover = wifiMg.stopDiscoverDevices();
            wifiMg.off(p2pPeerDeviceState, p2pPeerDeviceChangeCallback);
            done();
        })
        /**
        * @tc.number SUB_Communication_WiFi_Event_Test_0013
        * @tc.name testp2pPersistentGroupChange
        * @tc.desc Test p2pPersistentGroupChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('SUB_Communication_WiFi_Event_Test_0013', 0, async function (done) {
            let p2pGroupState = "p2pPersistentGroupChange";
            let p2pPersistentGroupChangeCallback = () => {
                console.info("[wifi_test]p2pPersistentGroupChange callback, result: " + JSON.stringify(result));
            }
            wifiMg.on(p2pGroupState, p2pPersistentGroupChangeCallback);
            let WifiP2PConfig = {
                deviceAddress : "00:00:00:00:00:00",
                netId : -2,
                passphrase : "12345678",
                groupName : "AAAZZZ123",
                goBand : wifiMg.GroupOwnerBand.GO_BAND_AUTO,
            };
            let createGroupResult = wifiMg.createGroup(WifiP2PConfig);
            await (2000);
            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);
                });
            wifiMg.off(p2pGroupState, p2pPersistentGroupChangeCallback);
            done();
        })
        /**
        * @tc.number SUB_Communication_WiFi_Event_Test_0011
        * @tc.name testpp2pDiscoveryChange
        * @tc.desc Test p2pDiscoveryChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('SUB_Communication_WiFi_Event_Test_0011', 0, async function (done) {
            let p2pPeerDeviceState = "p2pDiscoveryChange";
            let p2pDiscoveryChangeCallback = result => {
                console.info("[wifi_test]p2pDiscoveryChange callback, result: " + JSON.stringify(result));
            }
            wifiMg.on(p2pPeerDeviceState, p2pDiscoveryChangeCallback);
            let startDiscover = wifiMg.startDiscoverDevices();
            await sleep(3000);
            let stopDiscover = wifiMg.stopDiscoverDevices();
            wifiMg.off(p2pPeerDeviceState, p2pDiscoveryChangeCallback);
            done();
        })
        console.log("*************[wifi_test] start wifi js unit test end*************");
    })
 }
--- a/communication/wifi_p2p/src/main/js/test/WifiManagerP2PFunction.test.js
+++ b/communication/wifi_p2p/src/main/js/test/WifiManagerP2PFunction.test.js
--- a/communication/wifi_p2p/src/main/js/test/WifiP2PEvent.test.js
+++ b/communication/wifi_p2p/src/main/js/test/WifiP2PEvent.test.js
 /*
 * 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
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
 import wifi from '@ohos.wifi'
 function sleep(delay) {
    return new Promise(resovle => setTimeout(resovle, delay))
 }
 function checkWifiPowerOn(){
    console.info("[wifi_test]wifi status:" + wifi.isWifiActive());
 }
 export default function actsWifiEventTest() {
    describe('actsWifiEventTest', function () {
        beforeEach(function () {
            console.info("[wifi_test]beforeEach start" );
            checkWifiPowerOn();
        })
        afterEach(async function () {
            console.info("[wifi_test]afterEach start" );
        })
        /**
        * @tc.number Communication_WiFi_Event_Test_0008
        * @tc.name testp2pStateChange
        * @tc.desc Test p2pStateChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('Communication_WiFi_Event_Test_0008', 0, async function (done) {
            let p2pState = "p2pStateChange";
            let p2pStateChangeCallback = result => {
                console.info("[wifi_test]p2pStateChange callback, result: " + JSON.stringify(result));
            }
            wifi.on(p2pState, p2pStateChangeCallback);
            await sleep(3000);
            wifi.off(p2pState, p2pStateChangeCallback);
            done();
        })
        /**
        * @tc.number Communication_WiFi_Event_Test_0009
        * @tc.name testp2pConnectionChange
        * @tc.desc Test p2pConnectionChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('Communication_WiFi_Event_Test_0009', 0, async function (done) {
            let p2pConnectionState = "p2pConnectionChange";
            let p2pConnectionChangeCallback = result => {
                console.info("[wifi_test]p2pConnectionChange callback, result: " + JSON.stringify(result));
            }
            wifi.on(p2pConnectionState, p2pConnectionChangeCallback);
            let wifiP2PConfig = {
                deviceAddress : "00:00:00:00:00:00",
                netId : -1,
                passphrase : "12345678",
                groupName : "AAAZZZ456",
                goBand : wifi.GroupOwnerBand.GO_BAND_AUTO
            };
            let connectResult = wifi.p2pConnect(wifiP2PConfig);
            console.info("[wifi_test]test p2pConnect result." + connectResult);
            await wifi.getP2pLinkedInfo()
                .then(data => {
                    let resultLength = Object.keys(data).length;
                    console.info("[wifi_test]getP2pLinkedInfo  promise result : " + JSON.stringify(data));
                    expect(true).assertEqual(resultLength!=0);
                    done()
                });
            await sleep(2000);
            wifi.off(p2pConnectionState, p2pConnectionChangeCallback);
            let removeGroupResult = wifi.removeGroup();
            console.info("[wifi_test]test start removeGroup:" + removeGroupResult);
            expect(removeGroupResult).assertTrue();
            done();
        })
        /**
        * @tc.number Communication_WiFi_Event_Test_0012
        * @tc.name testp2pDeviceChange
        * @tc.desc Test p2pDeviceChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('Communication_WiFi_Event_Test_0012', 0, async function (done) {
            let p2pDeviceState = "p2pDeviceChange";
            let p2pDeviceChangeCallback = result => {
                console.info("[wifi_test]p2pDeviceChange callback, result: " + JSON.stringify(result));
            }
            wifi.on(p2pDeviceState, p2pDeviceChangeCallback);
            await sleep(3000);
            wifi.off(p2pDeviceState, p2pDeviceChangeCallback);
            done();
        })
        /**
        * @tc.number Communication_WiFi_Event_Test_0010
        * @tc.name testp2pPeerDeviceChange
        * @tc.desc Test p2pPeerDeviceChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('Communication_WiFi_Event_Test_0010', 0, async function (done) {
            let p2pPeerDeviceState = "p2pPeerDeviceChange";
            let p2pPeerDeviceChangeCallback = result => {
                console.info("[wifi_test]p2pPeerDeviceChange callback, result: " + JSON.stringify(result));
            }
            wifi.on(p2pPeerDeviceState, p2pPeerDeviceChangeCallback);
            let startDiscover = wifi.startDiscoverDevices();
            await sleep(3000);
            expect(startDiscover).assertTrue();
            let stopDiscover = wifi.stopDiscoverDevices();
            console.info("[wifi_test] test stopDiscoverDevices result." + stopDiscover);
            wifi.off(p2pPeerDeviceState, p2pPeerDeviceChangeCallback);
            done();
        })
        /**
        * @tc.number Communication_WiFi_Event_Test_0013
        * @tc.name testp2pPersistentGroupChange
        * @tc.desc Test p2pPersistentGroupChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('Communication_WiFi_Event_Test_0013', 0, async function (done) {
            let p2pGroupState = "p2pPersistentGroupChange";
            let p2pPersistentGroupChangeCallback = () => {
                console.info("[wifi_test]p2pPersistentGroupChange callback, result: " + JSON.stringify(result));
            }
            wifi.on(p2pGroupState, p2pPersistentGroupChangeCallback);
            let WifiP2PConfig = {
                deviceAddress : "00:00:00:00:00:00",
                netId : -2,
                passphrase : "12345678",
                groupName : "AAAZZZ123",
                goBand : wifi.GroupOwnerBand.GO_BAND_AUTO,
            };
            let createGroupResult = wifi.createGroup(WifiP2PConfig);
            await (2000);
            console.info("[wifi_test] test createGroup result." + createGroupResult)
            expect(createGroupResult).assertTrue();
            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);
                });
            wifi.off(p2pGroupState, p2pPersistentGroupChangeCallback);
            done();
        })
        /**
        * @tc.number Communication_WiFi_Event_Test_0011
        * @tc.name testpp2pDiscoveryChange
        * @tc.desc Test p2pDiscoveryChange callback
        * @tc.type Function
        * @tc.level Level 3
        */
        it('Communication_WiFi_Event_Test_0011', 0, async function (done) {
            let p2pPeerDeviceState = "p2pDiscoveryChange";
            let p2pDiscoveryChangeCallback = result => {
                console.info("[wifi_test]p2pDiscoveryChange callback, result: " + JSON.stringify(result));
            }
            wifi.on(p2pPeerDeviceState, p2pDiscoveryChangeCallback);
            let startDiscover = wifi.startDiscoverDevices();
            await sleep(3000);
            expect(startDiscover).assertTrue();
            let stopDiscover = wifi.stopDiscoverDevices();
            console.info("[wifi_test] test stopDiscoverDevices result." + stopDiscover);
            wifi.off(p2pPeerDeviceState, p2pDiscoveryChangeCallback);
            done();
        })
        console.log("*************[wifi_test] start wifi js unit test end*************");
    })
 }
--- a/communication/wifi_p2p/src/main/js/test/WifiP2PFunction.test.js
+++ b/communication/wifi_p2p/src/main/js/test/WifiP2PFunction.test.js
--- a/communication/wifi_standard/src/main/js/test/WifiManagerStationFunctions.test.js
+++ b/communication/wifi_standard/src/main/js/test/WifiManagerStationFunctions.test.js
@@ -246,28 +246,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();