From 54877f851c611f19c27515176dc0bb0a47751e2d Mon Sep 17 00:00:00 2001 From: q00313334 Date: Wed, 29 Sep 2021 03:58:32 +0800 Subject: [PATCH] fixed 02fd964 from https://gitee.com/q00313334/xts_acts/pulls/823 wifitest update Signed-off-by: q00313334 --- communication/BUILD.gn | 2 +- .../main/js/default/test/OsAccount.test.js | 184 ---------- .../src/main/js/default/test/Wifi.test.js | 331 ++++++++---------- test_packages.gni | 2 +- 4 files changed, 149 insertions(+), 370 deletions(-) delete mode 100755 communication/wifi_standard/src/main/js/default/test/OsAccount.test.js diff --git a/communication/BUILD.gn b/communication/BUILD.gn index 8e3abef8c..7676dd882 100755 --- a/communication/BUILD.gn +++ b/communication/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos_var.gni") -group("account") { +group("communication") { testonly = true if (is_standard_system) { deps = [ "wifi_standard:wifi_standard_test" ] diff --git a/communication/wifi_standard/src/main/js/default/test/OsAccount.test.js b/communication/wifi_standard/src/main/js/default/test/OsAccount.test.js deleted file mode 100755 index 25d9900d9..000000000 --- a/communication/wifi_standard/src/main/js/default/test/OsAccount.test.js +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright (C) 2021 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 wifi_js from '@ohos.wifi_js' - -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -// delay x ms -function sleep(delay) { - var start = (new Date()).getTime(); - while ((new Date()).getTime() - start < delay) { - continue; - } -} - -describe('appInfoTest', function () { - beforeEach(function () { - }) - - afterEach(function () { - }) - - console.log("*************[wifi_test]start wifi js unit test[ver:18]*************"); - - /** - * @tc.number wifi_js_unit_test_001 - * @tc.name Test wifi.isWifiActive. - * @tc.desc Test wifi.isWifiActive API functionality. - */ - it('wifi_js_unit_test_001', 0, function () { - console.info("[wifi_test] wifi active test."); - expect(wifi_js.isWifiActive()).assertTrue(); - }) - - /** - * @tc.number wifi_js_unit_test_002 - * @tc.name Test wifi.scan. - * @tc.desc Test wifi.scan API functionality. - */ - it('wifi_js_unit_test_002', 0, async function (done) { - console.info("[wifi_test] wifi scan test."); - expect(wifi_js.scan()).assertTrue(); - sleep(3000); - - wifi_js.getScanInfos(result => { - console.info('[wifi_test] getScanInfos -> ' + JSON.stringify(result)); - expect(Object.keys(result).length).assertLarger(0); - - for (var i = 0; i < Object.keys(result).length; ++i) { - console.info("[wifi_test] rssi: " + result[i].rssi + ", band: " + result[i].band + ", level: " + wifi_js.getSignalLevel(result[i].rssi, result[i].band)); - } - }) - - sleep(3000); - expect(wifi_js.scan()).assertTrue(); - sleep(3000); - - wifi_js.getScanInfos().then(result => { - console.info("[wifi_test] wifi scan result call promise."); - expect(Object.keys(result).length).assertLarger(0); - }); - done(); - }) - - /** - * @tc.number wifi_js_unit_test_003 - * @tc.name Test wifi.getSignalLevel. - * @tc.desc Test wifi.getSignalLevel API functionality. - */ - it('wifi_js_unit_test_003', 0, function () { - console.info("[wifi_test] wifi get signal level test."); - expect(wifi_js.getSignalLevel(1, 1)).assertEqual(4); - sleep(3000); - }) - - /** - * @tc.number wifi_js_unit_test_005 - * @tc.name Test wifi.getScanInfos 0. - * @tc.desc Test wifi.getScanInfos API functionality. - */ - it('wifi_js_unit_test_005', 0, async function (done) { - console.info("[wifi_test] Wifi get scan infos callback test[1]."); - wifi_js.getScanInfos(result => { - var clen = Object.keys(result).length; - console.log("[wifi_test] wifi received scan info call back: " + clen); - expect(result).assertLarger(0); - console.info("[wifi_test] add device config callback: " + JSON.stringify(result)); - expect(JSON.stringify(result)).assertContain('ssid'); - sleep(5000); - for (var j = 0; j < clen; ++j) { - console.info("ssid: " + result[j].ssid); - console.info("bssid: " + result[j].bssid); - console.info("securityType: " + result[j].securityType); - console.info("rssi: " + result[j].rssi); - console.info("band: " + result[j].band); - console.info("frequency: " + result[j].frequency); - console.info("timestamp: " + result[j].timestamp); - } - }); - done(); - }) - sleep(20000); - - /** - * @tc.number wifi_js_unit_test_006 - * @tc.name Test wifi.getScanInfos 1. - * @tc.desc Test wifi.getScanInfos API functionality. - */ - it('wifi_js_unit_test_006', 0, async function (done) { - console.info("[wifi_test] Wifi get scan infos callback test[2]."); - wifi_js.getScanInfos().then( - result => { - var clen = Object.keys(result).length; - console.log("[wifi_test] wifi received scan promise result: " + clen); - expect(result).assertLarger(0); - console.info("[wifi_test] test_006 promise... " + JSON.stringify(result)); - expect(JSON.stringify(result)).assertContain('ssid'); - - sleep(5000); - for (var j = 0; j < clen; ++j) { - console.info("ssid: " + result[j].ssid); - console.info("bssid: " + result[j].bssid); - console.info("securityType: " + result[j].securityType); - console.info("rssi: " + result[j].rssi); - console.info("band: " + result[j].band); - console.info("frequency: " + result[j].frequency); - console.info("timestamp: " + result[j].timestamp); - } - }); - done(); - }) - sleep(20000); - - /** - * @tc.number wifi_js_unit_test_007 - * @tc.name Test wifi.getLinkedInfo 1. - * @tc.desc Test wifi.getLinkedInfo API functionality. - */ - it('wifi_js_unit_test_007', 0, async function (done) { - console.info("[wifi_test] get wifi linked callback test[1]."); - wifi_js.getLinkedInfo().then( - data => { - console.info("[wifi_test] test_007 wifi link [promise]: " + JSON.stringify(data)); - expect(JSON.stringify(data)).assertContain('ssid'); - sleep(5000); - console.info("[wifi_js] wifi link info" + ": ssid: " + data.ssid + ", bssid: " + data.bssid + ", ipAddress: " + data.ipAddress + ", isHidden: " + data.isHidden); - }); - done(); - }) - sleep(3000); - /** - * @tc.number wifi_js_unit_test_008 - * @tc.name Test wifi.getLinkedInfo 2. - * @tc.desc Test wifi.getLinkedInfo API functionality. - */ - it('wifi_js_unit_test_008', 0, async function (done) { - console.info('[wifi_test] get wifi linked callback test[2]'); - wifi.getLinkedInfo(result => { - console.info("[wifi_js] get wifi link [promise] -> " + JSON.stringify(data)); - expect(JSON.stringify(data)).assertContain('band'); - console.info("[wifi_js] get wifi link [promise]."); - done(); - }).catch(error => { - console.info("[wifi_js] promise then error."); - expect().assertFail(); - done(); - }); - }) - - console.log("*************[wifi_test] start wifi js unit test end*************"); -}) - diff --git a/communication/wifi_standard/src/main/js/default/test/Wifi.test.js b/communication/wifi_standard/src/main/js/default/test/Wifi.test.js index 25d9900d9..31fa7c7bb 100755 --- a/communication/wifi_standard/src/main/js/default/test/Wifi.test.js +++ b/communication/wifi_standard/src/main/js/default/test/Wifi.test.js @@ -1,184 +1,147 @@ -/* - * Copyright (C) 2021 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 wifi_js from '@ohos.wifi_js' - -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -// delay x ms -function sleep(delay) { - var start = (new Date()).getTime(); - while ((new Date()).getTime() - start < delay) { - continue; - } -} - -describe('appInfoTest', function () { - beforeEach(function () { - }) - - afterEach(function () { - }) - - console.log("*************[wifi_test]start wifi js unit test[ver:18]*************"); - - /** - * @tc.number wifi_js_unit_test_001 - * @tc.name Test wifi.isWifiActive. - * @tc.desc Test wifi.isWifiActive API functionality. - */ - it('wifi_js_unit_test_001', 0, function () { - console.info("[wifi_test] wifi active test."); - expect(wifi_js.isWifiActive()).assertTrue(); - }) - - /** - * @tc.number wifi_js_unit_test_002 - * @tc.name Test wifi.scan. - * @tc.desc Test wifi.scan API functionality. - */ - it('wifi_js_unit_test_002', 0, async function (done) { - console.info("[wifi_test] wifi scan test."); - expect(wifi_js.scan()).assertTrue(); - sleep(3000); - - wifi_js.getScanInfos(result => { - console.info('[wifi_test] getScanInfos -> ' + JSON.stringify(result)); - expect(Object.keys(result).length).assertLarger(0); - - for (var i = 0; i < Object.keys(result).length; ++i) { - console.info("[wifi_test] rssi: " + result[i].rssi + ", band: " + result[i].band + ", level: " + wifi_js.getSignalLevel(result[i].rssi, result[i].band)); - } - }) - - sleep(3000); - expect(wifi_js.scan()).assertTrue(); - sleep(3000); - - wifi_js.getScanInfos().then(result => { - console.info("[wifi_test] wifi scan result call promise."); - expect(Object.keys(result).length).assertLarger(0); - }); - done(); - }) - - /** - * @tc.number wifi_js_unit_test_003 - * @tc.name Test wifi.getSignalLevel. - * @tc.desc Test wifi.getSignalLevel API functionality. - */ - it('wifi_js_unit_test_003', 0, function () { - console.info("[wifi_test] wifi get signal level test."); - expect(wifi_js.getSignalLevel(1, 1)).assertEqual(4); - sleep(3000); - }) - - /** - * @tc.number wifi_js_unit_test_005 - * @tc.name Test wifi.getScanInfos 0. - * @tc.desc Test wifi.getScanInfos API functionality. - */ - it('wifi_js_unit_test_005', 0, async function (done) { - console.info("[wifi_test] Wifi get scan infos callback test[1]."); - wifi_js.getScanInfos(result => { - var clen = Object.keys(result).length; - console.log("[wifi_test] wifi received scan info call back: " + clen); - expect(result).assertLarger(0); - console.info("[wifi_test] add device config callback: " + JSON.stringify(result)); - expect(JSON.stringify(result)).assertContain('ssid'); - sleep(5000); - for (var j = 0; j < clen; ++j) { - console.info("ssid: " + result[j].ssid); - console.info("bssid: " + result[j].bssid); - console.info("securityType: " + result[j].securityType); - console.info("rssi: " + result[j].rssi); - console.info("band: " + result[j].band); - console.info("frequency: " + result[j].frequency); - console.info("timestamp: " + result[j].timestamp); - } - }); - done(); - }) - sleep(20000); - - /** - * @tc.number wifi_js_unit_test_006 - * @tc.name Test wifi.getScanInfos 1. - * @tc.desc Test wifi.getScanInfos API functionality. - */ - it('wifi_js_unit_test_006', 0, async function (done) { - console.info("[wifi_test] Wifi get scan infos callback test[2]."); - wifi_js.getScanInfos().then( - result => { - var clen = Object.keys(result).length; - console.log("[wifi_test] wifi received scan promise result: " + clen); - expect(result).assertLarger(0); - console.info("[wifi_test] test_006 promise... " + JSON.stringify(result)); - expect(JSON.stringify(result)).assertContain('ssid'); - - sleep(5000); - for (var j = 0; j < clen; ++j) { - console.info("ssid: " + result[j].ssid); - console.info("bssid: " + result[j].bssid); - console.info("securityType: " + result[j].securityType); - console.info("rssi: " + result[j].rssi); - console.info("band: " + result[j].band); - console.info("frequency: " + result[j].frequency); - console.info("timestamp: " + result[j].timestamp); - } - }); - done(); - }) - sleep(20000); - - /** - * @tc.number wifi_js_unit_test_007 - * @tc.name Test wifi.getLinkedInfo 1. - * @tc.desc Test wifi.getLinkedInfo API functionality. - */ - it('wifi_js_unit_test_007', 0, async function (done) { - console.info("[wifi_test] get wifi linked callback test[1]."); - wifi_js.getLinkedInfo().then( - data => { - console.info("[wifi_test] test_007 wifi link [promise]: " + JSON.stringify(data)); - expect(JSON.stringify(data)).assertContain('ssid'); - sleep(5000); - console.info("[wifi_js] wifi link info" + ": ssid: " + data.ssid + ", bssid: " + data.bssid + ", ipAddress: " + data.ipAddress + ", isHidden: " + data.isHidden); - }); - done(); - }) - sleep(3000); - /** - * @tc.number wifi_js_unit_test_008 - * @tc.name Test wifi.getLinkedInfo 2. - * @tc.desc Test wifi.getLinkedInfo API functionality. - */ - it('wifi_js_unit_test_008', 0, async function (done) { - console.info('[wifi_test] get wifi linked callback test[2]'); - wifi.getLinkedInfo(result => { - console.info("[wifi_js] get wifi link [promise] -> " + JSON.stringify(data)); - expect(JSON.stringify(data)).assertContain('band'); - console.info("[wifi_js] get wifi link [promise]."); - done(); - }).catch(error => { - console.info("[wifi_js] promise then error."); - expect().assertFail(); - done(); - }); - }) - - console.log("*************[wifi_test] start wifi js unit test end*************"); -}) - +/* + * Copyright (C) 2021 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 wifi_native_js from '@ohos.wifi_native_js' + +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' + +// delay x ms +function sleep(delay) { + var start = (new Date()).getTime(); + while ((new Date()).getTime() - start < delay) { + continue; + } +} + +describe('appInfoTest', function () { + beforeEach(function () { + }) + + afterEach(function () { + }) + + console.log("*************[wifi_test]start wifi js unit test[ver:18]*************"); + + /** + * @tc.number wifi_native_js_unit_test_001 + * @tc.name Test wifi.isWifiActive. + * @tc.desc Test wifi.isWifiActive API functionality. + */ + it('wifi_native_js_unit_test_001', 0, function () { + console.info("[wifi_test] wifi active test."); + expect(wifi_native_js.isWifiActive()).assertTrue(); + }) + + /** + * @tc.number wifi_native_js_unit_test_002 + * @tc.name Test wifi.scan. + * @tc.desc Test wifi.scan API functionality. + */ + it('wifi_native_js_unit_test_002', 0, async function (done) { + console.info("[wifi_test] wifi scan test."); + expect(wifi_native_js.scan()).assertTrue(); + sleep(3000); + + wifi_native_js.getScanInfos(result => { + console.info('[wifi_test] getScanInfos -> ' + JSON.stringify(result)); + expect(Object.keys(result).length).assertLarger(0); + + for (var i = 0; i < Object.keys(result).length; ++i) { + console.info("[wifi_test] rssi: " + result[i].rssi + ", band: " + result[i].band + ", level: " + wifi_native_js.getSignalLevel(result[i].rssi, result[i].band)); + } + }) + + sleep(3000); + expect(wifi_native_js.scan()).assertTrue(); + sleep(3000); + + wifi_native_js.getScanInfos().then(result => { + console.info("[wifi_test] wifi scan result call promise."); + expect(Object.keys(result).length).assertLarger(0); + }); + done(); + }) + + /** + * @tc.number wifi_native_js_unit_test_003 + * @tc.name Test wifi.getSignalLevel. + * @tc.desc Test wifi.getSignalLevel API functionality. + */ + it('wifi_native_js_unit_test_003', 0, function () { + console.info("[wifi_test] wifi get signal level test."); + expect(wifi_native_js.getSignalLevel(1, 1)).assertEqual(4); + sleep(3000); + }) + + /** + * @tc.number wifi_native_js_unit_test_005 + * @tc.name Test wifi.getScanInfos 0. + * @tc.desc Test wifi.getScanInfos API functionality. + */ + it('wifi_native_js_unit_test_005', 0, async function (done) { + console.info("[wifi_test] Wifi get scan infos callback test[1]."); + wifi_native_js.getScanInfos(result => { + var clen = Object.keys(result).length; + console.log("[wifi_test] wifi received scan info call back: " + clen); + expect(result).assertLarger(0); + console.info("[wifi_test] add device config callback: " + JSON.stringify(result)); + expect(JSON.stringify(result)).assertContain('ssid'); + sleep(5000); + for (var j = 0; j < clen; ++j) { + console.info("ssid: " + result[j].ssid); + console.info("bssid: " + result[j].bssid); + console.info("securityType: " + result[j].securityType); + console.info("rssi: " + result[j].rssi); + console.info("band: " + result[j].band); + console.info("frequency: " + result[j].frequency); + console.info("timestamp: " + result[j].timestamp); + } + }); + done(); + }) + sleep(20000); + + /** + * @tc.number wifi_native_js_unit_test_006 + * @tc.name Test wifi.getScanInfos 1. + * @tc.desc Test wifi.getScanInfos API functionality. + */ + it('wifi_native_js_unit_test_006', 0, async function (done) { + console.info("[wifi_test] Wifi get scan infos callback test[2]."); + wifi_native_js.getScanInfos().then( + result => { + var clen = Object.keys(result).length; + console.log("[wifi_test] wifi received scan promise result: " + clen); + expect(result).assertLarger(0); + console.info("[wifi_test] test_006 promise... " + JSON.stringify(result)); + expect(JSON.stringify(result)).assertContain('ssid'); + + sleep(5000); + for (var j = 0; j < clen; ++j) { + console.info("ssid: " + result[j].ssid); + console.info("bssid: " + result[j].bssid); + console.info("securityType: " + result[j].securityType); + console.info("rssi: " + result[j].rssi); + console.info("band: " + result[j].band); + console.info("frequency: " + result[j].frequency); + console.info("timestamp: " + result[j].timestamp); + } + }); + done(); + }) + + console.log("*************[wifi_test] start wifi js unit test end*************"); +}) + diff --git a/test_packages.gni b/test_packages.gni index 366f4147c..a495343d0 100755 --- a/test_packages.gni +++ b/test_packages.gni @@ -24,7 +24,7 @@ _all_test_packages = [ "${ACTS_ROOT}/appexecfwk:appexecfwk", "${ACTS_ROOT}/account:account", - # "${ACTS_ROOT}/communication:communication", + "${ACTS_ROOT}/communication:communication", "${ACTS_ROOT}/notification:notification", "${ACTS_ROOT}/aafwk:aafwk", "${ACTS_ROOT}/location:location", -- GitLab